Fix tests for Spring 7 and Spring Boot 4

Author: adinauer

sentry-spring-7/src/main/java/io/sentry/spring/jakarta/SentryHubRegistrar.java

@@ -23,7 +23,7 @@ public class SentryHubRegistrar implements ImportBeanDefinitionRegistrar {
 
   static {
     SentryIntegrationPackageStorage.getInstance()
-        .addPackage("maven:io.sentry:sentry-spring-jakarta", BuildConfig.VERSION_NAME);
+        .addPackage("maven:io.sentry:sentry-spring-7", BuildConfig.VERSION_NAME);
   }
 
   @Override
@@ -99,6 +99,6 @@ private void registerSentryExceptionResolver(
   }
 
   private static void addPackageAndIntegrationInfo() {
-    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring6");
+    SentryIntegrationPackageStorage.getInstance().addIntegration("Spring7");
   }
 }

sentry-spring-7/src/test/kotlin/io/sentry/spring/jakarta/EnableSentryTest.kt

@@ -47,13 +47,13 @@ class EnableSentryTest {
     contextRunner.run {
       assertThat(it).hasSingleBean(SentryOptions::class.java)
       val options = it.getBean(SentryOptions::class.java)
-      assertThat(options.sentryClientName).isEqualTo("sentry.java.spring.jakarta")
+      assertThat(options.sentryClientName).isEqualTo("sentry.java.spring-7")
       assertThat(options.sdkVersion).isNotNull
-      assertThat(options.sdkVersion!!.name).isEqualTo("sentry.java.spring.jakarta")
+      assertThat(options.sdkVersion!!.name).isEqualTo("sentry.java.spring-7")
       assertThat(options.sdkVersion!!.version).isEqualTo(BuildConfig.VERSION_NAME)
       assertThat(options.sdkVersion!!.packageSet.map { pkg -> pkg.name })
-        .contains("maven:io.sentry:sentry-spring-jakarta")
-      assertThat(options.sdkVersion!!.integrationSet).contains("Spring6")
+        .contains("maven:io.sentry:sentry-spring-7")
+      assertThat(options.sdkVersion!!.integrationSet).contains("Spring7")
     }
   }
 

sentry-spring-boot-4/build.gradle.kts

@@ -77,6 +77,7 @@ dependencies {
   testImplementation(projects.sentryReactor)
   testImplementation(projects.sentryTestSupport)
   testImplementation(kotlin(Config.kotlinStdLib))
+  testImplementation(Config.Libs.kotlinReflect)
   testImplementation(platform(SpringBootPlugin.BOM_COORDINATES))
   testImplementation(libs.context.propagation)
   testImplementation(libs.kotlin.test.junit)

sentry-spring-boot-4/src/main/java/io/sentry/spring/boot/jakarta/SentryAutoConfiguration.java

@@ -88,7 +88,7 @@ public class SentryAutoConfiguration {
 
   static {
     SentryIntegrationPackageStorage.getInstance()
-        .addPackage("maven:io.sentry:sentry-spring-boot-starter-jakarta", BuildConfig.VERSION_NAME);
+        .addPackage("maven:io.sentry:sentry-spring-boot-4-starter", BuildConfig.VERSION_NAME);
   }
 
   /** Registers general purpose Sentry related beans. */
@@ -470,7 +470,7 @@ static class ApacheHttpClientTransportFactoryAutoconfiguration {
     }
 
     private static void addPackageAndIntegrationInfo() {
-      SentryIntegrationPackageStorage.getInstance().addIntegration("SpringBoot3");
+      SentryIntegrationPackageStorage.getInstance().addIntegration("SpringBoot4");
     }
   }
 

sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot/jakarta/SentryAutoConfigurationTest.kt

@@ -300,7 +300,7 @@ class SentryAutoConfigurationTest {
   fun `sets sentryClientName property on SentryOptions`() {
     contextRunner.withPropertyValues("sentry.dsn=http://key@localhost/proj").run {
       assertThat(it.getBean(SentryOptions::class.java).sentryClientName)
-        .isEqualTo("sentry.java.spring-boot.jakarta/${BuildConfig.VERSION_NAME}")
+        .isEqualTo("sentry.java.spring-boot-4/${BuildConfig.VERSION_NAME}")
     }
   }
 
@@ -320,10 +320,10 @@ class SentryAutoConfigurationTest {
               assertThat(sdk.version).isEqualTo(BuildConfig.VERSION_NAME)
               assertThat(sdk.name).isEqualTo(BuildConfig.SENTRY_SPRING_BOOT_4_SDK_NAME)
               assertThat(sdk.packageSet).anyMatch { pkg ->
-                pkg.name == "maven:io.sentry:sentry-spring-boot-starter-jakarta" &&
+                pkg.name == "maven:io.sentry:sentry-spring-boot-4-starter" &&
                   pkg.version == BuildConfig.VERSION_NAME
               }
-              assertTrue(sdk.integrationSet.contains("SpringBoot3"))
+              assertTrue(sdk.integrationSet.contains("SpringBoot4"))
             },
             anyOrNull(),
           )