Skip to content

Commit fb58cda

Browse files
committed
Bump OpenTelemetry
1 parent ed33deb commit fb58cda

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

gradle/libs.versions.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ nopen = "1.0.1"
2222
# see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility
2323
# see https://developer.android.com/jetpack/androidx/releases/compose-kotlin
2424
okhttp = "4.9.2"
25-
otel = "1.51.0"
26-
otelInstrumentation = "2.17.0"
27-
otelInstrumentationAlpha = "2.17.0-alpha"
25+
otel = "1.57.0"
26+
otelInstrumentation = "2.23.0"
27+
otelInstrumentationAlpha = "2.23.0-alpha"
2828
# 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
29-
otelSemanticConventions = "1.34.0"
30-
otelSemanticConventionsAlpha = "1.34.0-alpha"
29+
otelSemanticConventions = "1.37.0"
30+
otelSemanticConventionsAlpha = "1.37.0-alpha"
3131
retrofit = "2.9.0"
3232
slf4j = "1.7.30"
3333
springboot2 = "2.7.18"
@@ -127,6 +127,7 @@ nopen-annotations = { module = "com.jakewharton.nopen:nopen-annotations", versio
127127
nopen-checker = { module = "com.jakewharton.nopen:nopen-checker", version.ref = "nopen" }
128128
nullaway = { module = "com.uber.nullaway:nullaway", version = "0.9.5" }
129129
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
130+
okhttp-bom = { module = "com.squareup.okhttp3:okhttp-bom", version.ref = "okhttp" }
130131
openfeature = { module = "dev.openfeature:sdk", version.ref = "openfeature" }
131132
otel = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "otel" }
132133
otel-extension-autoconfigure = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref = "otel" }

sentry-spring-boot-jakarta/build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ tasks.withType<KotlinCompile>().configureEach {
2424
compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
2525
}
2626

27+
configurations.all {
28+
resolutionStrategy {
29+
force(libs.okhttp)
30+
force(libs.okhttp.mockwebserver)
31+
}
32+
}
33+
2734
dependencies {
2835
api(projects.sentry)
2936
api(projects.sentrySpringJakarta)

sentry-spring-boot/build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ tasks.withType<KotlinCompile>().configureEach {
1919
compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
2020
}
2121

22+
configurations.all {
23+
resolutionStrategy {
24+
force(libs.okhttp)
25+
force(libs.okhttp.mockwebserver)
26+
}
27+
}
28+
2229
dependencies {
2330
api(projects.sentry)
2431
api(projects.sentrySpring)

0 commit comments

Comments
 (0)