Skip to content

Commit 1f4dea7

Browse files
committed
Fixed Micrometer and OpenTelemetry dependency declaration
1 parent d2fadd2 commit 1f4dea7

2 files changed

Lines changed: 18 additions & 34 deletions

File tree

httpclient5-observation/pom.xml

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,6 @@
3636
<description>Optional Micrometer / OpenTelemetry support for HttpClient </description>
3737
<packaging>jar</packaging>
3838

39-
<dependencyManagement>
40-
<dependencies>
41-
<dependency>
42-
<groupId>io.opentelemetry</groupId>
43-
<artifactId>opentelemetry-bom</artifactId>
44-
<version>1.49.0</version>
45-
<type>pom</type>
46-
<scope>import</scope>
47-
</dependency>
48-
</dependencies>
49-
</dependencyManagement>
50-
5139
<properties>
5240
<Automatic-Module-Name>org.apache.httpcomponents.client5.observation</Automatic-Module-Name>
5341
</properties>
@@ -87,17 +75,23 @@
8775
<dependency>
8876
<groupId>io.micrometer</groupId>
8977
<artifactId>micrometer-registry-prometheus</artifactId>
78+
<scope>test</scope>
9079
</dependency>
9180
<dependency>
92-
<groupId>io.opentelemetry</groupId>
93-
<artifactId>opentelemetry-sdk</artifactId>
94-
<scope>runtime</scope>
81+
<groupId>io.micrometer</groupId>
82+
<artifactId>micrometer-tracing</artifactId>
83+
<scope>test</scope>
9584
</dependency>
9685
<dependency>
9786
<groupId>io.micrometer</groupId>
9887
<artifactId>micrometer-tracing-bridge-otel</artifactId>
9988
<scope>test</scope>
10089
</dependency>
90+
<dependency>
91+
<groupId>io.opentelemetry</groupId>
92+
<artifactId>opentelemetry-sdk</artifactId>
93+
<scope>test</scope>
94+
</dependency>
10195
<dependency>
10296
<groupId>io.opentelemetry</groupId>
10397
<artifactId>opentelemetry-sdk-testing</artifactId>
@@ -113,13 +107,6 @@
113107
<artifactId>commons-compress</artifactId>
114108
<scope>test</scope>
115109
</dependency>
116-
117-
<dependency>
118-
<groupId>io.micrometer</groupId>
119-
<artifactId>micrometer-tracing</artifactId>
120-
<version>${micrometer.tracing.version}</version>
121-
<scope>test</scope>
122-
</dependency>
123110
<dependency>
124111
<groupId>org.junit.jupiter</groupId>
125112
<artifactId>junit-jupiter-api</artifactId>

pom.xml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<zstd.jni.version>1.5.7-4</zstd.jni.version>
8383
<micrometer.version>1.15.2</micrometer.version>
8484
<micrometer.tracing.version>1.5.2</micrometer.tracing.version>
85-
<otel.version>1.52.0</otel.version> <!-- already used elsewhere -->
85+
<otel.version>1.49.0</otel.version> <!-- already used elsewhere -->
8686
<commons-compress.version>1.26.2</commons-compress.version>
8787
</properties>
8888

@@ -219,37 +219,34 @@
219219
<groupId>io.micrometer</groupId>
220220
<artifactId>micrometer-core</artifactId>
221221
<version>${micrometer.version}</version>
222-
<optional>true</optional>
223222
</dependency>
224223
<dependency>
225224
<groupId>io.micrometer</groupId>
226225
<artifactId>micrometer-observation</artifactId>
227226
<version>${micrometer.version}</version>
228-
<optional>true</optional>
229227
</dependency>
230228
<dependency>
231229
<groupId>io.micrometer</groupId>
232230
<artifactId>micrometer-registry-prometheus</artifactId>
233231
<version>${micrometer.version}</version>
234-
<optional>true</optional>
235232
</dependency>
236233
<dependency>
237234
<groupId>io.micrometer</groupId>
238-
<artifactId>micrometer-tracing-bridge-otel</artifactId>
235+
<artifactId>micrometer-tracing</artifactId>
239236
<version>${micrometer.tracing.version}</version>
240-
<optional>true</optional>
237+
<scope>test</scope>
241238
</dependency>
242239
<dependency>
243-
<groupId>io.opentelemetry</groupId>
244-
<artifactId>opentelemetry-sdk</artifactId>
245-
<version>${otel.version}</version>
246-
<optional>true</optional>
240+
<groupId>io.micrometer</groupId>
241+
<artifactId>micrometer-tracing-bridge-otel</artifactId>
242+
<version>${micrometer.tracing.version}</version>
247243
</dependency>
248244
<dependency>
249245
<groupId>io.opentelemetry</groupId>
250-
<artifactId>opentelemetry-sdk-testing</artifactId>
246+
<artifactId>opentelemetry-bom</artifactId>
251247
<version>${otel.version}</version>
252-
<scope>test</scope>
248+
<type>pom</type>
249+
<scope>import</scope>
253250
</dependency>
254251
<dependency>
255252
<groupId>com.aayushatharva.brotli4j</groupId>

0 commit comments

Comments
 (0)