Update Spring Boot Jakarta to Spring Boot 3.0.0-RC2 (#2347)

Co-authored-by: Maciej Walkowiak <walkowiak.maciej@yahoo.com> Co-authored-by: Lukas Bloder <lukas.bloder@gmail.com> Co-authored-by: Alexander Dinauer <alexander.dinauer@sentry.io> Co-authored-by: Alexander Dinauer <adinauer@users.noreply.github.com> Co-authored-by: getsentry-bot <bot@sentry.io> Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io>
getsentry · Nov 11, 2022 · 38e4f11 · 38e4f11
1 parent 51e7326
commit 38e4f11
Show file tree

Hide file tree

Showing 24 changed files with 125 additions and 95 deletions.
diff --git a/.github/workflows/integration-tests-benchmarks.yml b/.github/workflows/integration-tests-benchmarks.yml
@@ -91,4 +91,4 @@ jobs:
           config: sentry-android-integration-tests/metrics-test.yml
           sauce-user: ${{ secrets.SAUCE_USERNAME }}
           sauce-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-        if: env.SAUCE_USERNAME != null      
+        if: env.SAUCE_USERNAME != null
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - Fix `Gpu.vendorId` should be a String ([#2343](https://github.com/getsentry/sentry-java/pull/2343))
 
+### Features
+
+- Update Spring Boot Jakarta to Spring Boot 3.0.0-RC2 ([#2347](https://github.com/getsentry/sentry-java/pull/2347))
+
 ## 6.7.0
 
 ### Fixes

diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
@@ -5,7 +5,7 @@ object Config {
     val kotlinStdLib = "stdlib-jdk8"
 
     val springBootVersion = "2.7.4"
-    val springBoot3Version = "3.0.0-M5"
+    val springBoot3Version = "3.0.0-RC2"
     val kotlinCompatibleLanguageVersion = "1.4"
 
     val composeVersion = "1.1.1"

diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts
@@ -59,10 +59,6 @@ tasks.withType<KotlinCompile> {
     }
 }
 
-tasks.withType<JavaCompile> {
-    options.compilerArgs.add("-Xlint:-deprecation")
-}
-
 task("jakartaTransformation", JavaExec::class) {
     main = "org.eclipse.transformer.cli.JakartaTransformerCLI"
     classpath = configurations.getByName("jakartaTransform") // sourceSets["main"].compileClasspath

diff --git a/...pring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/PersonService.java b/...pring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/PersonService.java
@@ -1,5 +1,7 @@
 package io.sentry.samples.spring.boot.jakarta;
 
+import io.sentry.ISpan;
+import io.sentry.Sentry;
 import io.sentry.spring.jakarta.tracing.SentrySpan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,12 +18,19 @@ public class PersonService {
   private static final Logger LOGGER = LoggerFactory.getLogger(PersonService.class);
 
   private final JdbcTemplate jdbcTemplate;
+  private int createCount = 0;
 
   public PersonService(JdbcTemplate jdbcTemplate) {
     this.jdbcTemplate = jdbcTemplate;
   }
 
   Person create(Person person) {
+    createCount++;
+    final ISpan span = Sentry.getSpan();
+    if (span != null) {
+      span.setMeasurement("create_count", createCount);
+    }
+
     jdbcTemplate.update(
         "insert into person (firstName, lastName) values (?, ?)",
         person.getFirstName(),

diff --git a/...ot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/SecurityConfiguration.java b/...ot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/SecurityConfiguration.java
@@ -4,27 +4,27 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.factory.PasswordEncoderFactories;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;
 
 @Configuration
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {
 
   // this API is meant to be consumed by non-browser clients thus the CSRF protection is not needed.
-  @Override
   @SuppressWarnings("lgtm[java/spring-disabled-csrf-protection]")
-  protected void configure(final @NotNull HttpSecurity http) throws Exception {
-    http.csrf().disable().authorizeRequests().anyRequest().authenticated().and().httpBasic();
+  @Bean
+  public SecurityFilterChain filterChain(final @NotNull HttpSecurity http) throws Exception {
+    http.csrf().disable().authorizeHttpRequests().anyRequest().authenticated().and().httpBasic();
+
+    return http.build();
   }
 
   @Bean
-  @Override
-  public @NotNull UserDetailsService userDetailsService() {
+  public @NotNull InMemoryUserDetailsManager userDetailsService() {
     final PasswordEncoder encoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
 
     final UserDetails user =

diff --git a/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts
@@ -70,7 +70,3 @@ task("jakartaTransformation", JavaExec::class) {
     classpath = configurations.getByName("jakartaTransform") // sourceSets["main"].compileClasspath
     args = listOf("../sentry-samples-spring/src/main/java/io/sentry/samples/spring", "src/main/java/io/sentry/samples/spring/jakarta", "-o", "-tf", "sentry-jakarta-text-master.properties")
 }
-
-tasks.withType<JavaCompile> {
-    options.compilerArgs.add("-Xlint:-deprecation")
-}
diff --git a/...-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/SecurityConfiguration.java b/...-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/SecurityConfiguration.java
@@ -4,29 +4,27 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.factory.PasswordEncoderFactories;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;
 
 @Configuration
-@EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {
 
   // this API is meant to be consumed by non-browser clients thus the CSRF protection is not needed.
-  @Override
   @SuppressWarnings("lgtm[java/spring-disabled-csrf-protection]")
-  protected void configure(final @NotNull HttpSecurity http) throws Exception {
-    http.csrf().disable().authorizeRequests().anyRequest().authenticated().and().httpBasic();
+  @Bean
+  public SecurityFilterChain filterChain(final @NotNull HttpSecurity http) throws Exception {
+    http.csrf().disable().authorizeHttpRequests().anyRequest().authenticated().and().httpBasic();
+
+    return http.build();
   }
 
   @Bean
-  @Override
-  public @NotNull UserDetailsService userDetailsService() {
+  public @NotNull InMemoryUserDetailsManager userDetailsService() {
     final PasswordEncoder encoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
 
     final UserDetails user =

diff --git a/sentry-spring-boot-starter-jakarta/build.gradle.kts b/sentry-spring-boot-starter-jakarta/build.gradle.kts
@@ -1,4 +1,3 @@
-import com.android.build.gradle.internal.tasks.factory.dependsOn
 import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
 import net.ltgt.gradle.errorprone.errorprone
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -128,7 +127,7 @@ task("jakartaMainClassTransformation", JavaExec::class) {
     args = listOf("../sentry-spring-boot-starter/src/test/kotlin/com/acme", "src/test/kotlin/com/acme", "-o", "-tf", "sentry-jakarta-text-master.properties")
 }
 
-tasks.named("build").dependsOn("jakartaTransformation")
+// tasks.named("build").dependsOn("jakartaTransformation")
 
 buildConfig {
     useJavaOutput()

diff --git a/...r-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/it/SentrySpringIntegrationTest.kt b/...r-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/it/SentrySpringIntegrationTest.kt
@@ -8,6 +8,7 @@ import io.sentry.checkTransaction
 import io.sentry.spring.jakarta.tracing.SentrySpan
 import io.sentry.transport.ITransport
 import org.assertj.core.api.Assertions.assertThat
+import org.junit.Ignore
 import org.junit.runner.RunWith
 import org.mockito.kotlin.any
 import org.mockito.kotlin.anyOrNull
@@ -32,21 +33,19 @@ import org.springframework.http.HttpStatus
 import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter
 import org.springframework.security.core.userdetails.User
 import org.springframework.security.core.userdetails.UserDetails
-import org.springframework.security.core.userdetails.UserDetailsService
 import org.springframework.security.crypto.factory.PasswordEncoderFactories
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.security.provisioning.InMemoryUserDetailsManager
+import org.springframework.security.web.SecurityFilterChain
 import org.springframework.stereotype.Service
 import org.springframework.test.context.junit4.SpringRunner
 import org.springframework.web.bind.annotation.ControllerAdvice
 import org.springframework.web.bind.annotation.ExceptionHandler
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RestController
-import java.lang.RuntimeException
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 
@@ -270,17 +269,10 @@ open class HelloService {
 }
 
 @Configuration
-open class SecurityConfiguration : WebSecurityConfigurerAdapter() {
-
-    override fun configure(http: HttpSecurity) {
-        http.csrf().disable()
-            .authorizeRequests().anyRequest().authenticated()
-            .and()
-            .httpBasic()
-    }
+open class SecurityConfiguration {
 
     @Bean
-    override fun userDetailsService(): UserDetailsService {
+    open fun userDetailsService(): InMemoryUserDetailsManager {
         val encoder: PasswordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder()
         val user: UserDetails = User
             .builder()
@@ -291,6 +283,17 @@ open class SecurityConfiguration : WebSecurityConfigurerAdapter() {
             .build()
         return InMemoryUserDetailsManager(user)
     }
+
+    @Bean
+    @Throws(Exception::class)
+    open fun filterChain(http: HttpSecurity): SecurityFilterChain {
+        http.csrf().disable()
+            .authorizeRequests().anyRequest().authenticated()
+            .and()
+            .httpBasic()
+
+        return http.build()
+    }
 }
 
 class CustomException(message: String) : RuntimeException(message)

diff --git a/...ring-boot-starter/src/test/kotlin/io/sentry/spring/boot/it/SentrySpringIntegrationTest.kt b/...ring-boot-starter/src/test/kotlin/io/sentry/spring/boot/it/SentrySpringIntegrationTest.kt
@@ -32,21 +32,19 @@ import org.springframework.http.HttpStatus
 import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter
 import org.springframework.security.core.userdetails.User
 import org.springframework.security.core.userdetails.UserDetails
-import org.springframework.security.core.userdetails.UserDetailsService
 import org.springframework.security.crypto.factory.PasswordEncoderFactories
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.security.provisioning.InMemoryUserDetailsManager
+import org.springframework.security.web.SecurityFilterChain
 import org.springframework.stereotype.Service
 import org.springframework.test.context.junit4.SpringRunner
 import org.springframework.web.bind.annotation.ControllerAdvice
 import org.springframework.web.bind.annotation.ExceptionHandler
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RestController
-import java.lang.RuntimeException
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 
@@ -270,17 +268,10 @@ open class HelloService {
 }
 
 @Configuration
-open class SecurityConfiguration : WebSecurityConfigurerAdapter() {
-
-    override fun configure(http: HttpSecurity) {
-        http.csrf().disable()
-            .authorizeRequests().anyRequest().authenticated()
-            .and()
-            .httpBasic()
-    }
+open class SecurityConfiguration {
 
     @Bean
-    override fun userDetailsService(): UserDetailsService {
+    open fun userDetailsService(): InMemoryUserDetailsManager {
         val encoder: PasswordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder()
         val user: UserDetails = User
             .builder()
@@ -291,6 +282,17 @@ open class SecurityConfiguration : WebSecurityConfigurerAdapter() {
             .build()
         return InMemoryUserDetailsManager(user)
     }
+
+    @Bean
+    @Throws(Exception::class)
+    open fun filterChain(http: HttpSecurity): SecurityFilterChain {
+        http.csrf().disable()
+            .authorizeRequests().anyRequest().authenticated()
+            .and()
+            .httpBasic()
+
+        return http.build()
+    }
 }
 
 class CustomException(message: String) : RuntimeException(message)

diff --git a/sentry-spring-jakarta/build.gradle.kts b/sentry-spring-jakarta/build.gradle.kts
@@ -1,6 +1,7 @@
-import com.android.build.gradle.internal.tasks.factory.dependsOn
+import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
 import net.ltgt.gradle.errorprone.errorprone
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
 
 plugins {
@@ -19,9 +20,9 @@ repositories {
     maven { url = uri("https://repo.spring.io/milestone") }
 }
 
-the<io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension>().apply {
+the<DependencyManagementExtension>().apply {
     imports {
-        mavenBom("org.springframework.boot:spring-boot-dependencies:${Config.springBoot3Version}")
+        mavenBom(SpringBootPlugin.BOM_COORDINATES)
     }
 }
 
@@ -108,10 +109,6 @@ tasks {
     }
 }
 
-tasks.withType<JavaCompile> {
-    options.compilerArgs.add("-Xlint:-deprecation")
-}
-
 task("jakartaTransformation", JavaExec::class) {
     main = "org.eclipse.transformer.cli.JakartaTransformerCLI"
     classpath = configurations.getByName("jakartaTransform") // sourceSets["main"].compileClasspath
@@ -124,7 +121,7 @@ task("jakartaTestTransformation", JavaExec::class) {
     args = listOf("../sentry-spring/src/test/kotlin/io/sentry/spring", "src/test/kotlin/io/sentry/spring/jakarta", "-o", "-tf", "sentry-jakarta-text-master.properties")
 }
 
-tasks.named("build").dependsOn("jakartaTransformation")
+// tasks.named("build").dependsOn("jakartaTransformation")
 
 buildConfig {
     useJavaOutput()

diff --git a/...rc/main/java/io/sentry/spring/jakarta/tracing/SentrySpanClientHttpRequestInterceptor.java b/...rc/main/java/io/sentry/spring/jakarta/tracing/SentrySpanClientHttpRequestInterceptor.java
@@ -45,7 +45,9 @@ public SentrySpanClientHttpRequestInterceptor(final @NotNull IHub hub) {
       }
 
       final ISpan span = activeSpan.startChild("http.client");
-      span.setDescription(request.getMethodValue() + " " + request.getURI());
+      final String methodName =
+          request.getMethod() != null ? request.getMethod().name() : "unknown";
+      span.setDescription(methodName + " " + request.getURI());
 
       final SentryTraceHeader sentryTraceHeader = span.toSentryTrace();
 
@@ -63,8 +65,8 @@ public SentrySpanClientHttpRequestInterceptor(final @NotNull IHub hub) {
       try {
         response = execution.execute(request, body);
         // handles both success and error responses
-        span.setStatus(SpanStatus.fromHttpStatusCode(response.getRawStatusCode()));
-        responseStatusCode = response.getRawStatusCode();
+        span.setStatus(SpanStatus.fromHttpStatusCode(response.getStatusCode().value()));
+        responseStatusCode = response.getStatusCode().value();
         return response;
       } catch (Throwable e) {
         // handles cases like connection errors
@@ -84,8 +86,10 @@ private void addBreadcrumb(
       final @NotNull byte[] body,
       final @Nullable Integer responseStatusCode,
       final @Nullable ClientHttpResponse response) {
+    final String methodName = request.getMethod() != null ? request.getMethod().name() : "unknown";
+
     final Breadcrumb breadcrumb =
-        Breadcrumb.http(request.getURI().toString(), request.getMethodValue(), responseStatusCode);
+        Breadcrumb.http(request.getURI().toString(), methodName, responseStatusCode);
     breadcrumb.setData("request_body_size", body.length);
 
     final Hint hint = new Hint();

diff --git a/...arta/src/main/java/io/sentry/spring/jakarta/tracing/SentrySpanClientWebRequestFilter.java b/...arta/src/main/java/io/sentry/spring/jakarta/tracing/SentrySpanClientWebRequestFilter.java
@@ -66,7 +66,7 @@ public SentrySpanClientWebRequestFilter(final @NotNull IHub hub) {
     return next.exchange(clientRequestWithSentryTraceHeader)
         .flatMap(
             response -> {
-              span.setStatus(SpanStatus.fromHttpStatusCode(response.rawStatusCode()));
+              span.setStatus(SpanStatus.fromHttpStatusCode(response.statusCode().value()));
               addBreadcrumb(request, response);
               span.finish();
               return Mono.just(response);
@@ -87,7 +87,7 @@ private void addBreadcrumb(
         Breadcrumb.http(
             request.url().toString(),
             request.method().name(),
-            response != null ? response.rawStatusCode() : null);
+            response != null ? response.statusCode().value() : null);
 
     final Hint hint = new Hint();
     hint.set(SPRING_EXCHANGE_FILTER_REQUEST, request);

diff --git a/...-spring-jakarta/src/main/java/io/sentry/spring/jakarta/webflux/SentryRequestResolver.java b/...-spring-jakarta/src/main/java/io/sentry/spring/jakarta/webflux/SentryRequestResolver.java
@@ -25,7 +25,9 @@ public SentryRequestResolver(final @NotNull IHub hub) {
 
   public @NotNull Request resolveSentryRequest(final @NotNull ServerHttpRequest httpRequest) {
     final Request sentryRequest = new Request();
-    sentryRequest.setMethod(httpRequest.getMethodValue());
+    final String methodName =
+      httpRequest.getMethod() != null ? httpRequest.getMethod().name() : "unknown";
+    sentryRequest.setMethod(methodName);
     sentryRequest.setQueryString(httpRequest.getURI().getQuery());
     sentryRequest.setUrl(httpRequest.getURI().toString());
     sentryRequest.setHeaders(resolveHeadersMap(httpRequest.getHeaders()));