From 2ed844d2ea8ac5f35d6ba0345c06a119c1bcaa90 Mon Sep 17 00:00:00 2001
From: brunobat <brunobat@gmail.com>
Date: Wed, 27 Nov 2024 14:31:17 +0000
Subject: [PATCH] Streamline OTel dependencies

---
 bom/application/pom.xml | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 1a72a9aaeb0b8..7f4e41cc099b7 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -29,8 +29,7 @@
         <resteasy-microprofile.version>3.0.0.Final</resteasy-microprofile.version>
         <resteasy-spring-web.version>3.1.3.Final</resteasy-spring-web.version>
         <resteasy.version>6.2.11.Final</resteasy.version>
-        <opentelemetry.version>1.42.1</opentelemetry.version>
-        <opentelemetry-alpha.version>2.8.0-alpha</opentelemetry-alpha.version>
+        <opentelemetry-instrumentation.version>2.8.0-alpha</opentelemetry-instrumentation.version>
         <opentelemetry-semconv.version>1.27.0-alpha</opentelemetry-semconv.version>
         <quarkus-http.version>5.3.3</quarkus-http.version>
         <micrometer.version>1.14.1</micrometer.version><!-- keep in sync with hdrhistogram -->
@@ -433,24 +432,12 @@
                 <version>${opensearch-testcontainers.version}</version>
             </dependency>
             <!-- OpenTelemetry components, imported as a BOM -->
-            <dependency>
-                <groupId>io.opentelemetry</groupId>
-                <artifactId>opentelemetry-bom</artifactId>
-                <version>${opentelemetry.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>io.opentelemetry</groupId>
-                <artifactId>opentelemetry-bom-alpha</artifactId>
-                <version>${opentelemetry.version}-alpha</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
+            <!-- opentelemetry-instrumentation-bom-alpha includes the main and alpha-bom inside.-->
+            <!-- Also includes semantic conventions-->
             <dependency>
                 <groupId>io.opentelemetry.instrumentation</groupId>
                 <artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
-                <version>${opentelemetry-alpha.version}</version>
+                <version>${opentelemetry-instrumentation.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -6494,11 +6481,6 @@
                 <version>${mime4j.version}</version>
             </dependency>
             <!-- OpenTelemetry libs not in BOM -->
-            <dependency>
-                <groupId>io.opentelemetry.semconv</groupId>
-                <artifactId>opentelemetry-semconv</artifactId>
-                <version>${opentelemetry-semconv.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.opentelemetry.semconv</groupId>
                 <artifactId>opentelemetry-semconv-incubating</artifactId>