From b7e0dc209cbbf00fd7d568653cdd9ecb4c4933ff Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Thu, 25 Feb 2021 12:10:38 +0100 Subject: [PATCH 1/3] Fix JUL integration SDK name. Fixes #1293 --- CHANGELOG.md | 1 + sentry-jul/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7796eb2edb7..e5899ad0421 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # vNext +* Fix: Fix JUL integration SDK name (#1293) # 4.2.0 diff --git a/sentry-jul/build.gradle.kts b/sentry-jul/build.gradle.kts index 76c5b9f98b6..fbec389114d 100644 --- a/sentry-jul/build.gradle.kts +++ b/sentry-jul/build.gradle.kts @@ -71,7 +71,7 @@ tasks { buildConfig { useJavaOutput() packageName("io.sentry.logback") - buildConfigField("String", "SENTRY_JUL_SDK_NAME", "\"${Config.Sentry.SENTRY_LOGBACK_SDK_NAME}\"") + buildConfigField("String", "SENTRY_JUL_SDK_NAME", "\"${Config.Sentry.SENTRY_JUL_SDK_NAME}\"") buildConfigField("String", "VERSION_NAME", "\"${project.version}\"") } From 8179b3ae330ea00ddac1269129d4445c8ce0c09b Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Thu, 25 Feb 2021 13:45:14 +0100 Subject: [PATCH 2/3] Fix JUL package name. --- sentry-jul/api/sentry-jul.api | 10 +++++----- sentry-jul/build.gradle.kts | 2 +- .../src/main/java/io/sentry/jul/SentryHandler.java | 2 +- .../src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sentry-jul/api/sentry-jul.api b/sentry-jul/api/sentry-jul.api index fdbdeebf807..7d6b45ea19a 100644 --- a/sentry-jul/api/sentry-jul.api +++ b/sentry-jul/api/sentry-jul.api @@ -1,3 +1,8 @@ +public final class io/sentry/jul/BuildConfig { + public static final field SENTRY_JUL_SDK_NAME Ljava/lang/String; + public static final field VERSION_NAME Ljava/lang/String; +} + public final class io/sentry/jul/SentryHandler : java/util/logging/Handler { public static final field THREAD_ID Ljava/lang/String; public fun ()V @@ -13,8 +18,3 @@ public final class io/sentry/jul/SentryHandler : java/util/logging/Handler { public fun setPrintfStyle (Z)V } -public final class io/sentry/logback/BuildConfig { - public static final field SENTRY_JUL_SDK_NAME Ljava/lang/String; - public static final field VERSION_NAME Ljava/lang/String; -} - diff --git a/sentry-jul/build.gradle.kts b/sentry-jul/build.gradle.kts index fbec389114d..910a143474f 100644 --- a/sentry-jul/build.gradle.kts +++ b/sentry-jul/build.gradle.kts @@ -70,7 +70,7 @@ tasks { buildConfig { useJavaOutput() - packageName("io.sentry.logback") + packageName("io.sentry.jul") buildConfigField("String", "SENTRY_JUL_SDK_NAME", "\"${Config.Sentry.SENTRY_JUL_SDK_NAME}\"") buildConfigField("String", "VERSION_NAME", "\"${project.version}\"") } diff --git a/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java b/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java index 4073a351713..e0b046a0228 100644 --- a/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java +++ b/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java @@ -5,7 +5,7 @@ import io.sentry.SentryEvent; import io.sentry.SentryLevel; import io.sentry.SentryOptions; -import io.sentry.logback.BuildConfig; +import io.sentry.jul.BuildConfig; import io.sentry.protocol.Message; import io.sentry.protocol.SdkVersion; import io.sentry.util.CollectionUtils; diff --git a/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt b/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt index 16f294b723e..a7edb032361 100644 --- a/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt +++ b/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt @@ -6,7 +6,7 @@ import com.nhaarman.mockitokotlin2.verify import io.sentry.Sentry import io.sentry.SentryLevel import io.sentry.SentryOptions -import io.sentry.logback.BuildConfig +import io.sentry.jul.BuildConfig import io.sentry.test.checkEvent import io.sentry.transport.ITransport import java.time.Instant From 78860c72b17bcdff72038b1c699906b0e76f8fcf Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Fri, 26 Feb 2021 11:22:17 +0100 Subject: [PATCH 3/3] Polish. --- sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java | 1 - sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt | 1 - 2 files changed, 2 deletions(-) diff --git a/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java b/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java index e0b046a0228..7761a41ea03 100644 --- a/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java +++ b/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java @@ -5,7 +5,6 @@ import io.sentry.SentryEvent; import io.sentry.SentryLevel; import io.sentry.SentryOptions; -import io.sentry.jul.BuildConfig; import io.sentry.protocol.Message; import io.sentry.protocol.SdkVersion; import io.sentry.util.CollectionUtils; diff --git a/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt b/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt index a7edb032361..622c409d5d5 100644 --- a/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt +++ b/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt @@ -6,7 +6,6 @@ import com.nhaarman.mockitokotlin2.verify import io.sentry.Sentry import io.sentry.SentryLevel import io.sentry.SentryOptions -import io.sentry.jul.BuildConfig import io.sentry.test.checkEvent import io.sentry.transport.ITransport import java.time.Instant