From 92795f258d73da9d4a30447ae47e732ed1ec8296 Mon Sep 17 00:00:00 2001
From: Jonatan Ivanov <jonatan.ivanov@gmail.com>
Date: Wed, 4 Sep 2024 13:54:34 -0700
Subject: [PATCH] Use opentelemetry-instrumentation-bom-alpha (#823)

* Use opentelemetry-instrumentation-bom-alpha

It seems opentelemetry-bom-alpha contains opentelemetry-bom so we don't
need to depend on the latter.

Since opentelemetry-instrumentation-api-semconv and
io.opentelemetry:opentelemetry-bom-alpha can point to conflicting
versions, we should use another BOM:
opentelemetry-instrumentation-bom-alpha
which contains opentelemetry-bom-alpha.

This BOM has an issue though, its patch version upgrades contain
minor version upgrades for opentelemetry-bom-alpha, see:
1.33.0 -> 1.35.0: https://repo1.maven.org/maven2/io/opentelemetry/instrumentation/opentelemetry-instrumentation-bom-alpha/1.33.0-alpha/opentelemetry-instrumentation-bom-alpha-1.33.0-alpha.pom
1.33.1 -> 1.36.0: https://repo1.maven.org/maven2/io/opentelemetry/instrumentation/opentelemetry-instrumentation-bom-alpha/1.33.1-alpha/opentelemetry-instrumentation-bom-alpha-1.33.1-alpha.pom
1.33.2 -> 1.37.0: https://repo1.maven.org/maven2/io/opentelemetry/instrumentation/opentelemetry-instrumentation-bom-alpha/1.33.2-alpha/opentelemetry-instrumentation-bom-alpha-1.33.2-alpha.pom
1.33.3 -> 1.38.0: https://repo1.maven.org/maven2/io/opentelemetry/instrumentation/opentelemetry-instrumentation-bom-alpha/1.33.3-alpha/opentelemetry-instrumentation-bom-alpha-1.33.3-alpha.pom
1.33.4 -> 1.39.0: https://repo1.maven.org/maven2/io/opentelemetry/instrumentation/opentelemetry-instrumentation-bom-alpha/1.33.4-alpha/opentelemetry-instrumentation-bom-alpha-1.33.4-alpha.pom
1.33.5 -> 1.40.0: https://repo1.maven.org/maven2/io/opentelemetry/instrumentation/opentelemetry-instrumentation-bom-alpha/1.33.5-alpha/opentelemetry-instrumentation-bom-alpha-1.33.5-alpha.pom

Closes gh-819
---
 dependencies.gradle       | 8 ++------
 gradle/libs.versions.toml | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index f7088995..6ca6e15a 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -13,8 +13,6 @@ def VERSIONS = [
 	libs.logback,
 	libs.log4j,
 	libs.slf4j,
-	// otel
-	libs.otelInstrumentation,
 	// zipkin
 	libs.zipkinAws,
 	// wavefront
@@ -31,14 +29,12 @@ def VERSIONS = [
 ]
 
 def MICROMETER_PLATFORM_VERSIONS = [
-		libs.micrometerBom
+	libs.micrometerBom
 ]
 
 def PLATFORM_VERSIONS = [
 	libs.braveBom,
-	// opentelemetry-instrumentation-api dependency above with this
-	libs.otelBom,
-	libs.otelBomAlpha,
+	libs.otelInstrumentationBomAlpha,
 	libs.reactorBom,
 	libs.junitBom
 ]
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d79acd3f..dc9e426f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,13 +5,11 @@ junit = "5.10.3"
 javaxServlet="4.0.1"
 jmh="1.37"
 jakartaWeb="9.1.0"
-otelInstrumentation="1.31.0-alpha"
 aopalliance="1.0"
 zipkinAws="0.23.5"
-otelBom="1.31.0"
 logback = "1.4.14"
 wavefrontSdk="3.4.3"
-otelBomAlpha="1.31.0-alpha"
+otelInstrumentationBomAlpha="1.31.0-alpha" # Brings in io.opentelemetry:opentelemetry-bom:1.31.0
 log4j = "2.21.1"
 wavefrontReporter="1.7.16"
 slf4j = "1.7.36"
@@ -48,9 +46,7 @@ micrometerContextPropagation = { module = "io.micrometer:context-propagation", v
 micrometerBom = { module = "io.micrometer:micrometer-bom", version.ref = "micrometer" }
 mockitoCore = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 mockitoJunit = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
-otelBom = { module = "io.opentelemetry:opentelemetry-bom", version.ref = "otelBom" }
-otelBomAlpha = { module = "io.opentelemetry:opentelemetry-bom-alpha", version.ref = "otelBomAlpha" }
-otelInstrumentation = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv", version.ref = "otelInstrumentation" }
+otelInstrumentationBomAlpha = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha", version.ref = "otelInstrumentationBomAlpha" }
 reactorBom = { module = "io.projectreactor:reactor-bom", version.ref = "reactorBom" }
 slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 springCore = { module = "org.springframework:spring-core", version.ref = "spring" }