[WIP] test with spring boot 3.5.0 (#4111)

* Bump Spring Boot to 3.4.1

* changelog

* update to spring boot 3.4.2

* fix jdbc dependencies for jakarta samples

* update readme

* update logback dependency in jakarta samples

* [WIP] test with spring boot 3.5.0

* Update buildSrc/src/main/java/Config.kt

* adapt to breaking change in spring-graphql-1.4.0, fix test, add withOptions to sample

* bump to Spring Boot 3.5.0

* trigger CI?

* update spring boot version in toml

* move changelog

* revert maven milestone repos

* fix changelog

* restore old changelog entry

* fix gh pr link

---------

Co-authored-by: Alexander Dinauer <alexander.dinauer@sentry.io>
Co-authored-by: Alexander Dinauer <adinauer@users.noreply.github.com>
Co-authored-by: Lorenzo Cian <lorenzo.cian@sentry.io>

Author: 3 people

CHANGELOG.md

@@ -21,6 +21,10 @@
     - `SentryAttribute.stringAttribute()` takes a `String` value
   - We opted for handling parameters via `SentryLogParameters` to avoid creating tons of overloads that are ambiguous.
 
+### Dependencies
+
+- Bump Spring Boot to `3.5.0` ([#4111](https://github.com/getsentry/sentry-java/pull/4111))
+
 ## 8.12.0
 
 ### Features

buildSrc/src/main/java/Config.kt

@@ -6,7 +6,7 @@ object Config {
     val kotlinStdLib = "stdlib-jdk8"
 
     val springBootVersion = "2.7.18"
-    val springBoot3Version = "3.4.2"
+    val springBoot3Version = "3.5.0"
     val kotlinCompatibleLanguageVersion = "1.6"
 
     val androidComposeCompilerVersion = "1.5.14"

gradle/libs.versions.toml

@@ -14,7 +14,7 @@ otelInstrumentationAlpha = "2.10.0-alpha"
 # check https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/dependencyManagement/build.gradle.kts#L49 for release version above to find a compatible version
 otelSemanticConvetions = "1.28.0-alpha"
 springTwo = "2.7.18"
-springThree = "3.4.2"
+springThree = "3.5.0"
 targetSdk = "34"
 compileSdk = "34"
 minSdk = "21"

sentry-samples/sentry-samples-spring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/graphql/TaskCreatorController.java

@@ -20,6 +20,7 @@ public TaskCreatorController(final BatchLoaderRegistry batchLoaderRegistry) {
     // using mapped BatchLoader to not have to deal with correct ordering of items
     batchLoaderRegistry
         .forTypePair(String.class, ProjectController.Creator.class)
+        .withOptions((builder) -> builder.setBatchingEnabled(true))
         .registerMappedBatchLoader(
             (Set<String> keys, BatchLoaderEnvironment env) -> {
               return Mono.fromCallable(

sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/graphql/SentryBatchLoaderRegistry.java

@@ -76,7 +76,7 @@ public BatchLoaderRegistry.RegistrationSpec<K, V> withName(String name) {
 
     @Override
     public BatchLoaderRegistry.RegistrationSpec<K, V> withOptions(
-        Consumer<DataLoaderOptions> optionsConsumer) {
+        Consumer<DataLoaderOptions.Builder> optionsConsumer) {
       return delegate.withOptions(optionsConsumer);
     }
 

sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/graphql/SentrySpringSubscriptionHandlerTest.kt

@@ -1,14 +1,14 @@
-package io.sentry.spring.graphql
+package io.sentry.spring.jakarta.graphql
 
 import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters
 import graphql.language.Document
 import graphql.language.OperationDefinition
 import graphql.schema.DataFetchingEnvironment
 import io.sentry.IScopes
 import io.sentry.graphql.ExceptionReporter
-import io.sentry.spring.jakarta.graphql.SentrySpringSubscriptionHandler
 import org.junit.jupiter.api.assertThrows
 import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.check
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.same
 import org.mockito.kotlin.verify
@@ -40,10 +40,10 @@ class SentrySpringSubscriptionHandlerTest {
 
         verify(exceptionReporter).captureThrowable(
             same(exception),
-            org.mockito.kotlin.check {
+            check {
                 assertEquals(true, it.isSubscription)
                 assertSame(scopes, it.scopes)
-                assertEquals("query testQuery\n", it.query)
+                assertEquals("query testQuery \n", it.query)
             },
             anyOrNull()
         )
@@ -69,10 +69,10 @@ class SentrySpringSubscriptionHandlerTest {
 
         verify(exceptionReporter).captureThrowable(
             same(exception),
-            org.mockito.kotlin.check {
+            check {
                 assertEquals(true, it.isSubscription)
                 assertSame(scopes, it.scopes)
-                assertEquals("query testQuery\n", it.query)
+                assertEquals("query testQuery \n", it.query)
             },
             anyOrNull()
         )