diff --git a/dependencies.gradle b/dependencies.gradle index eb8dc5c7..b8572346 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,7 +35,7 @@ def MICROMETER_PLATFORM_VERSIONS = [ def PLATFORM_VERSIONS = [ libs.zipkinReporterBom, libs.braveBom, - libs.otelInstrumentationBomAlpha, + libs.otelBom, libs.reactorBom, libs.junitBom ] diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bdb11bea..8117047b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,8 @@ aopalliance="1.0" zipkinAws="1.3.0" logback = "1.5.16" wavefrontSdk="3.4.3" -otelInstrumentationBomAlpha="2.13.1-alpha" # Automatic patch version updates are disabled since patch version bumps in this BOM can cause minor version bumps in other OTel dependencies +otelBom="1.47.0" +otelSemconvAlpha="1.30.0-alpha" log4j = "2.24.3" wavefrontReporter="1.7.16" slf4j = "1.7.36" @@ -51,7 +52,8 @@ micrometerContextPropagation = { module = "io.micrometer:context-propagation", v micrometerBom = { module = "io.micrometer:micrometer-bom", version.ref = "micrometer" } mockitoCore = { module = "org.mockito:mockito-core", version.ref = "mockito" } mockitoJunit = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" } -otelInstrumentationBomAlpha = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha", version.ref = "otelInstrumentationBomAlpha" } +otelBom = { module = "io.opentelemetry:opentelemetry-bom", version.ref = "otelBom" } +otelSemconvAlpha = { module = "io.opentelemetry.semconv:opentelemetry-semconv-incubating", version.ref = "otelSemconvAlpha" } reactorBom = { module = "io.projectreactor:reactor-bom", version.ref = "reactorBom" } slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } springCore = { module = "org.springframework:spring-core", version.ref = "spring" } diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle index 1c5f4600..f05610a7 100644 --- a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle +++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle @@ -8,11 +8,10 @@ dependencies { api 'io.micrometer:micrometer-observation' api 'io.opentelemetry:opentelemetry-api' - api 'io.opentelemetry.semconv:opentelemetry-semconv-incubating' // brings in io.opentelemetry.semconv:opentelemetry-semconv + api libs.otelSemconvAlpha api 'io.opentelemetry:opentelemetry-sdk-common' api 'io.opentelemetry:opentelemetry-sdk-trace' api 'io.opentelemetry:opentelemetry-sdk' - 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 7da38f7e..6b81d24c 100644 --- a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle +++ b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle @@ -16,7 +16,6 @@ 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-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 bef31e3d..41faaa66 100644 --- a/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle +++ b/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle @@ -23,7 +23,6 @@ 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-incubator' api 'io.opentelemetry:opentelemetry-sdk-testing' // Zipkin