diff --git a/.craft.yml b/.craft.yml index 0d1d4beff6f..3aad4b56b4c 100644 --- a/.craft.yml +++ b/.craft.yml @@ -8,7 +8,6 @@ statusProvider: artifactProvider: name: github targets: - - name: bintray - name: github - name: registry type: sdk @@ -34,6 +33,14 @@ targets: type: sdk config: canonical: "maven:io.sentry:sentry-log4j2" + - name: registry + type: sdk + config: + canonical: "maven:io.sentry:sentry-jul" + - name: registry + type: sdk + config: + canonical: "maven:io.sentry:sentry-apache-http-client-5" - name: registry type: sdk config: diff --git a/CHANGELOG.md b/CHANGELOG.md index e59d41c0abc..776ab4b8f61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ * Enchancement: Support @SentrySpan and @SentryTransaction on classes and interfaces. (#1243) * Enchancement: Do not serialize empty collections and maps (#1245) * Ref: Simplify RestTemplate instrumentation (#1246) +* Ref: Prefix sdk.package names with io.sentry (#1249) * Fix: Make the ANR Atomic flags immutable * Enchancement: Integration interface better compatibility with Kotlin null-safety diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroidOptions.java b/sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroidOptions.java index 09317564bd7..e3779e66e58 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroidOptions.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroidOptions.java @@ -49,7 +49,7 @@ public SentryAndroidOptions() { final String version = BuildConfig.VERSION_NAME; sdkVersion = SdkVersion.updateSdkVersion(sdkVersion, name, version); - sdkVersion.addPackage("maven:sentry-android-core", version); + sdkVersion.addPackage("maven:io.sentry:sentry-android-core", version); return sdkVersion; } diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidOptionsTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidOptionsTest.kt index ac84db40238..772ac00489f 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidOptionsTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidOptionsTest.kt @@ -27,12 +27,12 @@ class SentryAndroidOptionsTest { assertEquals(BuildConfig.VERSION_NAME, sdkVersion.version) assertTrue(sdkVersion.packages!!.any { - it.name == "maven:sentry-android-core" && + it.name == "maven:io.sentry:sentry-android-core" && it.version == BuildConfig.VERSION_NAME }) assertTrue(sdkVersion.packages!!.any { - it.name == "maven:sentry" && + it.name == "maven:io.sentry:sentry" && it.version == BuildConfig.VERSION_NAME }) } diff --git a/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdkUtil.java b/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdkUtil.java index e2686fe8837..d0c7f2663a6 100644 --- a/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdkUtil.java +++ b/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdkUtil.java @@ -19,6 +19,6 @@ static void addPackage(@Nullable final SdkVersion sdkVersion) { if (sdkVersion == null) { return; } - sdkVersion.addPackage("maven:sentry-android-ndk", BuildConfig.VERSION_NAME); + sdkVersion.addPackage("maven:io.sentry:sentry-android-ndk", BuildConfig.VERSION_NAME); } } diff --git a/sentry-android-ndk/src/test/java/io/sentry/android/ndk/SentryNdkUtilTest.kt b/sentry-android-ndk/src/test/java/io/sentry/android/ndk/SentryNdkUtilTest.kt index 0082565cdaf..6f5568dc8b5 100644 --- a/sentry-android-ndk/src/test/java/io/sentry/android/ndk/SentryNdkUtilTest.kt +++ b/sentry-android-ndk/src/test/java/io/sentry/android/ndk/SentryNdkUtilTest.kt @@ -12,7 +12,7 @@ class SentryNdkUtilTest { val options = SentryOptions() SentryNdkUtil.addPackage(options.sdkVersion) assertTrue(options.sdkVersion!!.packages!!.any { - it.name == "maven:sentry-android-ndk" + it.name == "maven:io.sentry:sentry-android-ndk" it.version == BuildConfig.VERSION_NAME }) } diff --git a/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt b/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt index 58571fcf452..4ffd67f1ffc 100644 --- a/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt +++ b/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt @@ -40,6 +40,6 @@ class SentryTimberIntegration( } private fun addPackage(sdkVersion: SdkVersion?) { - sdkVersion?.addPackage("maven:sentry-android-timber", BuildConfig.VERSION_NAME) + sdkVersion?.addPackage("maven:io.sentry:sentry-android-timber", BuildConfig.VERSION_NAME) } } diff --git a/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberIntegrationTest.kt b/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberIntegrationTest.kt index cf6efee20f9..87fe9585227 100644 --- a/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberIntegrationTest.kt +++ b/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberIntegrationTest.kt @@ -92,7 +92,7 @@ class SentryTimberIntegrationTest { sut.register(fixture.hub, fixture.options) assertTrue(fixture.options.sdkVersion!!.packages!!.any { - it.name == "maven:sentry-android-timber" + it.name == "maven:io.sentry:sentry-android-timber" it.version == BuildConfig.VERSION_NAME }) } 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 9e0c9e2a6d2..4073a351713 100644 --- a/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java +++ b/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java @@ -245,7 +245,7 @@ public void close() throws SecurityException { final String version = BuildConfig.VERSION_NAME; sdkVersion = SdkVersion.updateSdkVersion(sdkVersion, name, version); - sdkVersion.addPackage("maven:sentry-jul", version); + sdkVersion.addPackage("maven:io.sentry:sentry-jul", version); return sdkVersion; } 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 fa4f127bddb..16f294b723e 100644 --- a/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt +++ b/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt @@ -312,7 +312,7 @@ class SentryHandlerTest { assertEquals(BuildConfig.VERSION_NAME, it.version) assertNotNull(it.packages) assertTrue(it.packages!!.any { pkg -> - "maven:sentry-jul" == pkg.name && + "maven:io.sentry:sentry-jul" == pkg.name && BuildConfig.VERSION_NAME == pkg.version }) } diff --git a/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java b/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java index 6461c49e431..169da3af9b7 100644 --- a/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java +++ b/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java @@ -209,7 +209,7 @@ public void append(final @NotNull LogEvent eventObject) { final String version = BuildConfig.VERSION_NAME; sdkVersion = SdkVersion.updateSdkVersion(sdkVersion, name, version); - sdkVersion.addPackage("maven:sentry-log4j2", version); + sdkVersion.addPackage("maven:io.sentry:sentry-log4j2", version); return sdkVersion; } diff --git a/sentry-log4j2/src/test/kotlin/io/sentry/log4j2/SentryAppenderTest.kt b/sentry-log4j2/src/test/kotlin/io/sentry/log4j2/SentryAppenderTest.kt index 87310f98881..eafa2ee37b2 100644 --- a/sentry-log4j2/src/test/kotlin/io/sentry/log4j2/SentryAppenderTest.kt +++ b/sentry-log4j2/src/test/kotlin/io/sentry/log4j2/SentryAppenderTest.kt @@ -251,7 +251,7 @@ class SentryAppenderTest { assertEquals(BuildConfig.VERSION_NAME, it.version) assertNotNull(it.packages) assertTrue(it.packages!!.any { pkg -> - "maven:sentry-log4j2" == pkg.name && + "maven:io.sentry:sentry-log4j2" == pkg.name && BuildConfig.VERSION_NAME == pkg.version }) } diff --git a/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java b/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java index dce782fd3b4..b2cfc53ad3a 100644 --- a/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java +++ b/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java @@ -144,7 +144,7 @@ protected void append(@NotNull ILoggingEvent eventObject) { final String version = BuildConfig.VERSION_NAME; sdkVersion = SdkVersion.updateSdkVersion(sdkVersion, name, version); - sdkVersion.addPackage("maven:sentry-logback", version); + sdkVersion.addPackage("maven:io.sentry:sentry-logback", version); return sdkVersion; } diff --git a/sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt b/sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt index b3f3fb8f09b..22bbd58bde7 100644 --- a/sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt +++ b/sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt @@ -227,7 +227,7 @@ class SentryAppenderTest { assertEquals(BuildConfig.VERSION_NAME, it.version) assertNotNull(it.packages) assertTrue(it.packages!!.any { pkg -> - "maven:sentry-logback" == pkg.name && + "maven:io.sentry:sentry-logback" == pkg.name && BuildConfig.VERSION_NAME == pkg.version }) } diff --git a/sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryAutoConfiguration.java b/sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryAutoConfiguration.java index 7d8b4d98e76..efb07cd2210 100644 --- a/sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryAutoConfiguration.java +++ b/sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryAutoConfiguration.java @@ -195,7 +195,7 @@ static class ApacheHttpClientTransportFactoryAutoconfiguration { final String version = BuildConfig.VERSION_NAME; sdkVersion = SdkVersion.updateSdkVersion(sdkVersion, name, version); - sdkVersion.addPackage("maven:sentry-spring-boot-starter", version); + sdkVersion.addPackage("maven:io.sentry:sentry-spring-boot-starter", version); return sdkVersion; } diff --git a/sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt b/sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt index 1e88fa30a97..63ea7a67949 100644 --- a/sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt +++ b/sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt @@ -192,7 +192,7 @@ class SentryAutoConfigurationTest { assertThat(sdk.version).isEqualTo(BuildConfig.VERSION_NAME) assertThat(sdk.name).isEqualTo(BuildConfig.SENTRY_SPRING_BOOT_SDK_NAME) assertThat(sdk.packages).anyMatch { pkg -> - pkg.name == "maven:sentry-spring-boot-starter" && pkg.version == BuildConfig.VERSION_NAME + pkg.name == "maven:io.sentry:sentry-spring-boot-starter" && pkg.version == BuildConfig.VERSION_NAME } }, anyOrNull()) } diff --git a/sentry-spring/src/main/java/io/sentry/spring/SentryHubRegistrar.java b/sentry-spring/src/main/java/io/sentry/spring/SentryHubRegistrar.java index 4c8aeb2dd20..33dfcca45c0 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/SentryHubRegistrar.java +++ b/sentry-spring/src/main/java/io/sentry/spring/SentryHubRegistrar.java @@ -77,7 +77,7 @@ private void registerSentryExceptionResolver( final String version = BuildConfig.VERSION_NAME; sdkVersion = SdkVersion.updateSdkVersion(sdkVersion, name, version); - sdkVersion.addPackage("maven:sentry-spring", version); + sdkVersion.addPackage("maven:io.sentry:sentry-spring", version); return sdkVersion; } diff --git a/sentry-spring/src/test/kotlin/io/sentry/spring/EnableSentryTest.kt b/sentry-spring/src/test/kotlin/io/sentry/spring/EnableSentryTest.kt index 84f41a92915..0c72c44f278 100644 --- a/sentry-spring/src/test/kotlin/io/sentry/spring/EnableSentryTest.kt +++ b/sentry-spring/src/test/kotlin/io/sentry/spring/EnableSentryTest.kt @@ -45,7 +45,7 @@ class EnableSentryTest { assertThat(options.sdkVersion!!.name).isEqualTo("sentry.java.spring") assertThat(options.sdkVersion!!.version).isEqualTo(BuildConfig.VERSION_NAME) assertThat(options.sdkVersion!!.packages).isNotNull - assertThat(options.sdkVersion!!.packages!!.map { pkg -> pkg.name }).contains("maven:sentry-spring") + assertThat(options.sdkVersion!!.packages!!.map { pkg -> pkg.name }).contains("maven:io.sentry:sentry-spring") } } diff --git a/sentry/src/main/java/io/sentry/SentryOptions.java b/sentry/src/main/java/io/sentry/SentryOptions.java index a766bead90f..b420fb563dc 100644 --- a/sentry/src/main/java/io/sentry/SentryOptions.java +++ b/sentry/src/main/java/io/sentry/SentryOptions.java @@ -1329,7 +1329,7 @@ void merge(final @NotNull SentryOptions options) { final SdkVersion sdkVersion = new SdkVersion(BuildConfig.SENTRY_JAVA_SDK_NAME, version); sdkVersion.setVersion(version); - sdkVersion.addPackage("maven:sentry", version); + sdkVersion.addPackage("maven:io.sentry:sentry", version); return sdkVersion; } diff --git a/sentry/src/test/java/io/sentry/GsonSerializerTest.kt b/sentry/src/test/java/io/sentry/GsonSerializerTest.kt index c53315bbf4b..5696c311adb 100644 --- a/sentry/src/test/java/io/sentry/GsonSerializerTest.kt +++ b/sentry/src/test/java/io/sentry/GsonSerializerTest.kt @@ -376,7 +376,7 @@ class GsonSerializerTest { assertNotNull(sdkInfo.packages) assertTrue(sdkInfo.packages!!.any { - it.name == "maven:sentry-android-core" + it.name == "maven:io.sentry:sentry-android-core" it.version == "4.5.6" }) } diff --git a/sentry/src/test/java/io/sentry/SentryOptionsTest.kt b/sentry/src/test/java/io/sentry/SentryOptionsTest.kt index 3ff3c62479b..98fa7e2e575 100644 --- a/sentry/src/test/java/io/sentry/SentryOptionsTest.kt +++ b/sentry/src/test/java/io/sentry/SentryOptionsTest.kt @@ -125,7 +125,7 @@ class SentryOptionsTest { assertEquals(BuildConfig.VERSION_NAME, sdkVersion.version) assertTrue(sdkVersion.packages!!.any { - it.name == "maven:sentry" && + it.name == "maven:io.sentry:sentry" && it.version == BuildConfig.VERSION_NAME }) } diff --git a/sentry/src/test/resources/envelope_session_sdkversion.txt b/sentry/src/test/resources/envelope_session_sdkversion.txt index b2c96d1ca48..970103c4094 100644 --- a/sentry/src/test/resources/envelope_session_sdkversion.txt +++ b/sentry/src/test/resources/envelope_session_sdkversion.txt @@ -1,3 +1,3 @@ -{"sdk":{"name":"test","version":"1.2.3","integrations":["NdkIntegration"],"packages":[{"name":"maven:sentry-android-core","version":"4.5.6"}]}} +{"sdk":{"name":"test","version":"1.2.3","integrations":["NdkIntegration"],"packages":[{"name":"io.sentry:maven:sentry-android-core","version":"4.5.6"}]}} {"content_type":"application/json","type":"session","length":306} {"sid":"c81d4e2e-bcf2-11e6-869b-7df92533d2db","did":"123","init":true,"started":"2020-02-07T14:16:00Z","status":"ok","seq":123456,"errors":2,"duration":6000.0,"timestamp":"2020-02-07T14:16:00Z","attrs":{"release":"io.sentry@1.0+123","environment":"debug","ip_address":"127.0.0.1","user_agent":"jamesBond"}}