Fix tests for Spring 7 and Spring Boot 4

.github/workflows/system-tests-backend.yml

@@ -54,15 +54,12 @@ jobs:
           - sample: "sentry-samples-console"
             agent: "false"
             agent-auto-init: "true"
-          - sample: "sentry-samples-spring-boot-jakarta"
-            agent: "false"
-            agent-auto-init: "true"
           - sample: "sentry-samples-spring-boot-4-webflux"
             agent: "false"
             agent-auto-init: "true"
-          - sample: "sentry-samples-spring-boot-4-opentelemetry-noagent"
-            agent: "false"
-            agent-auto-init: "true"
+#          - sample: "sentry-samples-spring-boot-4-opentelemetry-noagent"
+#            agent: "false"
+#            agent-auto-init: "true"
           - sample: "sentry-samples-spring-boot-4-opentelemetry"
             agent: "true"
             agent-auto-init: "true"

build.gradle.kts

@@ -20,9 +20,7 @@ plugins {
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.kotlin.jvm) apply false
-//    alias(libs.plugins.kotlin.jvm.spring7) apply false
     alias(libs.plugins.kotlin.spring) apply false
-//    alias(libs.plugins.kotlin.spring7) apply false
     alias(libs.plugins.buildconfig) apply false
     // dokka is required by gradle-maven-publish-plugin.
     alias(libs.plugins.dokka) apply false

sentry-android-fragment/build.gradle.kts

@@ -27,8 +27,8 @@ android {
 
   kotlin {
     compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
-    compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_8
-    compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_8
+    compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+    compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
   }
 
   testOptions {

sentry-android-replay/src/main/java/io/sentry/android/replay/Windows.kt

@@ -124,18 +124,21 @@ internal class RootViewsSpy private constructor() : Closeable {
 
   private val delegatingViewList: ArrayList<View> =
     object : ArrayList<View>() {
+      @Suppress("NewApi")
       override fun addAll(elements: Collection<View>): Boolean {
         listeners.forEach { listener ->
           elements.forEach { element -> listener.onRootViewsChanged(element, true) }
         }
         return super.addAll(elements)
       }
 
+      @Suppress("NewApi")
       override fun add(element: View): Boolean {
         listeners.forEach { it.onRootViewsChanged(element, true) }
         return super.add(element)
       }
 
+      @Suppress("NewApi")
       override fun removeAt(index: Int): View {
         val removedView = super.removeAt(index)
         listeners.forEach { it.onRootViewsChanged(removedView, false) }

sentry-android-replay/src/main/java/io/sentry/android/replay/capture/CaptureStrategy.kt

@@ -125,6 +125,7 @@ internal interface CaptureStrategy {
       )
     }
 
+    @Suppress("NewApi")
     private fun buildReplay(
       options: SentryOptions,
       video: File,
@@ -256,6 +257,7 @@ internal interface CaptureStrategy {
         scopes?.captureReplay(replay, hint.apply { replayRecording = recording })
       }
 
+      @Suppress("NewApi")
       fun setSegmentId(segmentId: Int) {
         replay.segmentId = segmentId
         recording.payload?.forEach {

sentry-android-timber/build.gradle.kts

@@ -35,8 +35,8 @@ android {
 
   kotlin {
     compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
-    compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_8
-    compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_8
+    compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+    compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
   }
 
   testOptions {

sentry-apollo-4/api/sentry-apollo-4.api

@@ -20,6 +20,7 @@ public final class io/sentry/apollo4/SentryApollo4HttpInterceptor : com/apollogr
 	public fun <init> (Lio/sentry/IScopes;Lio/sentry/apollo4/SentryApollo4HttpInterceptor$BeforeSpanCallback;Z)V
 	public fun <init> (Lio/sentry/IScopes;Lio/sentry/apollo4/SentryApollo4HttpInterceptor$BeforeSpanCallback;ZLjava/util/List;)V
 	public synthetic fun <init> (Lio/sentry/IScopes;Lio/sentry/apollo4/SentryApollo4HttpInterceptor$BeforeSpanCallback;ZLjava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun dispose ()V
 	public fun intercept (Lcom/apollographql/apollo/api/http/HttpRequest;Lcom/apollographql/apollo/network/http/HttpInterceptorChain;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 

sentry-compose/build.gradle.kts

@@ -21,16 +21,16 @@ kotlin {
   androidTarget {
     compilerOptions {
       jvmTarget.set(JvmTarget.JVM_1_8)
-      apiVersion.set(KotlinVersion.KOTLIN_1_8)
-      languageVersion.set(KotlinVersion.KOTLIN_1_8)
+      apiVersion.set(KotlinVersion.KOTLIN_1_9)
+      languageVersion.set(KotlinVersion.KOTLIN_1_9)
     }
     publishLibraryVariants("release")
   }
   jvm("desktop") {
     compilerOptions {
       jvmTarget.set(JvmTarget.JVM_1_8)
-      apiVersion.set(KotlinVersion.KOTLIN_1_8)
-      languageVersion.set(KotlinVersion.KOTLIN_1_8)
+      apiVersion.set(KotlinVersion.KOTLIN_1_9)
+      languageVersion.set(KotlinVersion.KOTLIN_1_9)
     }
   }
 
@@ -47,8 +47,8 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       compilerOptions {
-        apiVersion.set(KotlinVersion.KOTLIN_1_8)
-        languageVersion.set(KotlinVersion.KOTLIN_1_8)
+        apiVersion.set(KotlinVersion.KOTLIN_1_9)
+        languageVersion.set(KotlinVersion.KOTLIN_1_9)
       }
     }
     val androidMain by getting {

sentry-ktor-client/build.gradle.kts

@@ -14,6 +14,8 @@ plugins {
 
 tasks.withType<KotlinCompile>().configureEach {
   compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
+  compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+  compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
 }
 
 kotlin { explicitApi() }

sentry-okhttp/build.gradle.kts

@@ -14,6 +14,8 @@ plugins {
 
 tasks.withType<KotlinCompile>().configureEach {
   compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
+  compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+  compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
 }
 
 kotlin { explicitApi() }

sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring/jakarta/AppConfig.java → sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/AppConfig.java

@@ -1,8 +1,8 @@
-package io.sentry.samples.spring.jakarta;
+package io.sentry.samples.spring7;
 
 import io.sentry.IScopes;
-import io.sentry.spring.jakarta.SentryUserFilter;
-import io.sentry.spring.jakarta.SentryUserProvider;
+import io.sentry.spring7.SentryUserFilter;
+import io.sentry.spring7.SentryUserProvider;
 import java.util.List;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring/jakarta/AppInitializer.java → sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/AppInitializer.java

@@ -1,6 +1,6 @@
-package io.sentry.samples.spring.jakarta;
+package io.sentry.samples.spring7;
 
-import io.sentry.spring.jakarta.tracing.SentryTracingFilter;
+import io.sentry.spring7.tracing.SentryTracingFilter;
 import jakarta.servlet.Filter;
 import org.springframework.web.filter.DelegatingFilterProxy;
 import org.springframework.web.filter.RequestContextFilter;

sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring/jakarta/SecurityConfiguration.java → sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/SecurityConfiguration.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.jakarta;
+package io.sentry.samples.spring7;
 
 import org.jetbrains.annotations.NotNull;
 import org.springframework.context.annotation.Bean;

sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring/jakarta/SentryConfig.java → sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/SentryConfig.java

@@ -1,9 +1,9 @@
-package io.sentry.samples.spring.jakarta;
+package io.sentry.samples.spring7;
 
 import io.sentry.SentryOptions;
 import io.sentry.SentryOptions.TracesSamplerCallback;
-import io.sentry.spring.jakarta.EnableSentry;
-import io.sentry.spring.jakarta.tracing.SentryTracingConfiguration;
+import io.sentry.spring7.EnableSentry;
+import io.sentry.spring7.tracing.SentryTracingConfiguration;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;

sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring/jakarta/WebConfig.java → sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/WebConfig.java

@@ -1,7 +1,7 @@
-package io.sentry.samples.spring.jakarta;
+package io.sentry.samples.spring7;
 
 import io.sentry.IScopes;
-import io.sentry.spring.jakarta.tracing.SentrySpanClientHttpRequestInterceptor;
+import io.sentry.spring7.tracing.SentrySpanClientHttpRequestInterceptor;
 import java.util.Collections;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -12,7 +12,7 @@
 
 @Configuration
 @EnableAspectJAutoProxy(proxyTargetClass = true)
-@ComponentScan("io.sentry.samples.spring.jakarta")
+@ComponentScan("io.sentry.samples.spring7")
 @EnableWebMvc
 public class WebConfig {
 

sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring/jakarta/web/Person.java → sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/web/Person.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.jakarta.web;
+package io.sentry.samples.spring7.web;
 
 public class Person {
   private final String firstName;

sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring/jakarta/web/PersonController.java → sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/web/PersonController.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.jakarta.web;
+package io.sentry.samples.spring7.web;
 
 import io.sentry.Sentry;
 import org.slf4j.Logger;

sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring/jakarta/web/PersonService.java → sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/web/PersonService.java

@@ -1,6 +1,6 @@
-package io.sentry.samples.spring.jakarta.web;
+package io.sentry.samples.spring7.web;
 
-import io.sentry.spring.jakarta.tracing.SentrySpan;
+import io.sentry.spring7.tracing.SentrySpan;
 import java.util.Map;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts

@@ -46,6 +46,7 @@ dependencies {
   implementation(libs.springboot4.starter.web)
   implementation(libs.springboot4.starter.webflux)
   implementation(libs.springboot4.starter.websocket)
+  implementation(libs.springboot4.starter.webclient)
   implementation(libs.springboot4.starter.restclient)
   implementation(Config.Libs.aspectj)
   implementation(Config.Libs.kotlinReflect)

sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot/jakarta/CustomEventProcessor.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/CustomEventProcessor.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.boot.jakarta;
+package io.sentry.samples.spring.boot4;
 
 import io.sentry.EventProcessor;
 import io.sentry.Hint;

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot/jakarta/CustomJob.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/CustomJob.java

@@ -1,7 +1,7 @@
-package io.sentry.samples.spring.boot.jakarta;
+package io.sentry.samples.spring.boot4;
 
-import io.sentry.spring.jakarta.checkin.SentryCheckIn;
-import io.sentry.spring.jakarta.tracing.SentryTransaction;
+import io.sentry.spring7.checkin.SentryCheckIn;
+import io.sentry.spring7.tracing.SentryTransaction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Scheduled;

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot/jakarta/DistributedTracingController.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/DistributedTracingController.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.boot.jakarta;
+package io.sentry.samples.spring.boot4;
 
 import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.nio.charset.Charset;

sentry-samples/sentry-samples-spring-boot-4-webflux/src/main/java/io/sentry/samples/spring/boot/jakarta/Person.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/Person.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.boot.jakarta;
+package io.sentry.samples.spring.boot4;
 
 public class Person {
   private final String firstName;

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot/jakarta/PersonController.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/PersonController.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.boot.jakarta;
+package io.sentry.samples.spring.boot4;
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;

sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot/jakarta/PersonService.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/PersonService.java

@@ -1,8 +1,8 @@
-package io.sentry.samples.spring.boot.jakarta;
+package io.sentry.samples.spring.boot4;
 
 import io.sentry.ISpan;
 import io.sentry.Sentry;
-import io.sentry.spring.jakarta.tracing.SentrySpan;
+import io.sentry.spring7.tracing.SentrySpan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;

sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot/jakarta/SecurityConfiguration.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/SecurityConfiguration.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.boot.jakarta;
+package io.sentry.samples.spring.boot4;
 
 import org.jetbrains.annotations.NotNull;
 import org.springframework.context.annotation.Bean;

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot/jakarta/SentryDemoApplication.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java

@@ -1,10 +1,10 @@
-package io.sentry.samples.spring.boot.jakarta;
+package io.sentry.samples.spring.boot4;
 
 import static io.sentry.quartz.SentryJobListener.SENTRY_SLUG_KEY;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.Tracer;
-import io.sentry.samples.spring.boot.jakarta.quartz.SampleJob;
+import io.sentry.samples.spring.boot4.quartz.SampleJob;
 import java.util.Collections;
 import org.quartz.JobDetail;
 import org.quartz.SimpleTrigger;

sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot/jakarta/Todo.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/Todo.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.boot.jakarta;
+package io.sentry.samples.spring.boot4;
 
 public class Todo {
   private final Long id;

sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot/jakarta/TodoController.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/TodoController.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.boot.jakarta;
+package io.sentry.samples.spring.boot4;
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;

sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot/jakarta/graphql/AssigneeController.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/graphql/AssigneeController.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.boot.jakarta.graphql;
+package io.sentry.samples.spring.boot4.graphql;
 
 import java.util.HashMap;
 import java.util.Map;

sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot/jakarta/graphql/GreetingController.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/graphql/GreetingController.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.boot.jakarta.graphql;
+package io.sentry.samples.spring.boot4.graphql;
 
 import org.springframework.graphql.data.method.annotation.Argument;
 import org.springframework.graphql.data.method.annotation.QueryMapping;

sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot/jakarta/graphql/ProjectController.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/graphql/ProjectController.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.boot.jakarta.graphql;
+package io.sentry.samples.spring.boot4.graphql;
 
 import java.nio.file.NoSuchFileException;
 import java.time.Duration;

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot/jakarta/graphql/TaskCreatorController.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/graphql/TaskCreatorController.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.boot.jakarta.graphql;
+package io.sentry.samples.spring.boot4.graphql;
 
 import java.util.HashMap;
 import java.util.Map;

sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot/jakarta/quartz/SampleJob.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/quartz/SampleJob.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.boot.jakarta.quartz;
+package io.sentry.samples.spring.boot4.quartz;
 
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;

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

@@ -47,6 +47,7 @@ dependencies {
   implementation(libs.springboot4.starter.web)
   implementation(libs.springboot4.starter.webflux)
   implementation(libs.springboot4.starter.websocket)
+  implementation(libs.springboot4.starter.webclient)
   implementation(libs.springboot4.starter.restclient)
   implementation(Config.Libs.aspectj)
   implementation(Config.Libs.kotlinReflect)

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot/jakarta/CustomEventProcessor.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/CustomEventProcessor.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.boot.jakarta;
+package io.sentry.samples.spring.boot4;
 
 import io.sentry.EventProcessor;
 import io.sentry.Hint;

sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot/jakarta/CustomJob.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/CustomJob.java

@@ -1,7 +1,7 @@
-package io.sentry.samples.spring.boot.jakarta;
+package io.sentry.samples.spring.boot4;
 
-import io.sentry.spring.jakarta.checkin.SentryCheckIn;
-import io.sentry.spring.jakarta.tracing.SentryTransaction;
+import io.sentry.spring7.checkin.SentryCheckIn;
+import io.sentry.spring7.tracing.SentryTransaction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot/jakarta/DistributedTracingController.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/DistributedTracingController.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.boot.jakarta;
+package io.sentry.samples.spring.boot4;
 
 import java.nio.charset.Charset;
 import org.slf4j.Logger;

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot/jakarta/Person.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/Person.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.boot.jakarta;
+package io.sentry.samples.spring.boot4;
 
 public class Person {
   private final String firstName;

sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot/jakarta/PersonController.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/PersonController.java

@@ -1,4 +1,4 @@
-package io.sentry.samples.spring.boot.jakarta;
+package io.sentry.samples.spring.boot4;
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot/jakarta/PersonService.java → sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/PersonService.java

@@ -1,8 +1,8 @@
-package io.sentry.samples.spring.boot.jakarta;
+package io.sentry.samples.spring.boot4;
 
 import io.sentry.ISpan;
 import io.sentry.Sentry;
-import io.sentry.spring.jakarta.tracing.SentrySpan;
+import io.sentry.spring7.tracing.SentrySpan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;