From f756b62e9a82b815462e50a5f281d8405311bb40 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Tue, 21 Jan 2025 07:49:29 +0100 Subject: [PATCH 1/9] Bump Spring Boot to 3.4.1 --- buildSrc/src/main/java/Config.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index c52cfdc642..8dc42f2aec 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -7,7 +7,7 @@ object Config { val kotlinStdLib = "stdlib-jdk8" val springBootVersion = "2.7.5" - val springBoot3Version = "3.4.0" + val springBoot3Version = "3.4.1" val kotlinCompatibleLanguageVersion = "1.4" val composeVersion = "1.5.3" From b01287b5a0fb163169d231bc589ed484ef1506a5 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Tue, 21 Jan 2025 14:31:20 +0100 Subject: [PATCH 2/9] changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30aba6f133..7aa53c5c9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Dependencies + +- Bump Spring Boot to `3.4.1` ([#4081](https://github.com/getsentry/sentry-java/pull/4081)) + ## 8.0.0 Version 8 of the Sentry Android/Java SDK brings a variety of features and fixes. The most notable changes are: From f21b0fb24fea0438591a7dfc503d2d7d4e9afd60 Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Mon, 27 Jan 2025 10:35:09 +0100 Subject: [PATCH 3/9] update to spring boot 3.4.2 --- buildSrc/src/main/java/Config.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 8dc42f2aec..aadf7b14f8 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -7,7 +7,7 @@ object Config { val kotlinStdLib = "stdlib-jdk8" val springBootVersion = "2.7.5" - val springBoot3Version = "3.4.1" + val springBoot3Version = "3.4.2" val kotlinCompatibleLanguageVersion = "1.4" val composeVersion = "1.5.3" From 9f135dbb04b40007c3d48376e69369d9e9d83f96 Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Mon, 27 Jan 2025 10:35:29 +0100 Subject: [PATCH 4/9] fix jdbc dependencies for jakarta samples --- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../sentry-samples-spring-boot-jakarta/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts index eebb0dcd84..bd1bce43fe 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts @@ -46,7 +46,7 @@ dependencies { implementation(Config.Libs.aspectj) implementation(Config.Libs.springBoot3Starter) implementation(Config.Libs.kotlinReflect) - implementation(Config.Libs.springBootStarterJdbc) + implementation(Config.Libs.springBoot3StarterJdbc) implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION)) implementation(projects.sentrySpringBootStarterJakarta) implementation(projects.sentryLogback) diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts index fe5dec4415..f51c271f16 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts @@ -47,7 +47,7 @@ dependencies { implementation(Config.Libs.aspectj) implementation(Config.Libs.springBoot3Starter) implementation(Config.Libs.kotlinReflect) - implementation(Config.Libs.springBootStarterJdbc) + implementation(Config.Libs.springBoot3StarterJdbc) implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION)) implementation(projects.sentrySpringBootStarterJakarta) implementation(projects.sentryLogback) diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts index 2f00573628..3ed7b0721a 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts @@ -46,7 +46,7 @@ dependencies { implementation(Config.Libs.aspectj) implementation(Config.Libs.springBoot3Starter) implementation(Config.Libs.kotlinReflect) - implementation(Config.Libs.springBootStarterJdbc) + implementation(Config.Libs.springBoot3StarterJdbc) implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION)) implementation(projects.sentrySpringBootStarterJakarta) implementation(projects.sentryLogback) From 0274a241e61835bbb741226a5959eb8ad8800249 Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Mon, 27 Jan 2025 11:05:51 +0100 Subject: [PATCH 5/9] update readme --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14c86427e2..e5d824a9c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ ### Dependencies -- Bump Spring Boot to `3.4.1` ([#4081](https://github.com/getsentry/sentry-java/pull/4081)) +- Bump Spring Boot to `3.4.2` ([#4081](https://github.com/getsentry/sentry-java/pull/4081)) ## 8.0.0 From d8b89fa11372a54199d172e5ea9f664e7e065018 Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Mon, 27 Jan 2025 11:49:44 +0100 Subject: [PATCH 6/9] update logback dependency in jakarta samples --- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../sentry-samples-spring-boot-jakarta/build.gradle.kts | 2 +- .../sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts index bd1bce43fe..bd08b78c04 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts @@ -62,7 +62,7 @@ dependencies { } testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(Config.TestLibs.kotlinTestJunit) - testImplementation("ch.qos.logback:logback-classic:1.3.5") + testImplementation("ch.qos.logback:logback-classic:1.5.16") testImplementation(Config.Libs.slf4jApi2) testImplementation(Config.Libs.apolloKotlin) } diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts index f51c271f16..acfc0d24d9 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts @@ -63,7 +63,7 @@ dependencies { } testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(Config.TestLibs.kotlinTestJunit) - testImplementation("ch.qos.logback:logback-classic:1.3.5") + testImplementation("ch.qos.logback:logback-classic:1.5.16") testImplementation(Config.Libs.slf4jApi2) testImplementation(Config.Libs.apolloKotlin) } diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts index 3ed7b0721a..242859656c 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts @@ -61,7 +61,7 @@ dependencies { } testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(Config.TestLibs.kotlinTestJunit) - testImplementation("ch.qos.logback:logback-classic:1.3.5") + testImplementation("ch.qos.logback:logback-classic:1.5.16") testImplementation(Config.Libs.slf4jApi2) testImplementation(Config.Libs.apolloKotlin) testImplementation(projects.sentry) diff --git a/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts index 9b60918081..fcc34c8b5b 100644 --- a/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { } testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(Config.TestLibs.kotlinTestJunit) - testImplementation("ch.qos.logback:logback-classic:1.3.5") + testImplementation("ch.qos.logback:logback-classic:1.5.16") testImplementation(Config.Libs.slf4jApi2) testImplementation(Config.Libs.apolloKotlin) } From 14b733f07d69beeb3e9bc19687551ec9b8315cea Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Mon, 27 Jan 2025 12:44:20 +0100 Subject: [PATCH 7/9] [WIP] test with spring boot 3.5.0 --- build.gradle.kts | 2 ++ buildSrc/src/main/java/Config.kt | 2 +- settings.gradle.kts | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index e7d828e61f..72dc83939d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,6 +22,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() diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index aadf7b14f8..27eb1de01d 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -7,7 +7,7 @@ object Config { val kotlinStdLib = "stdlib-jdk8" val springBootVersion = "2.7.5" - val springBoot3Version = "3.4.2" + val springBoot3Version = "3.5.0-M1" val kotlinCompatibleLanguageVersion = "1.4" val composeVersion = "1.5.3" diff --git a/settings.gradle.kts b/settings.gradle.kts index d99f0f0e0a..d0b0faf684 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,6 +4,7 @@ pluginManagement { repositories { mavenCentral() gradlePluginPortal() + maven(url = "https://repo.spring.io/milestone") } } From 048a21482f0cb33a44a7e9f25c7c8f110f21b074 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Mon, 28 Apr 2025 13:24:12 +0200 Subject: [PATCH 8/9] Update buildSrc/src/main/java/Config.kt --- buildSrc/src/main/java/Config.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 27eb1de01d..2ac5fcf195 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -7,7 +7,7 @@ object Config { val kotlinStdLib = "stdlib-jdk8" val springBootVersion = "2.7.5" - val springBoot3Version = "3.5.0-M1" + val springBoot3Version = "3.5.0-RC1" val kotlinCompatibleLanguageVersion = "1.4" val composeVersion = "1.5.3" From 4852dc83b744c3ac2b70ef237f23e61f9d5792f7 Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Tue, 6 May 2025 08:37:35 +0200 Subject: [PATCH 9/9] adapt to breaking change in spring-graphql-1.4.0, fix test, add withOptions to sample --- .../boot/jakarta/graphql/TaskCreatorController.java | 1 + .../jakarta/graphql/SentryBatchLoaderRegistry.java | 2 +- .../graphql/SentrySpringSubscriptionHandlerTest.kt | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/graphql/TaskCreatorController.java b/sentry-samples/sentry-samples-spring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/graphql/TaskCreatorController.java index cb6677c0c3..434a482208 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/graphql/TaskCreatorController.java +++ b/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 keys, BatchLoaderEnvironment env) -> { return Mono.fromCallable( diff --git a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/graphql/SentryBatchLoaderRegistry.java b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/graphql/SentryBatchLoaderRegistry.java index e31c6a725d..a75aa28134 100644 --- a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/graphql/SentryBatchLoaderRegistry.java +++ b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/graphql/SentryBatchLoaderRegistry.java @@ -76,7 +76,7 @@ public BatchLoaderRegistry.RegistrationSpec withName(String name) { @Override public BatchLoaderRegistry.RegistrationSpec withOptions( - Consumer optionsConsumer) { + Consumer optionsConsumer) { return delegate.withOptions(optionsConsumer); } diff --git a/sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/graphql/SentrySpringSubscriptionHandlerTest.kt b/sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/graphql/SentrySpringSubscriptionHandlerTest.kt index c2ebb95e48..243dc9d949 100644 --- a/sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/graphql/SentrySpringSubscriptionHandlerTest.kt +++ b/sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/graphql/SentrySpringSubscriptionHandlerTest.kt @@ -1,4 +1,4 @@ -package io.sentry.spring.graphql +package io.sentry.spring.jakarta.graphql import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters import graphql.language.Document @@ -6,9 +6,9 @@ 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() )