Merge branch 'main' into feat/launchdarkly

Author: adinauer

.github/workflows/spring-boot-4-matrix.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        springboot-version: [ '4.0.0-M1', '4.0.0-M2', '4.0.0-M3' ]
+        springboot-version: [ '4.0.0' ]
 
     name: Spring Boot ${{ matrix.springboot-version }}
     env:

CHANGELOG.md

@@ -19,6 +19,10 @@
 
 - Do not send manual log origin ([#4897](https://github.com/getsentry/sentry-java/pull/4897))
 
+### Dependencies
+
+- Bump Spring Boot 4 to GA ([#4923](https://github.com/getsentry/sentry-java/pull/4923))
+
 ## 8.26.0
 
 ### Features

gradle/libs.versions.toml

@@ -32,7 +32,7 @@ retrofit = "2.9.0"
 slf4j = "1.7.30"
 springboot2 = "2.7.18"
 springboot3 = "3.5.0"
-springboot4 = "4.0.0-RC2"
+springboot4 = "4.0.0"
 # Android
 targetSdk = "34"
 compileSdk = "34"

sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentrySpanRestClientCustomizerTest.kt

@@ -89,7 +89,6 @@ class SentrySpanRestClientCustomizerTest {
             .disableAutomaticRetries() // Required to not make another request automatically
             .build()
         val requestFactory = HttpComponentsClientHttpRequestFactory(httpClient)
-        requestFactory.setConnectTimeout(Duration.ofSeconds(2))
         requestFactory.setConnectionRequestTimeout(Duration.ofSeconds(2))
         it.requestFactory(requestFactory)
       }