Skip to content

Commit 89bc558

Browse files
authored
Merge pull request #44772 from brunobat/cleanup-otel-boms
Streamline otel dependencies
2 parents 0aff1b5 + 2ed844d commit 89bc558

File tree

1 file changed

+4
-22
lines changed

1 file changed

+4
-22
lines changed

bom/application/pom.xml

+4-22
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
<resteasy-microprofile.version>3.0.0.Final</resteasy-microprofile.version>
3030
<resteasy-spring-web.version>3.1.3.Final</resteasy-spring-web.version>
3131
<resteasy.version>6.2.11.Final</resteasy.version>
32-
<opentelemetry.version>1.42.1</opentelemetry.version>
33-
<opentelemetry-alpha.version>2.8.0-alpha</opentelemetry-alpha.version>
32+
<opentelemetry-instrumentation.version>2.8.0-alpha</opentelemetry-instrumentation.version>
3433
<opentelemetry-semconv.version>1.27.0-alpha</opentelemetry-semconv.version>
3534
<quarkus-http.version>5.3.3</quarkus-http.version>
3635
<micrometer.version>1.14.1</micrometer.version><!-- keep in sync with hdrhistogram -->
@@ -433,24 +432,12 @@
433432
<version>${opensearch-testcontainers.version}</version>
434433
</dependency>
435434
<!-- OpenTelemetry components, imported as a BOM -->
436-
<dependency>
437-
<groupId>io.opentelemetry</groupId>
438-
<artifactId>opentelemetry-bom</artifactId>
439-
<version>${opentelemetry.version}</version>
440-
<type>pom</type>
441-
<scope>import</scope>
442-
</dependency>
443-
<dependency>
444-
<groupId>io.opentelemetry</groupId>
445-
<artifactId>opentelemetry-bom-alpha</artifactId>
446-
<version>${opentelemetry.version}-alpha</version>
447-
<type>pom</type>
448-
<scope>import</scope>
449-
</dependency>
435+
<!-- opentelemetry-instrumentation-bom-alpha includes the main and alpha-bom inside.-->
436+
<!-- Also includes semantic conventions-->
450437
<dependency>
451438
<groupId>io.opentelemetry.instrumentation</groupId>
452439
<artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
453-
<version>${opentelemetry-alpha.version}</version>
440+
<version>${opentelemetry-instrumentation.version}</version>
454441
<type>pom</type>
455442
<scope>import</scope>
456443
</dependency>
@@ -6494,11 +6481,6 @@
64946481
<version>${mime4j.version}</version>
64956482
</dependency>
64966483
<!-- OpenTelemetry libs not in BOM -->
6497-
<dependency>
6498-
<groupId>io.opentelemetry.semconv</groupId>
6499-
<artifactId>opentelemetry-semconv</artifactId>
6500-
<version>${opentelemetry-semconv.version}</version>
6501-
</dependency>
65026484
<dependency>
65036485
<groupId>io.opentelemetry.semconv</groupId>
65046486
<artifactId>opentelemetry-semconv-incubating</artifactId>

0 commit comments

Comments
 (0)