Skip to content

Commit

Permalink
Bump OpenTelemetry dependencies (#43974)
Browse files Browse the repository at this point in the history
* Bump OpenTelemetry dependencies

* Fix CI (make Spring Monitor more independent of the autoconfigure OTel versions)

* Rollback specific Azure dependencies
  • Loading branch information
jeanbisutti authored Jan 30, 2025
1 parent 67472f1 commit 6781272
Show file tree
Hide file tree
Showing 21 changed files with 130 additions and 115 deletions.
36 changes: 23 additions & 13 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,19 +118,19 @@ com.microsoft.azure:azure-storage;8.0.0
com.microsoft.azure:msal4j;1.17.2
com.microsoft.azure:msal4j-brokers;1.0.0
com.microsoft.azure:msal4j-persistence-extension;1.3.0
io.opentelemetry:opentelemetry-api;1.43.0
io.opentelemetry:opentelemetry-sdk;1.43.0
io.opentelemetry:opentelemetry-sdk-metrics;1.43.0
io.opentelemetry:opentelemetry-sdk-logs;1.43.0
io.opentelemetry:opentelemetry-exporter-logging;1.43.0
io.opentelemetry:opentelemetry-exporter-otlp;1.43.0
io.opentelemetry:opentelemetry-sdk-testing;1.43.0
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.43.0
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi;1.43.0
io.opentelemetry:opentelemetry-bom;1.43.0
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;2.9.0-alpha
io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter;2.9.0
io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;2.9.0-alpha
io.opentelemetry:opentelemetry-api;1.46.0
io.opentelemetry:opentelemetry-sdk;1.46.0
io.opentelemetry:opentelemetry-sdk-metrics;1.46.0
io.opentelemetry:opentelemetry-sdk-logs;1.46.0
io.opentelemetry:opentelemetry-exporter-logging;1.46.0
io.opentelemetry:opentelemetry-exporter-otlp;1.46.0
io.opentelemetry:opentelemetry-sdk-testing;1.46.0
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.46.0
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi;1.46.0
io.opentelemetry:opentelemetry-bom;1.46.0
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;2.12.0-alpha
io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter;2.12.0
io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;2.12.0-alpha
io.opentelemetry.semconv:opentelemetry-semconv-incubating;1.26.0-alpha
io.projectreactor:reactor-test;3.4.41
io.github.hakky54:logcaptor;2.9.3
Expand Down Expand Up @@ -222,6 +222,16 @@ org.revapi:revapi-maven-plugin;0.14.6
# Format;
# <some unique identifier, area name preferred>_groupId:artifactId;dependency-version

# The OpenTelemetry exporter is replaced with the OpenTelemetry SDK Autoconfigure Distro
otel_exporter_deprecated_io.opentelemetry:opentelemetry-api;1.43.0
otel_exporter_deprecated_io.opentelemetry:opentelemetry-sdk;1.43.0
otel_exporter_deprecated_io.opentelemetry:opentelemetry-sdk-metrics;1.43.0
otel_exporter_deprecated_io.opentelemetry:opentelemetry-sdk-logs;1.43.0
otel_exporter_deprecated_io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi;1.43.0
otel_exporter_deprecated_io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.43.0
otel_exporter_deprecated_io.opentelemetry:opentelemetry-sdk-testing;1.43.0
otel_exporter_deprecated_io.opentelemetry.semconv:opentelemetry-semconv-incubating;1.26.0-alpha

# This is a unique dependency as it is the only <type>test-jar</type> dependency in the
# data track. It's also using a SNAPSHOT version which should be disallowed but there is
# going to be some investigation necessary to find, at the very least, a newer version
Expand Down
6 changes: 3 additions & 3 deletions sdk/ai/azure-ai-inference/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;external_dependency} -->
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-otlp</artifactId>
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-exporter-otlp;external_dependency} -->
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-exporter-otlp;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -125,7 +125,7 @@
<bannedDependencies>
<includes>
<!-- opentelemetry-exporter-otlp is used in test scope for tracing samples. -->
<include>io.opentelemetry:opentelemetry-exporter-otlp:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-exporter-otlp;external_dependency} -->
<include>io.opentelemetry:opentelemetry-exporter-otlp:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-exporter-otlp;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
12 changes: 6 additions & 6 deletions sdk/attestation/azure-security-attestation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,19 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-logging</artifactId>
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-exporter-logging;external_dependency} -->
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-exporter-logging;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk</artifactId>
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -125,9 +125,9 @@
<bannedDependencies>
<includes>
<include>com.nimbusds:nimbus-jose-jwt:[9.37.3]</include> <!-- {x-include-update;com.nimbusds:nimbus-jose-jwt;external_dependency} -->
<include>io.opentelemetry:opentelemetry-api:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
<include>io.opentelemetry:opentelemetry-sdk:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
<include>io.opentelemetry:opentelemetry-exporter-logging:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-exporter-logging;external_dependency} -->
<include>io.opentelemetry:opentelemetry-api:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
<include>io.opentelemetry:opentelemetry-sdk:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
<include>io.opentelemetry:opentelemetry-exporter-logging:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-exporter-logging;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
12 changes: 6 additions & 6 deletions sdk/clientcore/http-stress/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
</dependency>

<dependency>
Expand All @@ -60,12 +60,12 @@
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-runtime-telemetry-java8</artifactId>
<version>2.9.0-alpha</version> <!-- {x-version-update;io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;external_dependency} -->
<version>2.12.0-alpha</version> <!-- {x-version-update;io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;external_dependency} -->
</dependency>
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-logback-appender-1.0</artifactId>
<version>2.9.0-alpha</version> <!-- {x-version-update;io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;external_dependency} -->
<version>2.12.0-alpha</version> <!-- {x-version-update;io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;external_dependency} -->
</dependency>
</dependencies>

Expand All @@ -81,10 +81,10 @@
<includes>
<include>com.azure:perf-test-core:[1.0.0-beta.1]</include> <!-- {x-include-update;com.azure:perf-test-core;dependency} -->
<include>com.azure:azure-monitor-opentelemetry-autoconfigure:[1.0.0-beta.1]</include> <!-- {x-include-update;com.azure:azure-monitor-opentelemetry-autoconfigure;dependency} -->
<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} -->
<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} -->
<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} -->
<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} -->
<include>ch.qos.logback:logback-classic:[1.3.14]</include> <!-- {x-include-update;ch.qos.logback:logback-classic;external_dependency} -->
<include>io.opentelemetry:opentelemetry-api:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
<include>io.opentelemetry:opentelemetry-api:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
18 changes: 9 additions & 9 deletions sdk/core/azure-core-metrics-opentelemetry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -66,14 +66,14 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk</artifactId>
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-testing</artifactId>
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -104,7 +104,7 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-otlp</artifactId>
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-exporter-otlp;external_dependency} -->
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-exporter-otlp;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -119,11 +119,11 @@
<rules>
<bannedDependencies>
<includes>
<include>io.opentelemetry:opentelemetry-api:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
<include>io.opentelemetry:opentelemetry-sdk:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
<include>io.opentelemetry:opentelemetry-sdk-testing:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
<include>io.opentelemetry:opentelemetry-exporter-logging:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-exporter-logging;external_dependency} -->
<include>io.opentelemetry:opentelemetry-exporter-otlp:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-exporter-otlp;external_dependency} -->
<include>io.opentelemetry:opentelemetry-api:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
<include>io.opentelemetry:opentelemetry-sdk:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
<include>io.opentelemetry:opentelemetry-sdk-testing:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
<include>io.opentelemetry:opentelemetry-exporter-logging:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-exporter-logging;external_dependency} -->
<include>io.opentelemetry:opentelemetry-exporter-otlp:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-exporter-otlp;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/azure-core-tracing-opentelemetry-samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-logging</artifactId>
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-exporter-logging;external_dependency} -->
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-exporter-logging;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;external_dependency} -->
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
12 changes: 6 additions & 6 deletions sdk/core/azure-core-tracing-opentelemetry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -79,7 +79,7 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk</artifactId>
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -98,7 +98,7 @@
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-testing</artifactId>
<scope>test</scope>
<version>1.43.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
<version>1.46.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
Expand Down Expand Up @@ -130,9 +130,9 @@
<rules>
<bannedDependencies>
<includes>
<include>io.opentelemetry:opentelemetry-api:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
<include>io.opentelemetry:opentelemetry-sdk:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
<include>io.opentelemetry:opentelemetry-sdk-testing:[1.43.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
<include>io.opentelemetry:opentelemetry-api:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
<include>io.opentelemetry:opentelemetry-sdk:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
<include>io.opentelemetry:opentelemetry-sdk-testing:[1.46.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
8 changes: 4 additions & 4 deletions sdk/eventhubs/azure-messaging-eventhubs-stress/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-runtime-telemetry-java8</artifactId>
<version>2.9.0-alpha</version> <!-- {x-version-update;io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;external_dependency} -->
<version>2.12.0-alpha</version> <!-- {x-version-update;io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;external_dependency} -->
</dependency>
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-logback-appender-1.0</artifactId>
<version>2.9.0-alpha</version> <!-- {x-version-update;io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;external_dependency} -->
<version>2.12.0-alpha</version> <!-- {x-version-update;io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;external_dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -102,8 +102,8 @@
<bannedDependencies>
<includes>
<include>org.springframework.boot:spring-boot-starter:[2.7.18]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
<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} -->
<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} -->
<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} -->
<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} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
Loading

0 comments on commit 6781272

Please sign in to comment.