Skip to content

Commit d262fa8

Browse files
rbro112rbro112
authored
Migrate otel dependencies to version catalog (#4440)
* Migrate otel dependencies to version catalog * Spelling
1 parent 604f1f4 commit d262fa8

File tree

16 files changed

+56
-59
lines changed

16 files changed

+56
-59
lines changed

‎buildSrc/src/main/java/Config.kt‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ object Config {
7676
val springBoot3StarterSecurity = "org.springframework.boot:spring-boot-starter-security:$springBoot3Version"
7777
val springBoot3StarterJdbc = "org.springframework.boot:spring-boot-starter-jdbc:$springBoot3Version"
7878
val springBoot3StarterActuator = "org.springframework.boot:spring-boot-starter-actuator:$springBoot3Version"
79-
val springBoot3StarterOpenTelemetry = "io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter:${OpenTelemetry.otelInstrumentationVersion}"
8079

8180
val springWeb = "org.springframework:spring-webmvc"
8281
val springWebflux = "org.springframework:spring-webflux"
@@ -126,24 +125,6 @@ object Config {
126125
val apolloKotlin4 = "com.apollographql.apollo:apollo-runtime:4.1.1"
127126

128127
val sentryNativeNdk = "io.sentry:sentry-native-ndk:0.8.4"
129-
130-
object OpenTelemetry {
131-
val otelVersion = "1.44.1"
132-
val otelAlphaVersion = "$otelVersion-alpha"
133-
val otelInstrumentationVersion = "2.10.0"
134-
val otelInstrumentationAlphaVersion = "$otelInstrumentationVersion-alpha"
135-
val otelSemanticConvetionsVersion = "1.28.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
136-
137-
val otelSdk = "io.opentelemetry:opentelemetry-sdk:$otelVersion"
138-
val otelSemconv = "io.opentelemetry.semconv:opentelemetry-semconv:$otelSemanticConvetionsVersion"
139-
val otelSemconvIncubating = "io.opentelemetry.semconv:opentelemetry-semconv-incubating:$otelSemanticConvetionsVersion"
140-
val otelJavaAgent = "io.opentelemetry.javaagent:opentelemetry-javaagent:$otelInstrumentationVersion"
141-
val otelJavaAgentExtensionApi = "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion"
142-
val otelJavaAgentTooling = "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion"
143-
val otelExtensionAutoconfigureSpi = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:$otelVersion"
144-
val otelExtensionAutoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:$otelVersion"
145-
val otelInstrumentationBom = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:$otelInstrumentationVersion"
146-
}
147128
}
148129

149130
object AnnotationProcessors {

‎gradle/libs.versions.toml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ kotlin = "1.9.24"
88
# see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility
99
# see https://developer.android.com/jetpack/androidx/releases/compose-kotlin
1010
okhttp = "4.9.2"
11+
otel = "1.44.1"
12+
otelInstrumentation = "2.10.0"
13+
otelInstrumentationAlpha = "2.10.0-alpha"
14+
# 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
15+
otelSemanticConventions = "1.28.0-alpha"
1116
springTwo = "2.7.18"
1217
springThree = "3.5.0"
1318
targetSdk = "34"
@@ -49,6 +54,16 @@ androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime
4954
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" }
5055
coil-compose = { module = "io.coil-kt:coil-compose", version = "2.6.0" }
5156
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
57+
otel = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "otel" }
58+
otel-extension-autoconfigure = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref = "otel" }
59+
otel-extension-autoconfigure-spi = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", version.ref = "otel" }
60+
otel-instrumentation-bom = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom", version.ref = "otelInstrumentation" }
61+
otel-javaagent = { module = "io.opentelemetry.javaagent:opentelemetry-javaagent", version.ref = "otelInstrumentation" }
62+
otel-javaagent-tooling = { module = "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling", version.ref = "otelInstrumentationAlpha" }
63+
otel-javaagent-extension-api = { module = "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api", version.ref = "otelInstrumentationAlpha" }
64+
otel-semconv = { module = "io.opentelemetry.semconv:opentelemetry-semconv", version.ref = "otelSemanticConventions" }
65+
otel-semconv-incubating = { module = "io.opentelemetry.semconv:opentelemetry-semconv-incubating", version.ref = "otelSemanticConventions" }
66+
springboot3-otel = { module = "io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter", version.ref = "otelInstrumentation" }
5267

5368
# test libraries
5469
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version = "1.6.8" }

‎sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ dependencies {
5050
bootstrapLibs(projects.sentry)
5151
bootstrapLibs(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap)
5252
javaagentLibs(projects.sentryOpentelemetry.sentryOpentelemetryAgentcustomization)
53-
upstreamAgent(Config.Libs.OpenTelemetry.otelJavaAgent)
53+
upstreamAgent(libs.otel.javaagent)
5454
}
5555

5656
fun isolateClasses(jars: Iterable<File>): CopySpec {
@@ -148,12 +148,12 @@ tasks {
148148
attributes.put("Implementation-Vendor", "Sentry")
149149
attributes.put("Implementation-Title", project.name)
150150
attributes.put("Implementation-Version", project.version)
151-
attributes.put("Sentry-Version-Name", "sentry-${project.version}-otel-${Config.Libs.OpenTelemetry.otelInstrumentationVersion}")
151+
attributes.put("Sentry-Version-Name", "sentry-${project.version}-otel-${libs.versions.otelInstrumentation.get()}")
152152
attributes.put("Sentry-SDK-Name", Config.Sentry.SENTRY_OPENTELEMETRY_AGENT_SDK_NAME)
153153
attributes.put("Sentry-SDK-Package-Name", "maven:io.sentry:sentry-opentelemetry-agent")
154154
attributes.put("Sentry-Opentelemetry-SDK-Name", Config.Sentry.SENTRY_OPENTELEMETRY_AGENT_SDK_NAME)
155-
attributes.put("Sentry-Opentelemetry-Version-Name", Config.Libs.OpenTelemetry.otelVersion)
156-
attributes.put("Sentry-Opentelemetry-Javaagent-Version-Name", Config.Libs.OpenTelemetry.otelInstrumentationVersion)
155+
attributes.put("Sentry-Opentelemetry-Version-Name", libs.versions.otel.get())
156+
attributes.put("Sentry-Opentelemetry-Javaagent-Version-Name", libs.versions.otelInstrumentation.get())
157157
}
158158
}
159159

‎sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ dependencies {
2121
}
2222
compileOnly(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap)
2323

24-
compileOnly(Config.Libs.OpenTelemetry.otelSdk)
25-
compileOnly(Config.Libs.OpenTelemetry.otelExtensionAutoconfigureSpi)
26-
compileOnly(Config.Libs.OpenTelemetry.otelJavaAgentExtensionApi)
27-
compileOnly(Config.Libs.OpenTelemetry.otelJavaAgentTooling)
24+
compileOnly(libs.otel)
25+
compileOnly(libs.otel.extension.autoconfigure.spi)
26+
compileOnly(libs.otel.javaagent.extension.api)
27+
compileOnly(libs.otel.javaagent.tooling)
2828

2929
compileOnly(Config.CompileOnly.nopen)
3030
errorprone(Config.CompileOnly.nopenChecker)

‎sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ dependencies {
77
api(projects.sentry)
88
implementation(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap)
99
implementation(projects.sentryOpentelemetry.sentryOpentelemetryAgentcustomization)
10-
api(Config.Libs.OpenTelemetry.otelSdk)
11-
api(Config.Libs.OpenTelemetry.otelSemconv)
12-
api(Config.Libs.OpenTelemetry.otelSemconvIncubating)
13-
api(Config.Libs.OpenTelemetry.otelExtensionAutoconfigure)
14-
api(Config.Libs.springBoot3StarterOpenTelemetry)
10+
11+
api(libs.otel)
12+
api(libs.otel.semconv)
13+
api(libs.otel.semconv.incubating)
14+
api(libs.otel.extension.autoconfigure)
15+
api(libs.springboot3.otel)
1516
}
1617

1718
buildConfig {

‎sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ dependencies {
77
api(projects.sentry)
88
implementation(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap)
99
implementation(projects.sentryOpentelemetry.sentryOpentelemetryAgentcustomization)
10-
api(Config.Libs.OpenTelemetry.otelSdk)
11-
api(Config.Libs.OpenTelemetry.otelSemconv)
12-
api(Config.Libs.OpenTelemetry.otelSemconvIncubating)
13-
api(Config.Libs.OpenTelemetry.otelExtensionAutoconfigure)
10+
api(libs.otel)
11+
api(libs.otel.semconv)
12+
api(libs.otel.semconv.incubating)
13+
api(libs.otel.extension.autoconfigure)
1414
}
1515

1616
buildConfig {

‎sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ tasks.withType<KotlinCompile>().configureEach {
1616
dependencies {
1717
compileOnly(projects.sentry)
1818

19-
compileOnly(Config.Libs.OpenTelemetry.otelSdk)
19+
compileOnly(libs.otel)
2020

2121
compileOnly(Config.CompileOnly.nopen)
2222
errorprone(Config.CompileOnly.nopenChecker)
@@ -31,9 +31,9 @@ dependencies {
3131
testImplementation(libs.kotlin.test.junit)
3232
testImplementation(libs.mockito.kotlin)
3333

34-
testImplementation(Config.Libs.OpenTelemetry.otelSdk)
35-
testImplementation(Config.Libs.OpenTelemetry.otelSemconv)
36-
testImplementation(Config.Libs.OpenTelemetry.otelSemconvIncubating)
34+
testImplementation(libs.otel)
35+
testImplementation(libs.otel.semconv)
36+
testImplementation(libs.otel.semconv.incubating)
3737
}
3838

3939
configure<SourceSetContainer> {

‎sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ dependencies {
2222
*/
2323
compileOnly(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap)
2424

25-
implementation(Config.Libs.OpenTelemetry.otelSdk)
26-
compileOnly(Config.Libs.OpenTelemetry.otelSemconv)
27-
compileOnly(Config.Libs.OpenTelemetry.otelSemconvIncubating)
25+
implementation(libs.otel)
26+
compileOnly(libs.otel.semconv)
27+
compileOnly(libs.otel.semconv.incubating)
2828

2929
compileOnly(Config.CompileOnly.nopen)
3030
errorprone(Config.CompileOnly.nopenChecker)
@@ -40,9 +40,9 @@ dependencies {
4040
testImplementation(libs.kotlin.test.junit)
4141
testImplementation(libs.mockito.kotlin)
4242

43-
testImplementation(Config.Libs.OpenTelemetry.otelSdk)
44-
testImplementation(Config.Libs.OpenTelemetry.otelSemconv)
45-
testImplementation(Config.Libs.OpenTelemetry.otelSemconvIncubating)
43+
testImplementation(libs.otel)
44+
testImplementation(libs.otel.semconv)
45+
testImplementation(libs.otel.semconv.incubating)
4646
}
4747

4848
configure<SourceSetContainer> {

‎sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ dependencies {
6868

6969
dependencyManagement {
7070
imports {
71-
mavenBom(Config.Libs.OpenTelemetry.otelInstrumentationBom)
71+
mavenBom(libs.otel.instrumentation.bom.get().toString())
7272
}
7373
}
7474

‎sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dependencies {
5252
implementation(projects.sentryLogback)
5353
implementation(projects.sentryGraphql22)
5454
implementation(projects.sentryQuartz)
55-
implementation(Config.Libs.OpenTelemetry.otelSdk)
55+
implementation(libs.otel)
5656

5757
// database query tracing
5858
implementation(projects.sentryJdbc)

0 commit comments

Comments
 (0)