From fb58cda8aac46323038c4ab61eda96f7ac440655 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Fri, 19 Dec 2025 11:28:30 +0100 Subject: [PATCH 1/2] Bump OpenTelemetry --- gradle/libs.versions.toml | 11 ++++++----- sentry-spring-boot-jakarta/build.gradle.kts | 7 +++++++ sentry-spring-boot/build.gradle.kts | 7 +++++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4563d15564b..542242adc6f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,12 +22,12 @@ nopen = "1.0.1" # see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility # see https://developer.android.com/jetpack/androidx/releases/compose-kotlin okhttp = "4.9.2" -otel = "1.51.0" -otelInstrumentation = "2.17.0" -otelInstrumentationAlpha = "2.17.0-alpha" +otel = "1.57.0" +otelInstrumentation = "2.23.0" +otelInstrumentationAlpha = "2.23.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.34.0" -otelSemanticConventionsAlpha = "1.34.0-alpha" +otelSemanticConventions = "1.37.0" +otelSemanticConventionsAlpha = "1.37.0-alpha" retrofit = "2.9.0" slf4j = "1.7.30" springboot2 = "2.7.18" @@ -127,6 +127,7 @@ nopen-annotations = { module = "com.jakewharton.nopen:nopen-annotations", versio nopen-checker = { module = "com.jakewharton.nopen:nopen-checker", version.ref = "nopen" } nullaway = { module = "com.uber.nullaway:nullaway", version = "0.9.5" } okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" } +okhttp-bom = { module = "com.squareup.okhttp3:okhttp-bom", version.ref = "okhttp" } openfeature = { module = "dev.openfeature:sdk", version.ref = "openfeature" } otel = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "otel" } otel-extension-autoconfigure = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref = "otel" } diff --git a/sentry-spring-boot-jakarta/build.gradle.kts b/sentry-spring-boot-jakarta/build.gradle.kts index 4679ce879dd..119b44aa4f2 100644 --- a/sentry-spring-boot-jakarta/build.gradle.kts +++ b/sentry-spring-boot-jakarta/build.gradle.kts @@ -24,6 +24,13 @@ tasks.withType().configureEach { compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } +configurations.all { + resolutionStrategy { + force(libs.okhttp) + force(libs.okhttp.mockwebserver) + } +} + dependencies { api(projects.sentry) api(projects.sentrySpringJakarta) diff --git a/sentry-spring-boot/build.gradle.kts b/sentry-spring-boot/build.gradle.kts index 5e579126d53..1272b1de671 100644 --- a/sentry-spring-boot/build.gradle.kts +++ b/sentry-spring-boot/build.gradle.kts @@ -19,6 +19,13 @@ tasks.withType().configureEach { compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } +configurations.all { + resolutionStrategy { + force(libs.okhttp) + force(libs.okhttp.mockwebserver) + } +} + dependencies { api(projects.sentry) api(projects.sentrySpring) From 949ec8b72bc2691c2e2b0f2f7df0ee5c6321f811 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Fri, 19 Dec 2025 14:14:35 +0100 Subject: [PATCH 2/2] use version contraints instead of forced resolution --- sentry-spring-boot-jakarta/build.gradle.kts | 12 ++++++------ sentry-spring-boot/build.gradle.kts | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sentry-spring-boot-jakarta/build.gradle.kts b/sentry-spring-boot-jakarta/build.gradle.kts index 119b44aa4f2..04166519240 100644 --- a/sentry-spring-boot-jakarta/build.gradle.kts +++ b/sentry-spring-boot-jakarta/build.gradle.kts @@ -24,14 +24,14 @@ tasks.withType().configureEach { compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } -configurations.all { - resolutionStrategy { - force(libs.okhttp) - force(libs.okhttp.mockwebserver) +dependencies { + constraints { + testImplementation(libs.okhttp) { version { strictly(libs.versions.okhttp.get()) } } + testImplementation(libs.okhttp.mockwebserver) { + version { strictly(libs.versions.okhttp.get()) } + } } -} -dependencies { api(projects.sentry) api(projects.sentrySpringJakarta) compileOnly(projects.sentryLogback) diff --git a/sentry-spring-boot/build.gradle.kts b/sentry-spring-boot/build.gradle.kts index 1272b1de671..a81613e5e1e 100644 --- a/sentry-spring-boot/build.gradle.kts +++ b/sentry-spring-boot/build.gradle.kts @@ -19,14 +19,14 @@ tasks.withType().configureEach { compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } -configurations.all { - resolutionStrategy { - force(libs.okhttp) - force(libs.okhttp.mockwebserver) +dependencies { + constraints { + testImplementation(libs.okhttp) { version { strictly(libs.versions.okhttp.get()) } } + testImplementation(libs.okhttp.mockwebserver) { + version { strictly(libs.versions.okhttp.get()) } + } } -} -dependencies { api(projects.sentry) api(projects.sentrySpring) compileOnly(projects.sentryLogback)