From ad9b417d5436b587da689014aa40fba2aa8e0c00 Mon Sep 17 00:00:00 2001
From: Alexander Dinauer <alexander.dinauer@sentry.io>
Date: Thu, 28 Nov 2024 13:59:12 +0100
Subject: [PATCH] change bom version for otel

---
 buildSrc/src/main/java/Config.kt                            | 1 +
 .../build.gradle.kts                                        | 2 +-
 .../build.gradle.kts                                        | 6 ------
 .../build.gradle.kts                                        | 6 ++++++
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
index 5ec54e22d6..e6ebe9f193 100644
--- 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
index e0f82ad781..dfa17eb952 100644
--- 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
index 2dd6f2574b..fe5dec4415 100644
--- 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
index 2eab2bb10e..a7a879f0dd 100644
--- 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")