Update Strings for Spring 7 and Spring Boot 4

adinauer · adinauer · commit 42fe02ae3e17 · 2025-08-11T09:28:15.000+02:00
diff --git a/sentry-spring-7/src/main/java/io/sentry/spring7/SentryExceptionResolver.java b/sentry-spring-7/src/main/java/io/sentry/spring7/SentryExceptionResolver.java
@@ -27,7 +27,7 @@
  */
 @Open
 public class SentryExceptionResolver implements HandlerExceptionResolver, Ordered {
-  public static final String MECHANISM_TYPE = "Spring6ExceptionResolver";
+  public static final String MECHANISM_TYPE = "Spring7ExceptionResolver";
 
   private final @NotNull IScopes scopes;
   private final @NotNull TransactionNameProvider transactionNameProvider;
diff --git a/sentry-spring-7/src/main/java/io/sentry/spring7/exception/SentryCaptureExceptionParameterAdvice.java b/sentry-spring-7/src/main/java/io/sentry/spring7/exception/SentryCaptureExceptionParameterAdvice.java
@@ -21,7 +21,7 @@
 @ApiStatus.Internal
 @Open
 public class SentryCaptureExceptionParameterAdvice implements MethodInterceptor {
-  private static final String MECHANISM_TYPE = "SentrySpring6CaptureExceptionParameterAdvice";
+  private static final String MECHANISM_TYPE = "SentrySpring7CaptureExceptionParameterAdvice";
   private final @NotNull IScopes scopes;
 
   public SentryCaptureExceptionParameterAdvice() {
diff --git a/sentry-spring-7/src/main/java/io/sentry/spring7/graphql/SentryDgsSubscriptionHandler.java b/sentry-spring-7/src/main/java/io/sentry/spring7/graphql/SentryDgsSubscriptionHandler.java
@@ -11,7 +11,7 @@
 public final class SentryDgsSubscriptionHandler implements SentrySubscriptionHandler {
 
   public SentryDgsSubscriptionHandler() {
-    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring6NetflixDGSGrahQL");
+    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring7NetflixDGSGrahQL");
   }
 
   @Override
diff --git a/sentry-spring-7/src/main/java/io/sentry/spring7/graphql/SentryGraphql22Configuration.java b/sentry-spring-7/src/main/java/io/sentry/spring7/graphql/SentryGraphql22Configuration.java
@@ -23,7 +23,7 @@ public class SentryGraphql22Configuration {
   public SentryInstrumentation sentryInstrumentationWebMvc(
       final @NotNull ObjectProvider<SentryGraphqlInstrumentation.BeforeSpanCallback>
               beforeSpanCallback) {
-    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring6GrahQLWebMVC");
+    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring7GrahQLWebMVC");
     return createInstrumentation(beforeSpanCallback, false);
   }
 
@@ -33,7 +33,7 @@ public SentryInstrumentation sentryInstrumentationWebMvc(
   public SentryInstrumentation sentryInstrumentationWebflux(
       final @NotNull ObjectProvider<SentryGraphqlInstrumentation.BeforeSpanCallback>
               beforeSpanCallback) {
-    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring6GrahQLWebFlux");
+    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring7GrahQLWebFlux");
     return createInstrumentation(beforeSpanCallback, true);
   }
 
diff --git a/sentry-spring-7/src/main/java/io/sentry/spring7/graphql/SentryGraphqlConfiguration.java b/sentry-spring-7/src/main/java/io/sentry/spring7/graphql/SentryGraphqlConfiguration.java
@@ -23,7 +23,7 @@ public class SentryGraphqlConfiguration {
   public SentryInstrumentation sentryInstrumentationWebMvc(
       final @NotNull ObjectProvider<SentryGraphqlInstrumentation.BeforeSpanCallback>
               beforeSpanCallback) {
-    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring6GrahQLWebMVC");
+    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring7GrahQLWebMVC");
     return createInstrumentation(beforeSpanCallback, false);
   }
 
@@ -33,7 +33,7 @@ public SentryInstrumentation sentryInstrumentationWebMvc(
   public SentryInstrumentation sentryInstrumentationWebflux(
       final @NotNull ObjectProvider<SentryGraphqlInstrumentation.BeforeSpanCallback>
               beforeSpanCallback) {
-    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring6GrahQLWebFlux");
+    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring7GrahQLWebFlux");
     return createInstrumentation(beforeSpanCallback, true);
   }
 
diff --git a/sentry-spring-7/src/main/java/io/sentry/spring7/opentelemetry/SentryOpenTelemetryAgentWithoutAutoInitConfiguration.java b/sentry-spring-7/src/main/java/io/sentry/spring7/opentelemetry/SentryOpenTelemetryAgentWithoutAutoInitConfiguration.java
@@ -20,7 +20,7 @@ public class SentryOpenTelemetryAgentWithoutAutoInitConfiguration {
       sentryOpenTelemetryOptionsConfiguration() {
     return options -> {
       SentryIntegrationPackageStorage.getInstance()
-          .addIntegration("SpringBoot3OpenTelemetryAgentWithoutAutoInit");
+          .addIntegration("SpringBoot4OpenTelemetryAgentWithoutAutoInit");
       options.setOpenTelemetryMode(SentryOpenTelemetryMode.AGENT);
     };
   }
diff --git a/sentry-spring-7/src/main/java/io/sentry/spring7/opentelemetry/SentryOpenTelemetryNoAgentConfiguration.java b/sentry-spring-7/src/main/java/io/sentry/spring7/opentelemetry/SentryOpenTelemetryNoAgentConfiguration.java
@@ -30,7 +30,7 @@ public static ISpanFactory openTelemetrySpanFactory(OpenTelemetry openTelemetry)
       sentryOpenTelemetryOptionsConfiguration() {
     return options -> {
       SentryIntegrationPackageStorage.getInstance()
-          .addIntegration("SpringBoot3OpenTelemetryNoAgent");
+          .addIntegration("SpringBoot4OpenTelemetryNoAgent");
       SentryAutoConfigurationCustomizerProvider.skipInit = true;
       options.setOpenTelemetryMode(SentryOpenTelemetryMode.AGENTLESS_SPRING);
     };
diff --git a/sentry-spring-7/src/main/java/io/sentry/spring7/webflux/SentryWebExceptionHandler.java b/sentry-spring-7/src/main/java/io/sentry/spring7/webflux/SentryWebExceptionHandler.java
@@ -27,7 +27,7 @@
 // at -1
 @ApiStatus.Experimental
 public final class SentryWebExceptionHandler implements WebExceptionHandler {
-  public static final String MECHANISM_TYPE = "Spring6WebFluxExceptionResolver";
+  public static final String MECHANISM_TYPE = "Spring7WebFluxExceptionResolver";
   private final @NotNull IScopes scopes;
 
   public SentryWebExceptionHandler(final @NotNull IScopes scopes) {
diff --git a/sentry-spring-7/src/test/kotlin/io/sentry/spring7/exception/SentryCaptureExceptionParameterAdviceTest.kt b/sentry-spring-7/src/test/kotlin/io/sentry/spring7/exception/SentryCaptureExceptionParameterAdviceTest.kt
@@ -43,7 +43,7 @@ class SentryCaptureExceptionParameterAdviceTest {
         check {
           assertTrue(it is ExceptionMechanismException)
           assertEquals(exception, it.throwable)
-          assertEquals("SentrySpring6CaptureExceptionParameterAdvice", it.exceptionMechanism.type)
+          assertEquals("SentrySpring7CaptureExceptionParameterAdvice", it.exceptionMechanism.type)
         },
         any<Hint>(),
       )
diff --git a/sentry-spring-boot-4/src/main/java/io/sentry/spring/boot4/SentrySpringVersionChecker.java b/sentry-spring-boot-4/src/main/java/io/sentry/spring/boot4/SentrySpringVersionChecker.java
@@ -14,7 +14,7 @@ final class SentrySpringVersionChecker
   @Override
   public void onApplicationEvent(ApplicationContextInitializedEvent event) {
 
-    if (!SpringBootVersion.getVersion().startsWith("3")) {
+    if (!SpringBootVersion.getVersion().startsWith("4")) {
       logger.warn("############################### WARNING ###############################");
       logger.warn("##                                                                   ##");
       logger.warn("##            !Incompatible Spring Boot Version detected!            ##");
diff --git a/sentry-spring-boot-4/src/main/java/io/sentry/spring/boot4/graphql/SentryGraphql22AutoConfiguration.java b/sentry-spring-boot-4/src/main/java/io/sentry/spring/boot4/graphql/SentryGraphql22AutoConfiguration.java
@@ -28,7 +28,7 @@ public SentryInstrumentation sentryInstrumentationWebMvc(
       final @NotNull SentryProperties sentryProperties,
       final @NotNull ObjectProvider<SentryGraphqlInstrumentation.BeforeSpanCallback>
               beforeSpanCallback) {
-    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring6GrahQLWebMVC");
+    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring7GrahQLWebMVC");
     return createInstrumentation(sentryProperties, beforeSpanCallback, false);
   }
 
@@ -39,7 +39,7 @@ public SentryInstrumentation sentryInstrumentationWebflux(
       final @NotNull SentryProperties sentryProperties,
       final @NotNull ObjectProvider<SentryGraphqlInstrumentation.BeforeSpanCallback>
               beforeSpanCallback) {
-    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring6GrahQLWebFlux");
+    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring7GrahQLWebFlux");
     return createInstrumentation(sentryProperties, beforeSpanCallback, true);
   }
 
diff --git a/sentry-spring-boot-4/src/main/java/io/sentry/spring/boot4/graphql/SentryGraphqlAutoConfiguration.java b/sentry-spring-boot-4/src/main/java/io/sentry/spring/boot4/graphql/SentryGraphqlAutoConfiguration.java
@@ -28,7 +28,7 @@ public SentryInstrumentation sentryInstrumentationWebMvc(
       final @NotNull SentryProperties sentryProperties,
       final @NotNull ObjectProvider<SentryGraphqlInstrumentation.BeforeSpanCallback>
               beforeSpanCallback) {
-    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring6GrahQLWebMVC");
+    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring7GrahQLWebMVC");
     return createInstrumentation(sentryProperties, beforeSpanCallback, false);
   }
 
@@ -39,7 +39,7 @@ public SentryInstrumentation sentryInstrumentationWebflux(
       final @NotNull SentryProperties sentryProperties,
       final @NotNull ObjectProvider<SentryGraphqlInstrumentation.BeforeSpanCallback>
               beforeSpanCallback) {
-    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring6GrahQLWebFlux");
+    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring7GrahQLWebFlux");
     return createInstrumentation(sentryProperties, beforeSpanCallback, true);
   }
 
diff --git a/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentryAutoConfigurationTest.kt b/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentryAutoConfigurationTest.kt
@@ -805,7 +805,7 @@ class SentryAutoConfigurationTest {
         assertTrue(
           SentryIntegrationPackageStorage.getInstance()
             .integrations
-            .contains("SpringBoot3OpenTelemetryAgentWithoutAutoInit")
+            .contains("SpringBoot4OpenTelemetryAgentWithoutAutoInit")
         )
       }
   }
@@ -817,7 +817,7 @@ class SentryAutoConfigurationTest {
       assertFalse(
         SentryIntegrationPackageStorage.getInstance()
           .integrations
-          .contains("SpringBoot3OpenTelemetryAgentWithoutAutoInit")
+          .contains("SpringBoot4OpenTelemetryAgentWithoutAutoInit")
       )
     }
   }
@@ -832,13 +832,13 @@ class SentryAutoConfigurationTest {
         assertFalse(
           SentryIntegrationPackageStorage.getInstance()
             .integrations
-            .contains("SpringBoot3OpenTelemetryAgentWithoutAutoInit")
+            .contains("SpringBoot4OpenTelemetryAgentWithoutAutoInit")
         )
       }
   }
 
   @Test
-  fun `when AgentMarker is not on the classpath but OpenTelemetry is, runs SpringBoot3OpenTelemetryNoAgent`() {
+  fun `when AgentMarker is not on the classpath but OpenTelemetry is, runs SpringBoot4OpenTelemetryNoAgent`() {
     SentryIntegrationPackageStorage.getInstance().clearStorage()
     contextRunner
       .withPropertyValues("sentry.dsn=http://key@localhost/proj")
@@ -848,13 +848,13 @@ class SentryAutoConfigurationTest {
         assertTrue(
           SentryIntegrationPackageStorage.getInstance()
             .integrations
-            .contains("SpringBoot3OpenTelemetryNoAgent")
+            .contains("SpringBoot4OpenTelemetryNoAgent")
         )
       }
   }
 
   @Test
-  fun `when AgentMarker and OpenTelemetry are not on the classpath, does not run SpringBoot3OpenTelemetryNoAgent`() {
+  fun `when AgentMarker and OpenTelemetry are not on the classpath, does not run SpringBoot4OpenTelemetryNoAgent`() {
     SentryIntegrationPackageStorage.getInstance().clearStorage()
     contextRunner
       .withPropertyValues("sentry.dsn=http://key@localhost/proj")
@@ -863,13 +863,13 @@ class SentryAutoConfigurationTest {
         assertFalse(
           SentryIntegrationPackageStorage.getInstance()
             .integrations
-            .contains("SpringBoot3OpenTelemetryNoAgent")
+            .contains("SpringBoot4OpenTelemetryNoAgent")
         )
       }
   }
 
   @Test
-  fun `when AgentMarker and SentryAutoConfigurationCustomizerProvider are not on the classpath, does not run SpringBoot3OpenTelemetryNoAgent`() {
+  fun `when AgentMarker and SentryAutoConfigurationCustomizerProvider are not on the classpath, does not run SpringBoot4OpenTelemetryNoAgent`() {
     SentryIntegrationPackageStorage.getInstance().clearStorage()
     contextRunner
       .withPropertyValues("sentry.dsn=http://key@localhost/proj")
@@ -884,7 +884,7 @@ class SentryAutoConfigurationTest {
         assertFalse(
           SentryIntegrationPackageStorage.getInstance()
             .integrations
-            .contains("SpringBoot3OpenTelemetryNoAgent")
+            .contains("SpringBoot4OpenTelemetryNoAgent")
         )
       }
   }
@@ -899,7 +899,7 @@ class SentryAutoConfigurationTest {
         assertFalse(
           SentryIntegrationPackageStorage.getInstance()
             .integrations
-            .contains("SpringBoot3OpenTelemetryAgentWithoutAutoInit")
+            .contains("SpringBoot4OpenTelemetryAgentWithoutAutoInit")
         )
       }
   }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`public final class SentryDgsSubscriptionHandler implements SentrySubscriptionHandler {`
`12`	`12`
`13`	`13`	`public SentryDgsSubscriptionHandler() {`
`14`		`- SentryIntegrationPackageStorage.getInstance().addIntegration("Spring6NetflixDGSGrahQL");`
	`14`	`+ SentryIntegrationPackageStorage.getInstance().addIntegration("Spring7NetflixDGSGrahQL");`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public class SentryOpenTelemetryAgentWithoutAutoInitConfiguration {`
`20`	`20`	`sentryOpenTelemetryOptionsConfiguration() {`
`21`	`21`	`return options -> {`
`22`	`22`	`SentryIntegrationPackageStorage.getInstance()`
`23`		`- .addIntegration("SpringBoot3OpenTelemetryAgentWithoutAutoInit");`
	`23`	`+ .addIntegration("SpringBoot4OpenTelemetryAgentWithoutAutoInit");`
`24`	`24`	`options.setOpenTelemetryMode(SentryOpenTelemetryMode.AGENT);`
`25`	`25`	`};`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class SentryCaptureExceptionParameterAdviceTest {`
`43`	`43`	`check {`
`44`	`44`	`assertTrue(it is ExceptionMechanismException)`
`45`	`45`	`assertEquals(exception, it.throwable)`
`46`		`- assertEquals("SentrySpring6CaptureExceptionParameterAdvice", it.exceptionMechanism.type)`
	`46`	`+ assertEquals("SentrySpring7CaptureExceptionParameterAdvice", it.exceptionMechanism.type)`
`47`	`47`	`},`
`48`	`48`	`any<Hint>(),`
`49`	`49`	`)`