Skip to content

Commit 6781272

Browse files
jeanbisuttijeanbisutti
authored
Bump OpenTelemetry dependencies (Azure#43974)
* Bump OpenTelemetry dependencies * Fix CI (make Spring Monitor more independent of the autoconfigure OTel versions) * Rollback specific Azure dependencies
1 parent 67472f1 commit 6781272

File tree

21 files changed

+130
-115
lines changed

21 files changed

+130
-115
lines changed

‎eng/versioning/external_dependencies.txt‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -118,19 +118,19 @@ com.microsoft.azure:azure-storage;8.0.0
118118
com.microsoft.azure:msal4j;1.17.2
119119
com.microsoft.azure:msal4j-brokers;1.0.0
120120
com.microsoft.azure:msal4j-persistence-extension;1.3.0
121-
io.opentelemetry:opentelemetry-api;1.43.0
122-
io.opentelemetry:opentelemetry-sdk;1.43.0
123-
io.opentelemetry:opentelemetry-sdk-metrics;1.43.0
124-
io.opentelemetry:opentelemetry-sdk-logs;1.43.0
125-
io.opentelemetry:opentelemetry-exporter-logging;1.43.0
126-
io.opentelemetry:opentelemetry-exporter-otlp;1.43.0
127-
io.opentelemetry:opentelemetry-sdk-testing;1.43.0
128-
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.43.0
129-
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi;1.43.0
130-
io.opentelemetry:opentelemetry-bom;1.43.0
131-
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;2.9.0-alpha
132-
io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter;2.9.0
133-
io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;2.9.0-alpha
121+
io.opentelemetry:opentelemetry-api;1.46.0
122+
io.opentelemetry:opentelemetry-sdk;1.46.0
123+
io.opentelemetry:opentelemetry-sdk-metrics;1.46.0
124+
io.opentelemetry:opentelemetry-sdk-logs;1.46.0
125+
io.opentelemetry:opentelemetry-exporter-logging;1.46.0
126+
io.opentelemetry:opentelemetry-exporter-otlp;1.46.0
127+
io.opentelemetry:opentelemetry-sdk-testing;1.46.0
128+
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.46.0
129+
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi;1.46.0
130+
io.opentelemetry:opentelemetry-bom;1.46.0
131+
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;2.12.0-alpha
132+
io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter;2.12.0
133+
io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;2.12.0-alpha
134134
io.opentelemetry.semconv:opentelemetry-semconv-incubating;1.26.0-alpha
135135
io.projectreactor:reactor-test;3.4.41
136136
io.github.hakky54:logcaptor;2.9.3
@@ -222,6 +222,16 @@ org.revapi:revapi-maven-plugin;0.14.6
222222
# Format;
223223
# <some unique identifier, area name preferred>_groupId:artifactId;dependency-version
224224

225+
# The OpenTelemetry exporter is replaced with the OpenTelemetry SDK Autoconfigure Distro
226+
otel_exporter_deprecated_io.opentelemetry:opentelemetry-api;1.43.0
227+
otel_exporter_deprecated_io.opentelemetry:opentelemetry-sdk;1.43.0
228+
otel_exporter_deprecated_io.opentelemetry:opentelemetry-sdk-metrics;1.43.0
229+
otel_exporter_deprecated_io.opentelemetry:opentelemetry-sdk-logs;1.43.0
230+
otel_exporter_deprecated_io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi;1.43.0
231+
otel_exporter_deprecated_io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.43.0
232+
otel_exporter_deprecated_io.opentelemetry:opentelemetry-sdk-testing;1.43.0
233+
otel_exporter_deprecated_io.opentelemetry.semconv:opentelemetry-semconv-incubating;1.26.0-alpha
234+
225235
# This is a unique dependency as it is the only <type>test-jar</type> dependency in the
226236
# data track. It's also using a SNAPSHOT version which should be disallowed but there is
227237
# going to be some investigation necessary to find, at the very least, a newer version

‎sdk/ai/azure-ai-inference/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@
103103
<dependency>
104104
<groupId>io.opentelemetry</groupId>
105105
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
106-
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;external_dependency} -->
106+
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;external_dependency} -->
107107
<scope>test</scope>
108108
</dependency>
109109
<dependency>
110110
<groupId>io.opentelemetry</groupId>
111111
<artifactId>opentelemetry-exporter-otlp</artifactId>
112-
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-exporter-otlp;external_dependency} -->
112+
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-exporter-otlp;external_dependency} -->
113113
<scope>test</scope>
114114
</dependency>
115115
</dependencies>
@@ -125,7 +125,7 @@
125125
<bannedDependencies>
126126
<includes>
127127
<!-- opentelemetry-exporter-otlp is used in test scope for tracing samples. -->
128-
<include>io.opentelemetry:opentelemetry-exporter-otlp:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-exporter-otlp;external_dependency} -->
128+
<include>io.opentelemetry:opentelemetry-exporter-otlp:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-exporter-otlp;external_dependency} -->
129129
</includes>
130130
</bannedDependencies>
131131
</rules>

‎sdk/attestation/azure-security-attestation/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,19 +85,19 @@
8585
<dependency>
8686
<groupId>io.opentelemetry</groupId>
8787
<artifactId>opentelemetry-api</artifactId>
88-
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
88+
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
8989
<scope>test</scope>
9090
</dependency>
9191
<dependency>
9292
<groupId>io.opentelemetry</groupId>
9393
<artifactId>opentelemetry-exporter-logging</artifactId>
94-
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-exporter-logging;external_dependency} -->
94+
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-exporter-logging;external_dependency} -->
9595
<scope>test</scope>
9696
</dependency>
9797
<dependency>
9898
<groupId>io.opentelemetry</groupId>
9999
<artifactId>opentelemetry-sdk</artifactId>
100-
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
100+
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
101101
<scope>test</scope>
102102
</dependency>
103103
<dependency>
@@ -125,9 +125,9 @@
125125
<bannedDependencies>
126126
<includes>
127127
<include>com.nimbusds:nimbus-jose-jwt:[9.37.3]</include> <!-- {x-include-update;com.nimbusds:nimbus-jose-jwt;external_dependency} -->
128-
<include>io.opentelemetry:opentelemetry-api:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
129-
<include>io.opentelemetry:opentelemetry-sdk:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
130-
<include>io.opentelemetry:opentelemetry-exporter-logging:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-exporter-logging;external_dependency} -->
128+
<include>io.opentelemetry:opentelemetry-api:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
129+
<include>io.opentelemetry:opentelemetry-sdk:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
130+
<include>io.opentelemetry:opentelemetry-exporter-logging:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-exporter-logging;external_dependency} -->
131131
</includes>
132132
</bannedDependencies>
133133
</rules>

‎sdk/clientcore/http-stress/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>io.opentelemetry</groupId>
4545
<artifactId>opentelemetry-api</artifactId>
46-
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
46+
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
4747
</dependency>
4848

4949
<dependency>
@@ -60,12 +60,12 @@
6060
<dependency>
6161
<groupId>io.opentelemetry.instrumentation</groupId>
6262
<artifactId>opentelemetry-runtime-telemetry-java8</artifactId>
63-
<version>2.9.0-alpha</version> <!-- {x-version-update;io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;external_dependency} -->
63+
<version>2.12.0-alpha</version> <!-- {x-version-update;io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;external_dependency} -->
6464
</dependency>
6565
<dependency>
6666
<groupId>io.opentelemetry.instrumentation</groupId>
6767
<artifactId>opentelemetry-logback-appender-1.0</artifactId>
68-
<version>2.9.0-alpha</version> <!-- {x-version-update;io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;external_dependency} -->
68+
<version>2.12.0-alpha</version> <!-- {x-version-update;io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;external_dependency} -->
6969
</dependency>
7070
</dependencies>
7171

@@ -81,10 +81,10 @@
8181
<includes>
8282
<include>com.azure:perf-test-core:[1.0.0-beta.1]</include> <!-- {x-include-update;com.azure:perf-test-core;dependency} -->
8383
<include>com.azure:azure-monitor-opentelemetry-autoconfigure:[1.0.0-beta.1]</include> <!-- {x-include-update;com.azure:azure-monitor-opentelemetry-autoconfigure;dependency} -->
84-
<include>io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:[2.9.0-alpha]</include> <!-- {x-include-update;io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;external_dependency} -->
85-
<include>io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0:[2.9.0-alpha]</include> <!-- {x-include-update;io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;external_dependency} -->
84+
<include>io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:[2.12.0-alpha]</include> <!-- {x-include-update;io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;external_dependency} -->
85+
<include>io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0:[2.12.0-alpha]</include> <!-- {x-include-update;io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;external_dependency} -->
8686
<include>ch.qos.logback:logback-classic:[1.3.14]</include> <!-- {x-include-update;ch.qos.logback:logback-classic;external_dependency} -->
87-
<include>io.opentelemetry:opentelemetry-api:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
87+
<include>io.opentelemetry:opentelemetry-api:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
8888
</includes>
8989
</bannedDependencies>
9090
</rules>

‎sdk/core/azure-core-metrics-opentelemetry/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<dependency>
4949
<groupId>io.opentelemetry</groupId>
5050
<artifactId>opentelemetry-api</artifactId>
51-
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
51+
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
5252
</dependency>
5353
<dependency>
5454
<groupId>com.azure</groupId>
@@ -66,14 +66,14 @@
6666
<dependency>
6767
<groupId>io.opentelemetry</groupId>
6868
<artifactId>opentelemetry-sdk</artifactId>
69-
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
69+
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
7070
<scope>test</scope>
7171
</dependency>
7272

7373
<dependency>
7474
<groupId>io.opentelemetry</groupId>
7575
<artifactId>opentelemetry-sdk-testing</artifactId>
76-
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
76+
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
7777
<scope>test</scope>
7878
</dependency>
7979

@@ -104,7 +104,7 @@
104104
<dependency>
105105
<groupId>io.opentelemetry</groupId>
106106
<artifactId>opentelemetry-exporter-otlp</artifactId>
107-
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-exporter-otlp;external_dependency} -->
107+
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-exporter-otlp;external_dependency} -->
108108
<scope>test</scope>
109109
</dependency>
110110
</dependencies>
@@ -119,11 +119,11 @@
119119
<rules>
120120
<bannedDependencies>
121121
<includes>
122-
<include>io.opentelemetry:opentelemetry-api:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
123-
<include>io.opentelemetry:opentelemetry-sdk:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
124-
<include>io.opentelemetry:opentelemetry-sdk-testing:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
125-
<include>io.opentelemetry:opentelemetry-exporter-logging:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-exporter-logging;external_dependency} -->
126-
<include>io.opentelemetry:opentelemetry-exporter-otlp:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-exporter-otlp;external_dependency} -->
122+
<include>io.opentelemetry:opentelemetry-api:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
123+
<include>io.opentelemetry:opentelemetry-sdk:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
124+
<include>io.opentelemetry:opentelemetry-sdk-testing:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
125+
<include>io.opentelemetry:opentelemetry-exporter-logging:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-exporter-logging;external_dependency} -->
126+
<include>io.opentelemetry:opentelemetry-exporter-otlp:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-exporter-otlp;external_dependency} -->
127127
</includes>
128128
</bannedDependencies>
129129
</rules>

‎sdk/core/azure-core-tracing-opentelemetry-samples/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@
5858
<dependency>
5959
<groupId>io.opentelemetry</groupId>
6060
<artifactId>opentelemetry-exporter-logging</artifactId>
61-
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-exporter-logging;external_dependency} -->
61+
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-exporter-logging;external_dependency} -->
6262
<scope>test</scope>
6363
</dependency>
6464
<dependency>
6565
<groupId>io.opentelemetry</groupId>
6666
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
67-
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;external_dependency} -->
67+
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;external_dependency} -->
6868
<scope>test</scope>
6969
</dependency>
7070
<dependency>

‎sdk/core/azure-core-tracing-opentelemetry/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>io.opentelemetry</groupId>
6363
<artifactId>opentelemetry-api</artifactId>
64-
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
64+
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
6565
</dependency>
6666
<dependency>
6767
<groupId>com.azure</groupId>
@@ -79,7 +79,7 @@
7979
<dependency>
8080
<groupId>io.opentelemetry</groupId>
8181
<artifactId>opentelemetry-sdk</artifactId>
82-
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
82+
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
8383
<scope>test</scope>
8484
</dependency>
8585
<dependency>
@@ -98,7 +98,7 @@
9898
<groupId>io.opentelemetry</groupId>
9999
<artifactId>opentelemetry-sdk-testing</artifactId>
100100
<scope>test</scope>
101-
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
101+
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
102102
</dependency>
103103
<dependency>
104104
<groupId>io.projectreactor</groupId>
@@ -130,9 +130,9 @@
130130
<rules>
131131
<bannedDependencies>
132132
<includes>
133-
<include>io.opentelemetry:opentelemetry-api:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
134-
<include>io.opentelemetry:opentelemetry-sdk:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
135-
<include>io.opentelemetry:opentelemetry-sdk-testing:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
133+
<include>io.opentelemetry:opentelemetry-api:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
134+
<include>io.opentelemetry:opentelemetry-sdk:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
135+
<include>io.opentelemetry:opentelemetry-sdk-testing:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
136136
</includes>
137137
</bannedDependencies>
138138
</rules>

‎sdk/eventhubs/azure-messaging-eventhubs-stress/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@
6060
<dependency>
6161
<groupId>io.opentelemetry.instrumentation</groupId>
6262
<artifactId>opentelemetry-runtime-telemetry-java8</artifactId>
63-
<version>2.9.0-alpha</version> <!-- {x-version-update;io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;external_dependency} -->
63+
<version>2.12.0-alpha</version> <!-- {x-version-update;io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;external_dependency} -->
6464
</dependency>
6565
<dependency>
6666
<groupId>io.opentelemetry.instrumentation</groupId>
6767
<artifactId>opentelemetry-logback-appender-1.0</artifactId>
68-
<version>2.9.0-alpha</version> <!-- {x-version-update;io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;external_dependency} -->
68+
<version>2.12.0-alpha</version> <!-- {x-version-update;io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;external_dependency} -->
6969
</dependency>
7070
<dependency>
7171
<groupId>com.azure</groupId>
@@ -102,8 +102,8 @@
102102
<bannedDependencies>
103103
<includes>
104104
<include>org.springframework.boot:spring-boot-starter:[2.7.18]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
105-
<include>io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:[2.9.0-alpha]</include> <!-- {x-include-update;io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;external_dependency} -->
106-
<include>io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0:[2.9.0-alpha]</include> <!-- {x-include-update;io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;external_dependency} -->
105+
<include>io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:[2.12.0-alpha]</include> <!-- {x-include-update;io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;external_dependency} -->
106+
<include>io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0:[2.12.0-alpha]</include> <!-- {x-include-update;io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;external_dependency} -->
107107
</includes>
108108
</bannedDependencies>
109109
</rules>

0 commit comments

Comments
 (0)