Remove duplicate calls to addPackage (#4285)

adinauer · getsentry-bot · web-flow · commit 98fbe0ea984f · 2025-03-27T14:08:21.000+01:00
* Check for mixed SDK versions

* Format code

* format + api

* Init noops if mixed versions detected

* Add BuildConfig

* config entries for agentless module sdk names

* Add MANIFEST.MF for JARs

* Throw on startup; use manifests for backend; reuse code for otel

* Format code

* Format code

* changelog

* api

* changelog

* Remove duplicate addPackage calls

* remove test assertion for package

* remove test assertion for package

---------

Co-authored-by: Sentry Github Bot &lt;bot+github-bot@sentry.io&gt;
diff --git a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt
@@ -57,8 +57,6 @@ public class FragmentLifecycleIntegration(
         application.registerActivityLifecycleCallbacks(this)
         options.logger.log(DEBUG, "FragmentLifecycleIntegration installed.")
         addIntegrationToSdkVersion("FragmentLifecycle")
-        SentryIntegrationPackageStorage.getInstance()
-            .addPackage("maven:io.sentry:sentry-android-fragment", BuildConfig.VERSION_NAME)
     }
 
     override fun close() {
diff --git a/sentry-android-navigation/src/main/java/io/sentry/android/navigation/SentryNavigationListener.kt b/sentry-android-navigation/src/main/java/io/sentry/android/navigation/SentryNavigationListener.kt
@@ -50,8 +50,6 @@ public class SentryNavigationListener @JvmOverloads constructor(
 
     init {
         addIntegrationToSdkVersion("NavigationListener")
-        SentryIntegrationPackageStorage.getInstance()
-            .addPackage("maven:io.sentry:sentry-android-navigation", BuildConfig.VERSION_NAME)
     }
 
     override fun onDestinationChanged(
diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/ReplayIntegration.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/ReplayIntegration.kt
@@ -158,8 +158,6 @@ public class ReplayIntegration(
         }
 
         addIntegrationToSdkVersion("Replay")
-        SentryIntegrationPackageStorage.getInstance()
-            .addPackage("maven:io.sentry:sentry-android-replay", BuildConfig.VERSION_NAME)
 
         finalizePreviousReplay()
     }
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
@@ -35,7 +35,6 @@ public class SentryTimberIntegration(
         Timber.plant(tree)
 
         logger.log(SentryLevel.DEBUG, "SentryTimberIntegration installed.")
-        SentryIntegrationPackageStorage.getInstance().addPackage("maven:io.sentry:sentry-android-timber", VERSION_NAME)
         addIntegrationToSdkVersion("Timber")
     }
 
diff --git a/sentry-apollo-3/src/main/java/io/sentry/apollo3/SentryApollo3HttpInterceptor.kt b/sentry-apollo-3/src/main/java/io/sentry/apollo3/SentryApollo3HttpInterceptor.kt
@@ -53,8 +53,6 @@ class SentryApollo3HttpInterceptor @JvmOverloads constructor(
             SentryIntegrationPackageStorage.getInstance()
                 .addIntegration("Apollo3ClientError")
         }
-        SentryIntegrationPackageStorage.getInstance()
-            .addPackage("maven:io.sentry:sentry-apollo-3", BuildConfig.VERSION_NAME)
     }
 
     private val regex: Regex by lazy {
diff --git a/sentry-apollo-3/src/test/java/io/sentry/apollo3/SentryApollo3InterceptorTest.kt b/sentry-apollo-3/src/test/java/io/sentry/apollo3/SentryApollo3InterceptorTest.kt
@@ -323,9 +323,6 @@ class SentryApollo3InterceptorTest {
     fun `sets SDKVersion Info`() {
         assertNotNull(fixture.scopes.options.sdkVersion)
         assert(fixture.scopes.options.sdkVersion!!.integrationSet.contains("Apollo3"))
-        val packageInfo = fixture.scopes.options.sdkVersion!!.packageSet.firstOrNull { pkg -> pkg.name == "maven:io.sentry:sentry-apollo-3" }
-        assertNotNull(packageInfo)
-        assert(packageInfo.version == BuildConfig.VERSION_NAME)
     }
 
     @Test
diff --git a/sentry-apollo-4/src/main/java/io/sentry/apollo4/SentryApollo4HttpInterceptor.kt b/sentry-apollo-4/src/main/java/io/sentry/apollo4/SentryApollo4HttpInterceptor.kt
@@ -52,8 +52,6 @@ class SentryApollo4HttpInterceptor @JvmOverloads constructor(
             SentryIntegrationPackageStorage.getInstance()
                 .addIntegration("Apollo4ClientError")
         }
-        SentryIntegrationPackageStorage.getInstance()
-            .addPackage("maven:io.sentry:sentry-apollo-4", BuildConfig.VERSION_NAME)
     }
 
     private val regex: Regex by lazy {
diff --git a/sentry-apollo-4/src/test/java/io/sentry/apollo4/SentryApollo4HttpInterceptorTest.kt b/sentry-apollo-4/src/test/java/io/sentry/apollo4/SentryApollo4HttpInterceptorTest.kt
@@ -331,9 +331,6 @@ abstract class SentryApollo4HttpInterceptorTest(
     fun `sets SDKVersion Info`() {
         assertNotNull(fixture.scopes.options.sdkVersion)
         assert(fixture.scopes.options.sdkVersion!!.integrationSet.contains("Apollo4"))
-        val packageInfo = fixture.scopes.options.sdkVersion!!.packageSet.firstOrNull { pkg -> pkg.name == "maven:io.sentry:sentry-apollo-4" }
-        assertNotNull(packageInfo)
-        assert(packageInfo.version == BuildConfig.VERSION_NAME)
     }
 
     @Test
diff --git a/sentry-apollo/src/main/java/io/sentry/apollo/SentryApolloInterceptor.kt b/sentry-apollo/src/main/java/io/sentry/apollo/SentryApolloInterceptor.kt
@@ -47,7 +47,6 @@ class SentryApolloInterceptor(
 
     init {
         addIntegrationToSdkVersion("Apollo")
-        SentryIntegrationPackageStorage.getInstance().addPackage("maven:io.sentry:sentry-apollo", BuildConfig.VERSION_NAME)
     }
 
     override fun interceptAsync(request: InterceptorRequest, chain: ApolloInterceptorChain, dispatcher: Executor, callBack: CallBack) {
diff --git a/sentry-compose-helper/src/jvmMain/java/io/sentry/compose/gestures/ComposeGestureTargetLocator.java b/sentry-compose-helper/src/jvmMain/java/io/sentry/compose/gestures/ComposeGestureTargetLocator.java
@@ -41,8 +41,6 @@ public final class ComposeGestureTargetLocator implements GestureTargetLocator {
   public ComposeGestureTargetLocator(final @NotNull ILogger logger) {
     this.logger = logger;
     SentryIntegrationPackageStorage.getInstance().addIntegration("ComposeUserInteraction");
-    SentryIntegrationPackageStorage.getInstance()
-        .addPackage("maven:io.sentry:sentry-compose", BuildConfig.VERSION_NAME);
   }
 
   @Override
diff --git a/sentry-compose/src/androidMain/kotlin/io/sentry/compose/SentryNavigationIntegration.kt b/sentry-compose/src/androidMain/kotlin/io/sentry/compose/SentryNavigationIntegration.kt
@@ -34,7 +34,6 @@ internal class SentryLifecycleObserver(
 
     init {
         addIntegrationToSdkVersion("ComposeNavigation")
-        SentryIntegrationPackageStorage.getInstance().addPackage("maven:io.sentry:sentry-compose", BuildConfig.VERSION_NAME)
     }
 
     override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
diff --git a/sentry-graphql-22/src/main/java/io/sentry/graphql22/SentryInstrumentation.java b/sentry-graphql-22/src/main/java/io/sentry/graphql22/SentryInstrumentation.java
@@ -94,8 +94,6 @@ public SentryInstrumentation(
         new SentryGraphqlInstrumentation(
             beforeSpan, subscriptionHandler, exceptionReporter, ignoredErrorTypes, TRACE_ORIGIN);
     SentryIntegrationPackageStorage.getInstance().addIntegration("GraphQL-v22");
-    SentryIntegrationPackageStorage.getInstance()
-        .addPackage("maven:io.sentry:sentry-graphql-22", BuildConfig.VERSION_NAME);
   }
 
   /**
diff --git a/sentry-graphql/src/main/java/io/sentry/graphql/SentryInstrumentation.java b/sentry-graphql/src/main/java/io/sentry/graphql/SentryInstrumentation.java
@@ -91,8 +91,6 @@ public SentryInstrumentation(
         new SentryGraphqlInstrumentation(
             beforeSpan, subscriptionHandler, exceptionReporter, ignoredErrorTypes, TRACE_ORIGIN);
     SentryIntegrationPackageStorage.getInstance().addIntegration("GraphQL");
-    SentryIntegrationPackageStorage.getInstance()
-        .addPackage("maven:io.sentry:sentry-graphql", BuildConfig.VERSION_NAME);
   }
 
   /**
diff --git a/sentry-jdbc/src/main/java/io/sentry/jdbc/SentryJdbcEventListener.java b/sentry-jdbc/src/main/java/io/sentry/jdbc/SentryJdbcEventListener.java
@@ -79,8 +79,6 @@ public void onAfterAnyExecute(
 
   private void addPackageAndIntegrationInfo() {
     SentryIntegrationPackageStorage.getInstance().addIntegration("JDBC");
-    SentryIntegrationPackageStorage.getInstance()
-        .addPackage("maven:io.sentry:sentry-jdbc", BuildConfig.VERSION_NAME);
   }
 
   private void applyDatabaseDetailsToSpan(
diff --git a/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java b/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java
@@ -310,8 +310,6 @@ public void close() throws SecurityException {
   }
 
   private void addPackageAndIntegrationInfo() {
-    SentryIntegrationPackageStorage.getInstance()
-        .addPackage("maven:io.sentry:sentry-jul", BuildConfig.VERSION_NAME);
     SentryIntegrationPackageStorage.getInstance().addIntegration("Jul");
   }
 
diff --git a/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java b/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java
@@ -282,8 +282,6 @@ public void append(final @NotNull LogEvent eventObject) {
   }
 
   private void addPackageAndIntegrationInfo() {
-    SentryIntegrationPackageStorage.getInstance()
-        .addPackage("maven:io.sentry:sentry-log4j2", BuildConfig.VERSION_NAME);
     SentryIntegrationPackageStorage.getInstance().addIntegration("Log4j");
   }
 }
diff --git a/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java b/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java
@@ -229,8 +229,6 @@ private String formatted(@NotNull ILoggingEvent loggingEvent) {
   }
 
   private void addPackageAndIntegrationInfo() {
-    SentryIntegrationPackageStorage.getInstance()
-        .addPackage("maven:io.sentry:sentry-logback", BuildConfig.VERSION_NAME);
     SentryIntegrationPackageStorage.getInstance().addIntegration("Logback");
   }
 
diff --git a/sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpInterceptor.kt b/sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpInterceptor.kt
@@ -63,8 +63,6 @@ public open class SentryOkHttpInterceptor(
 
     init {
         addIntegrationToSdkVersion("OkHttp")
-        SentryIntegrationPackageStorage.getInstance()
-            .addPackage("maven:io.sentry:sentry-okhttp", BuildConfig.VERSION_NAME)
     }
 
     @Suppress("LongMethod")
diff --git a/sentry-openfeign/src/main/java/io/sentry/openfeign/SentryFeignClient.java b/sentry-openfeign/src/main/java/io/sentry/openfeign/SentryFeignClient.java
@@ -54,8 +54,6 @@ public SentryFeignClient(
   }
 
   private void addPackageAndIntegrationInfo() {
-    SentryIntegrationPackageStorage.getInstance()
-        .addPackage("maven:io.sentry:sentry-openfeign", BuildConfig.VERSION_NAME);
     addIntegrationToSdkVersion("OpenFeign");
   }
 
diff --git a/sentry-quartz/src/main/java/io/sentry/quartz/SentryJobListener.java b/sentry-quartz/src/main/java/io/sentry/quartz/SentryJobListener.java
@@ -41,8 +41,6 @@ public SentryJobListener() {
   public SentryJobListener(final @NotNull IScopes scopes) {
     this.scopes = Objects.requireNonNull(scopes, "scopes are required");
     SentryIntegrationPackageStorage.getInstance().addIntegration("Quartz");
-    SentryIntegrationPackageStorage.getInstance()
-        .addPackage("maven:io.sentry:sentry-quartz", BuildConfig.VERSION_NAME);
   }
 
   @Override
diff --git a/sentry-servlet-jakarta/src/main/java/io/sentry/servlet/jakarta/SentryServletContainerInitializer.java b/sentry-servlet-jakarta/src/main/java/io/sentry/servlet/jakarta/SentryServletContainerInitializer.java
@@ -26,7 +26,5 @@ public void onStartup(@Nullable Set<Class<?>> c, @NotNull ServletContext ctx)
       throws ServletException {
     ctx.addListener(SentryServletRequestListener.class);
     SentryIntegrationPackageStorage.getInstance().addIntegration("Servlet-Jakarta");
-    SentryIntegrationPackageStorage.getInstance()
-        .addPackage("maven:io.sentry:sentry-servlet-jakarta", BuildConfig.VERSION_NAME);
   }
 }
diff --git a/sentry-servlet/src/main/java/io/sentry/servlet/SentryServletContainerInitializer.java b/sentry-servlet/src/main/java/io/sentry/servlet/SentryServletContainerInitializer.java
@@ -26,7 +26,5 @@ public void onStartup(@Nullable Set<Class<?>> c, @NotNull ServletContext ctx)
       throws ServletException {
     ctx.addListener(SentryServletRequestListener.class);
     SentryIntegrationPackageStorage.getInstance().addIntegration("Servlet");
-    SentryIntegrationPackageStorage.getInstance()
-        .addPackage("maven:io.sentry:sentry-servlet", BuildConfig.VERSION_NAME);
   }
 }
diff --git a/sentry-spring-boot-jakarta/src/main/java/io/sentry/spring/boot/jakarta/SentryAutoConfiguration.java b/sentry-spring-boot-jakarta/src/main/java/io/sentry/spring/boot/jakarta/SentryAutoConfiguration.java
@@ -466,9 +466,6 @@ static class ApacheHttpClientTransportFactoryAutoconfiguration {
     }
 
     private static void addPackageAndIntegrationInfo() {
-      SentryIntegrationPackageStorage.getInstance()
-          .addPackage(
-              "maven:io.sentry:sentry-spring-boot-starter-jakarta", BuildConfig.VERSION_NAME);
       SentryIntegrationPackageStorage.getInstance().addIntegration("SpringBoot3");
     }
   }
diff --git a/sentry-spring-boot/src/main/java/io/sentry/spring/boot/SentryAutoConfiguration.java b/sentry-spring-boot/src/main/java/io/sentry/spring/boot/SentryAutoConfiguration.java
@@ -436,8 +436,6 @@ static class ApacheHttpClientTransportFactoryAutoconfiguration {
     }
 
     private static void addPackageAndIntegrationInfo() {
-      SentryIntegrationPackageStorage.getInstance()
-          .addPackage("maven:io.sentry:sentry-spring-boot-starter", BuildConfig.VERSION_NAME);
       SentryIntegrationPackageStorage.getInstance().addIntegration("SpringBoot");
     }
   }
diff --git a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/SentryHubRegistrar.java b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/SentryHubRegistrar.java
@@ -98,8 +98,6 @@ private void registerSentryExceptionResolver(
   }
 
   private static void addPackageAndIntegrationInfo() {
-    SentryIntegrationPackageStorage.getInstance()
-        .addPackage("maven:io.sentry:sentry-spring-jakarta", BuildConfig.VERSION_NAME);
     SentryIntegrationPackageStorage.getInstance().addIntegration("Spring6");
   }
 }
diff --git a/sentry-spring/src/main/java/io/sentry/spring/SentryHubRegistrar.java b/sentry-spring/src/main/java/io/sentry/spring/SentryHubRegistrar.java
@@ -98,8 +98,6 @@ private void registerSentryExceptionResolver(
   }
 
   private static void addPackageAndIntegrationInfo() {
-    SentryIntegrationPackageStorage.getInstance()
-        .addPackage("maven:io.sentry:sentry-spring", BuildConfig.VERSION_NAME);
     SentryIntegrationPackageStorage.getInstance().addIntegration("Spring");
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,6 @@ public class FragmentLifecycleIntegration(`
`57`	`57`	`application.registerActivityLifecycleCallbacks(this)`
`58`	`58`	`options.logger.log(DEBUG, "FragmentLifecycleIntegration installed.")`
`59`	`59`	`addIntegrationToSdkVersion("FragmentLifecycle")`
`60`		`- SentryIntegrationPackageStorage.getInstance()`
`61`		`- .addPackage("maven:io.sentry:sentry-android-fragment", BuildConfig.VERSION_NAME)`
`62`	`60`	`}`
`63`	`61`
`64`	`62`	`override fun close() {`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,6 @@ public class SentryNavigationListener @JvmOverloads constructor(`
`50`	`50`
`51`	`51`	`init {`
`52`	`52`	`addIntegrationToSdkVersion("NavigationListener")`
`53`		`- SentryIntegrationPackageStorage.getInstance()`
`54`		`- .addPackage("maven:io.sentry:sentry-android-navigation", BuildConfig.VERSION_NAME)`
`55`	`53`	`}`
`56`	`54`
`57`	`55`	`override fun onDestinationChanged(`
Original file line number	Diff line number	Diff line change
`@@ -158,8 +158,6 @@ public class ReplayIntegration(`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`addIntegrationToSdkVersion("Replay")`
`161`		`- SentryIntegrationPackageStorage.getInstance()`
`162`		`- .addPackage("maven:io.sentry:sentry-android-replay", BuildConfig.VERSION_NAME)`
`163`	`161`
`164`	`162`	`finalizePreviousReplay()`
`165`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ public class SentryTimberIntegration(`
`35`	`35`	`Timber.plant(tree)`
`36`	`36`
`37`	`37`	`logger.log(SentryLevel.DEBUG, "SentryTimberIntegration installed.")`
`38`		`- SentryIntegrationPackageStorage.getInstance().addPackage("maven:io.sentry:sentry-android-timber", VERSION_NAME)`
`39`	`38`	`addIntegrationToSdkVersion("Timber")`
`40`	`39`	`}`
`41`	`40`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,6 @@ class SentryApollo3HttpInterceptor @JvmOverloads constructor(`
`53`	`53`	`SentryIntegrationPackageStorage.getInstance()`
`54`	`54`	`.addIntegration("Apollo3ClientError")`
`55`	`55`	`}`
`56`		`- SentryIntegrationPackageStorage.getInstance()`
`57`		`- .addPackage("maven:io.sentry:sentry-apollo-3", BuildConfig.VERSION_NAME)`
`58`	`56`	`}`
`59`	`57`
`60`	`58`	`private val regex: Regex by lazy {`
Original file line number	Diff line number	Diff line change
`@@ -323,9 +323,6 @@ class SentryApollo3InterceptorTest {`
`323`	`323`	fun `sets SDKVersion Info`() {
`324`	`324`	`assertNotNull(fixture.scopes.options.sdkVersion)`
`325`	`325`	`assert(fixture.scopes.options.sdkVersion!!.integrationSet.contains("Apollo3"))`
`326`		`- val packageInfo = fixture.scopes.options.sdkVersion!!.packageSet.firstOrNull { pkg -> pkg.name == "maven:io.sentry:sentry-apollo-3" }`
`327`		`- assertNotNull(packageInfo)`
`328`		`- assert(packageInfo.version == BuildConfig.VERSION_NAME)`
`329`	`326`	`}`
`330`	`327`
`331`	`328`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,6 @@ class SentryApollo4HttpInterceptor @JvmOverloads constructor(`
`52`	`52`	`SentryIntegrationPackageStorage.getInstance()`
`53`	`53`	`.addIntegration("Apollo4ClientError")`
`54`	`54`	`}`
`55`		`- SentryIntegrationPackageStorage.getInstance()`
`56`		`- .addPackage("maven:io.sentry:sentry-apollo-4", BuildConfig.VERSION_NAME)`
`57`	`55`	`}`
`58`	`56`
`59`	`57`	`private val regex: Regex by lazy {`
Original file line number	Diff line number	Diff line change
`@@ -331,9 +331,6 @@ abstract class SentryApollo4HttpInterceptorTest(`
`331`	`331`	fun `sets SDKVersion Info`() {
`332`	`332`	`assertNotNull(fixture.scopes.options.sdkVersion)`
`333`	`333`	`assert(fixture.scopes.options.sdkVersion!!.integrationSet.contains("Apollo4"))`
`334`		`- val packageInfo = fixture.scopes.options.sdkVersion!!.packageSet.firstOrNull { pkg -> pkg.name == "maven:io.sentry:sentry-apollo-4" }`
`335`		`- assertNotNull(packageInfo)`
`336`		`- assert(packageInfo.version == BuildConfig.VERSION_NAME)`
`337`	`334`	`}`
`338`	`335`
`339`	`336`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ class SentryApolloInterceptor(`
`47`	`47`
`48`	`48`	`init {`
`49`	`49`	`addIntegrationToSdkVersion("Apollo")`
`50`		`- SentryIntegrationPackageStorage.getInstance().addPackage("maven:io.sentry:sentry-apollo", BuildConfig.VERSION_NAME)`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`override fun interceptAsync(request: InterceptorRequest, chain: ApolloInterceptorChain, dispatcher: Executor, callBack: CallBack) {`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,6 @@ public final class ComposeGestureTargetLocator implements GestureTargetLocator {`
`41`	`41`	`public ComposeGestureTargetLocator(final @NotNull ILogger logger) {`
`42`	`42`	`this.logger = logger;`
`43`	`43`	`SentryIntegrationPackageStorage.getInstance().addIntegration("ComposeUserInteraction");`
`44`		`- SentryIntegrationPackageStorage.getInstance()`
`45`		`- .addPackage("maven:io.sentry:sentry-compose", BuildConfig.VERSION_NAME);`
`46`	`44`	`}`
`47`	`45`
`48`	`46`	`@Override`