From 3eb1a4c90b24b7193f4a555d34823f396135e283 Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Thu, 5 Sep 2024 13:03:57 -0700 Subject: [PATCH] Upgrade OTel instrumentation BOM to 2.7.0-alpha (#828) --- gradle/libs.versions.toml | 2 +- .../micrometer-tracing-bridge-otel/build.gradle | 2 +- .../micrometer-tracing-reporter-wavefront/build.gradle | 2 +- .../micrometer-tracing-integration-test/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index abe5de50..7ee2563d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ aopalliance="1.0" zipkinAws="1.2.5" logback = "1.5.7" wavefrontSdk="3.4.3" -otelInstrumentationBomAlpha="1.33.6-alpha" # Brings in io.opentelemetry:opentelemetry-bom:1.41.0 +otelInstrumentationBomAlpha="2.7.0-alpha" # Brings in io.opentelemetry:opentelemetry-bom:1.41.0 log4j = "2.23.1" wavefrontReporter="1.7.16" slf4j = "1.7.36" diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle index fb4a4bdf..f04ab272 100644 --- a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle +++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle @@ -12,7 +12,7 @@ dependencies { api 'io.opentelemetry:opentelemetry-sdk-common' api 'io.opentelemetry:opentelemetry-sdk-trace' api 'io.opentelemetry:opentelemetry-sdk' - api 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv' + api 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator' api 'io.opentelemetry:opentelemetry-extension-trace-propagators' optionalApi 'io.opentelemetry:opentelemetry-opentracing-shim' diff --git a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle index e4cc717a..0bfdcc58 100644 --- a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle +++ b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle @@ -16,7 +16,7 @@ dependencies { optionalImplementation 'io.opentelemetry:opentelemetry-sdk' optionalImplementation 'io.opentelemetry:opentelemetry-sdk-trace' optionalImplementation 'io.opentelemetry:opentelemetry-extension-trace-propagators' - optionalImplementation 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv' + optionalImplementation 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator' // Wavefront implementation libs.wavefrontReporter diff --git a/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle b/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle index 7faa5b22..abdf989e 100644 --- a/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle +++ b/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle @@ -23,7 +23,7 @@ dependencies { api 'io.opentelemetry:opentelemetry-exporter-zipkin' api 'io.opentelemetry:opentelemetry-sdk-trace' api 'io.opentelemetry:opentelemetry-extension-trace-propagators' - api 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv' + api 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator' // Zipkin api 'io.zipkin.zipkin2:zipkin'