poc to add otel bom to sentry bom and testing by adding a dep without…

… version to noagent samples
getsentry · Dec 10, 2024 · b1391be · b1391be
1 parent fae85e1
commit b1391be
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
@@ -95,6 +95,7 @@ object Config {
         val springBoot3StarterJdbc = "org.springframework.boot:spring-boot-starter-jdbc:$springBoot3Version"
         val springBoot3StarterActuator = "org.springframework.boot:spring-boot-starter-actuator:$springBoot3Version"
         val springBoot3StarterOpenTelemetry = "io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter:${OpenTelemetry.otelInstrumentationVersion}"
+        val springBoot3StarterOpenTelemetryNoversion = "io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter"
 
         val springWeb = "org.springframework:spring-webmvc"
         val springWebflux = "org.springframework:spring-webflux"

diff --git a/sentry-bom/build.gradle.kts b/sentry-bom/build.gradle.kts
@@ -3,6 +3,8 @@ plugins {
     `maven-publish`
 }
 
+javaPlatform.allowDependencies()
+
 dependencies {
     constraints {
         project.rootProject.subprojects
@@ -26,6 +28,7 @@ dependencies {
                     }
             }
     }
+    api(platform(Config.Libs.OpenTelemetry.otelInstrumentationBom))
 }
 
 publishing {

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
@@ -52,9 +52,10 @@ dependencies {
     implementation(projects.sentryLogback)
     implementation(projects.sentryGraphql22)
     implementation(projects.sentryQuartz)
-    implementation(Config.Libs.springBoot3StarterOpenTelemetry)
+    implementation(Config.Libs.springBoot3StarterOpenTelemetryNoversion)
     implementation(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap)
     implementation(projects.sentryOpentelemetry.sentryOpentelemetryAgentcustomization)
+    implementation(platform(projects.sentryBom))
 
     // database query tracing
     implementation(projects.sentryJdbc)
@@ -69,12 +70,6 @@ dependencies {
     testImplementation(Config.Libs.apolloKotlin)
 }
 
-dependencyManagement {
-    imports {
-        mavenBom(Config.Libs.OpenTelemetry.otelInstrumentationBom)
-    }
-}
-
 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
@@ -52,9 +52,10 @@ dependencies {
     implementation(projects.sentryLogback)
     implementation(projects.sentryGraphql)
     implementation(projects.sentryQuartz)
-    implementation(Config.Libs.springBoot3StarterOpenTelemetry)
+    implementation(Config.Libs.springBoot3StarterOpenTelemetryNoversion)
     implementation(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap)
     implementation(projects.sentryOpentelemetry.sentryOpentelemetryAgentcustomization)
+    implementation(platform(projects.sentryBom))
 
     // database query tracing
     implementation(projects.sentryJdbc)
@@ -70,12 +71,6 @@ dependencies {
     testImplementation("org.apache.httpcomponents:httpclient")
 }
 
-dependencyManagement {
-    imports {
-        mavenBom(Config.Libs.OpenTelemetry.otelInstrumentationBom)
-    }
-}
-
 configure<SourceSetContainer> {
     test {
         java.srcDir("src/test/java")