[WIP] test with spring boot 3.5.0

CHANGELOG.md

@@ -415,6 +415,10 @@ If you would like to keep some of the default broadcast events as breadcrumbs, c
   - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0719)
   - [diff](https://github.com/getsentry/sentry-native/compare/v0.7.14...0.7.19)
 
+### Dependencies
+
+- Bump Spring Boot to `3.4.2` ([#4081](https://github.com/getsentry/sentry-java/pull/4081))
+
 ## 8.0.0
 
 ### Summary

build.gradle.kts

@@ -23,6 +23,7 @@ plugins {
 buildscript {
     repositories {
         google()
+        maven(url = "https://repo.spring.io/milestone")
     }
     dependencies {
         classpath(Config.BuildPlugins.androidGradle)
@@ -82,6 +83,7 @@ allprojects {
         google()
         mavenCentral()
         mavenLocal()
+        maven(url = "https://repo.spring.io/milestone")
     }
     group = Config.Sentry.group
     version = properties[Config.Sentry.versionNameProp].toString()

buildSrc/src/main/java/Config.kt

@@ -7,7 +7,7 @@ object Config {
     val kotlinStdLib = "stdlib-jdk8"
 
     val springBootVersion = "2.7.18"
-    val springBoot3Version = "3.4.2"
+    val springBoot3Version = "3.5.0-RC1"
     val kotlinCompatibleLanguageVersion = "1.6"
 
     // see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility

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()
         )

settings.gradle.kts

@@ -4,6 +4,7 @@ pluginManagement {
     repositories {
         mavenCentral()
         gradlePluginPortal()
+        maven(url = "https://repo.spring.io/milestone")
     }
 }