From 5712c5ef03c42ec7e35624947e4162f64426299b Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Mon, 22 Jun 2026 10:56:21 +0200 Subject: [PATCH 1/3] fix(spring): Support Spring Boot 4.1 Bump OpenTelemetry and Spring Boot dependencies to compatible versions so the Spring Boot 4 OpenTelemetry sample works with Spring Boot 4.1. Keep the Spring 7 sample on the repository Kotlin compiler version when importing the Spring Boot BOM, and add Spring Boot 4.1 to the system test matrix. Fixes GH-5561 Co-Authored-By: Claude --- .github/workflows/spring-boot-4-matrix.yml | 2 +- gradle/libs.versions.toml | 14 +++++++------- .../sentry-samples-spring-7/build.gradle.kts | 2 ++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/spring-boot-4-matrix.yml b/.github/workflows/spring-boot-4-matrix.yml index 128051ed03e..e408cad451c 100644 --- a/.github/workflows/spring-boot-4-matrix.yml +++ b/.github/workflows/spring-boot-4-matrix.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - springboot-version: [ '4.0.0', '4.0.5' ] + springboot-version: [ '4.0.0', '4.0.5', '4.1.0' ] name: Spring Boot ${{ matrix.springboot-version }} env: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 91a7669194f..2848c7f0bf5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,12 +25,12 @@ nopen = "1.0.1" # see https://developer.android.com/jetpack/androidx/releases/compose-kotlin okhttp = "4.9.2" openfeature = "1.18.2" -otel = "1.60.1" -otelInstrumentation = "2.26.0" -otelInstrumentationAlpha = "2.26.0-alpha" +otel = "1.63.0" +otelInstrumentation = "2.29.0" +otelInstrumentationAlpha = "2.29.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 -otelSemanticConventions = "1.40.0" -otelSemanticConventionsAlpha = "1.40.0-alpha" +otelSemanticConventions = "1.42.0" +otelSemanticConventionsAlpha = "1.42.0-alpha" retrofit = "2.9.0" room2 = "2.8.4" room3 = "3.0.0-alpha06" @@ -38,10 +38,10 @@ sagp = "6.10.0" sqlite = "2.6.2" sqliteAlpha = "2.7.0-alpha06" # Required by Room3 3.0.0-alpha* slf4j = "1.7.30" -spotless = "8.4.0" +spotless = "8.6.0" springboot2 = "2.7.18" springboot3 = "3.5.0" -springboot4 = "4.0.0" +springboot4 = "4.1.0" sqldelight = "2.3.2" # Android diff --git a/sentry-samples/sentry-samples-spring-7/build.gradle.kts b/sentry-samples/sentry-samples-spring-7/build.gradle.kts index e3300cd2841..e70853e7968 100644 --- a/sentry-samples/sentry-samples-spring-7/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-7/build.gradle.kts @@ -27,6 +27,8 @@ java.targetCompatibility = JavaVersion.VERSION_17 repositories { mavenCentral() } +extra["kotlin.version"] = KotlinCompilerVersion.VERSION + dependencyManagement { imports { mavenBom(SpringBootPlugin.BOM_COORDINATES) } } dependencies { From 3d118627823680be1dba1d1edc5caaa77c117e01 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Mon, 22 Jun 2026 11:00:42 +0200 Subject: [PATCH 2/3] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8428f033b78..199f803cc14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ - To use it, pass `SQLiteDriver` to `SentrySQLiteDriver.create(...)` - Requires `androidx.sqlite:sqlite` (2.5.0+) on runtime classpath (typically provided by Room or SQLDelight) +### Dependencies + +- Bump Spring Boot 4 and OpenTelemetry dependencies ([#5573](https://github.com/getsentry/sentry-java/pull/5573)) + ## 8.44.0 ### Features From c1d9f8905fdda990c572236f732f89868c0b67f3 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Mon, 22 Jun 2026 12:52:08 +0200 Subject: [PATCH 3/3] build: Bump Kotlin to 2.3.21 Align the global Kotlin version with Spring Boot 4.1 and remove the now-unneeded Spring 7 BOM override. Also remove unused Spring 7-specific Kotlin aliases from the version catalog. Co-Authored-By: Claude --- gradle/libs.versions.toml | 6 +----- sentry-samples/sentry-samples-spring-7/build.gradle.kts | 2 -- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2848c7f0bf5..bd984cbd5bf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,8 +13,7 @@ feign = "11.6" gummyBears = "0.12.0" jackson = "2.18.3" jetbrainsCompose = "1.6.11" -kotlin = "2.2.0" -kotlinSpring7 = "2.2.0" +kotlin = "2.3.21" kotlin-compatible-version = "1.9" ksp = "2.3.9" ktorClient = "3.0.0" @@ -52,8 +51,6 @@ minSdk = "21" [plugins] kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" } -kotlin-spring7 = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlinSpring7" } -kotlin-jvm-spring7 = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlinSpring7" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } @@ -130,7 +127,6 @@ jackson-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin" jetbrains-annotations = { module = "org.jetbrains:annotations", version = "23.0.0" } kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" } kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } -kotlin-test-junit-spring7 = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlinSpring7" } kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktorClient" } diff --git a/sentry-samples/sentry-samples-spring-7/build.gradle.kts b/sentry-samples/sentry-samples-spring-7/build.gradle.kts index e70853e7968..e3300cd2841 100644 --- a/sentry-samples/sentry-samples-spring-7/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-7/build.gradle.kts @@ -27,8 +27,6 @@ java.targetCompatibility = JavaVersion.VERSION_17 repositories { mavenCentral() } -extra["kotlin.version"] = KotlinCompilerVersion.VERSION - dependencyManagement { imports { mavenBom(SpringBootPlugin.BOM_COORDINATES) } } dependencies {