change bom version for otel

adinauer · adinauer · commit ad9b417d5436 · 2024-11-28T13:59:12.000+01:00
diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
@@ -170,6 +170,7 @@ object Config {
             val otelJavaAgentTooling = "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion"
             val otelExtensionAutoconfigureSpi = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:$otelVersion"
             val otelExtensionAutoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:$otelVersion"
+            val otelInstrumentationBom = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:$otelInstrumentationVersion"
         }
     }
 
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
@@ -71,7 +71,7 @@ dependencies {
 
 dependencyManagement {
     imports {
-        mavenBom("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.7.0")
+        mavenBom(Config.Libs.OpenTelemetry.otelInstrumentationBom)
     }
 }
 
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
@@ -68,12 +68,6 @@ dependencies {
     testImplementation(Config.Libs.apolloKotlin)
 }
 
-dependencyManagement {
-    imports {
-        mavenBom("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.7.0")
-    }
-}
-
 configure<SourceSetContainer> {
     test {
         java.srcDir("src/test/java")
diff --git a/sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts
@@ -70,6 +70,12 @@ dependencies {
     testImplementation("org.apache.httpcomponents:httpclient")
 }
 
+dependencyManagement {
+    imports {
+        mavenBom(Config.Libs.OpenTelemetry.otelInstrumentationBom)
+    }
+}
+
 configure<SourceSetContainer> {
     test {
         java.srcDir("src/test/java")

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,7 @@ object Config {`
`170`	`170`	`val otelJavaAgentTooling = "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion"`
`171`	`171`	`val otelExtensionAutoconfigureSpi = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:$otelVersion"`
`172`	`172`	`val otelExtensionAutoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:$otelVersion"`
	`173`	`+ val otelInstrumentationBom = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:$otelInstrumentationVersion"`
`173`	`174`	`}`
`174`	`175`	`}`
`175`	`176`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ dependencies {`
`71`	`71`
`72`	`72`	`dependencyManagement {`
`73`	`73`	`imports {`
`74`		`- mavenBom("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.7.0")`
	`74`	`+ mavenBom(Config.Libs.OpenTelemetry.otelInstrumentationBom)`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`