From c9e2843d1503292149157f953100dd91efefa5f6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Feb 2025 14:04:17 -0800 Subject: [PATCH] fix(deps): update opentelemetry instrumentation packages (#606) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jason Plumb --- build.gradle.kts | 2 +- doc-snippets/exporters/build.gradle.kts | 2 +- doc-snippets/getting-started/build.gradle.kts | 2 +- doc-snippets/spring-starter/build.gradle.kts | 2 +- grpc/build.gradle.kts | 2 +- .../opentelemetry/examples/grpc/ExampleConfiguration.java | 4 ++-- .../opentelemetry/example/jaeger/ExampleConfiguration.java | 5 +++-- .../io/opentelemetry/example/logappender/Application.java | 5 +++-- .../io/opentelemetry/example/otlp/ExampleConfiguration.java | 2 +- .../example/prometheus/ExampleConfiguration.java | 2 +- spring-native/build.gradle.kts | 2 +- telemetry-testing/build.gradle.kts | 2 +- .../opentelemetry/example/zipkin/ExampleConfiguration.java | 6 ++++-- 13 files changed, 21 insertions(+), 17 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e018ba61a0..38c3698019 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ subprojects { dependencies { // using the bom ensures that all of your opentelemetry dependency versions are aligned - implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha")) + implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.0-alpha")) } spotless { diff --git a/doc-snippets/exporters/build.gradle.kts b/doc-snippets/exporters/build.gradle.kts index 3fc814a54e..1d0019749d 100644 --- a/doc-snippets/exporters/build.gradle.kts +++ b/doc-snippets/exporters/build.gradle.kts @@ -9,7 +9,7 @@ val moduleName by extra { "io.opentelemetry.examples.docs.exporters" } dependencies { implementation(platform(SpringBootPlugin.BOM_COORDINATES)) - implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0")) + implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.0")) implementation("org.springframework.boot:spring-boot-starter-web") implementation("io.opentelemetry:opentelemetry-exporter-otlp") diff --git a/doc-snippets/getting-started/build.gradle.kts b/doc-snippets/getting-started/build.gradle.kts index 99a3d615f1..218a7d8083 100644 --- a/doc-snippets/getting-started/build.gradle.kts +++ b/doc-snippets/getting-started/build.gradle.kts @@ -9,7 +9,7 @@ val moduleName by extra { "io.opentelemetry.examples.docs.getting-started" } dependencies { implementation(platform(SpringBootPlugin.BOM_COORDINATES)) - implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0")) + implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.0")) implementation("org.springframework.boot:spring-boot-starter-web") } diff --git a/doc-snippets/spring-starter/build.gradle.kts b/doc-snippets/spring-starter/build.gradle.kts index 12a8537e4f..0ad708c4bc 100644 --- a/doc-snippets/spring-starter/build.gradle.kts +++ b/doc-snippets/spring-starter/build.gradle.kts @@ -9,7 +9,7 @@ val moduleName by extra { "io.opentelemetry.examples.docs.spring-starter" } dependencies { implementation(platform(SpringBootPlugin.BOM_COORDINATES)) - implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0")) + implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.0")) implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-webflux") diff --git a/grpc/build.gradle.kts b/grpc/build.gradle.kts index 7727d68b14..5a785a5b07 100644 --- a/grpc/build.gradle.kts +++ b/grpc/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { implementation ("io.grpc:grpc-services:${grpcVersion}") implementation ("io.grpc:grpc-stub:${grpcVersion}") implementation ("com.google.protobuf:protobuf-java-util:${protobufVersion}") - implementation ("io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.12.0-alpha") + implementation ("io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.13.0-alpha") implementation ("com.google.guava:guava:33.4.0-jre") implementation("io.opentelemetry:opentelemetry-api") diff --git a/grpc/src/main/java/io/opentelemetry/examples/grpc/ExampleConfiguration.java b/grpc/src/main/java/io/opentelemetry/examples/grpc/ExampleConfiguration.java index f43689f05e..e7dd2a1b60 100644 --- a/grpc/src/main/java/io/opentelemetry/examples/grpc/ExampleConfiguration.java +++ b/grpc/src/main/java/io/opentelemetry/examples/grpc/ExampleConfiguration.java @@ -12,7 +12,7 @@ import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.ServiceAttributes; public final class ExampleConfiguration { @@ -25,7 +25,7 @@ static OpenTelemetry initializeOpenTelemetry(String ip, int port) { ZipkinSpanExporter zipkinExporter = ZipkinSpanExporter.builder().setEndpoint(endpoint).build(); Resource serviceNameResource = - Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, SERVICE_NAME)); + Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, SERVICE_NAME)); // Set to process the spans by the Zipkin Exporter SdkTracerProvider tracerProvider = diff --git a/jaeger/src/main/java/io/opentelemetry/example/jaeger/ExampleConfiguration.java b/jaeger/src/main/java/io/opentelemetry/example/jaeger/ExampleConfiguration.java index 62b89c1585..a107995d08 100644 --- a/jaeger/src/main/java/io/opentelemetry/example/jaeger/ExampleConfiguration.java +++ b/jaeger/src/main/java/io/opentelemetry/example/jaeger/ExampleConfiguration.java @@ -5,6 +5,8 @@ package io.opentelemetry.example.jaeger; +import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME; + import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter; @@ -12,7 +14,6 @@ import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; -import io.opentelemetry.semconv.ResourceAttributes; import java.util.concurrent.TimeUnit; /** @@ -37,7 +38,7 @@ static OpenTelemetry initOpenTelemetry(String jaegerEndpoint) { .build(); Resource serviceNameResource = - Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, "otel-jaeger-example")); + Resource.create(Attributes.of(SERVICE_NAME, "otel-jaeger-example")); // Set to process the spans by the Jaeger Exporter SdkTracerProvider tracerProvider = diff --git a/log-appender/src/main/java/io/opentelemetry/example/logappender/Application.java b/log-appender/src/main/java/io/opentelemetry/example/logappender/Application.java index 56e801f5b1..a976535da6 100644 --- a/log-appender/src/main/java/io/opentelemetry/example/logappender/Application.java +++ b/log-appender/src/main/java/io/opentelemetry/example/logappender/Application.java @@ -1,5 +1,7 @@ package io.opentelemetry.example.logappender; +import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME; + import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.common.AttributeKey; @@ -13,7 +15,6 @@ import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.samplers.Sampler; -import io.opentelemetry.semconv.ResourceAttributes; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; @@ -115,7 +116,7 @@ private static OpenTelemetry initializeOpenTelemetry() { SdkLoggerProvider.builder() .setResource( Resource.getDefault().toBuilder() - .put(ResourceAttributes.SERVICE_NAME, "log4j-example") + .put(SERVICE_NAME, "log4j-example") .build()) .addLogRecordProcessor( BatchLogRecordProcessor.builder( diff --git a/otlp/src/main/java/io/opentelemetry/example/otlp/ExampleConfiguration.java b/otlp/src/main/java/io/opentelemetry/example/otlp/ExampleConfiguration.java index a9dd405860..9ea201fd76 100644 --- a/otlp/src/main/java/io/opentelemetry/example/otlp/ExampleConfiguration.java +++ b/otlp/src/main/java/io/opentelemetry/example/otlp/ExampleConfiguration.java @@ -5,7 +5,7 @@ package io.opentelemetry.example.otlp; -import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME; +import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporter; diff --git a/prometheus/src/main/java/io/opentelemetry/example/prometheus/ExampleConfiguration.java b/prometheus/src/main/java/io/opentelemetry/example/prometheus/ExampleConfiguration.java index 545a848107..1a8e22341b 100644 --- a/prometheus/src/main/java/io/opentelemetry/example/prometheus/ExampleConfiguration.java +++ b/prometheus/src/main/java/io/opentelemetry/example/prometheus/ExampleConfiguration.java @@ -5,7 +5,7 @@ package io.opentelemetry.example.prometheus; -import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME; +import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.exporter.logging.LoggingSpanExporter; diff --git a/spring-native/build.gradle.kts b/spring-native/build.gradle.kts index 4b65c9186d..72815fecba 100644 --- a/spring-native/build.gradle.kts +++ b/spring-native/build.gradle.kts @@ -11,7 +11,7 @@ val moduleName by extra { "io.opentelemetry.examples.native" } dependencies { implementation(platform(SpringBootPlugin.BOM_COORDINATES)) - implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0")) + implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.0")) implementation("org.springframework.boot:spring-boot-starter-actuator") implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-data-jdbc") diff --git a/telemetry-testing/build.gradle.kts b/telemetry-testing/build.gradle.kts index 000a33322d..aee741af27 100644 --- a/telemetry-testing/build.gradle.kts +++ b/telemetry-testing/build.gradle.kts @@ -23,7 +23,7 @@ val bootJar = tasks.named("bootJar") { dependencies { implementation(platform(SpringBootPlugin.BOM_COORDINATES)) implementation("io.opentelemetry:opentelemetry-api") - implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.12.0") + implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.13.0") //spring modules implementation("org.springframework.boot:spring-boot-starter-web") testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/zipkin/src/main/java/io/opentelemetry/example/zipkin/ExampleConfiguration.java b/zipkin/src/main/java/io/opentelemetry/example/zipkin/ExampleConfiguration.java index 6a806c88c2..2158dc740a 100644 --- a/zipkin/src/main/java/io/opentelemetry/example/zipkin/ExampleConfiguration.java +++ b/zipkin/src/main/java/io/opentelemetry/example/zipkin/ExampleConfiguration.java @@ -5,6 +5,8 @@ package io.opentelemetry.example.zipkin; +import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME; + import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.exporter.zipkin.ZipkinSpanExporter; @@ -12,7 +14,7 @@ import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.ServiceAttributes; /** * All SDK management takes place here, away from the instrumentation code, which should only access @@ -29,7 +31,7 @@ static OpenTelemetry initializeOpenTelemetry(String ip, int port) { ZipkinSpanExporter zipkinExporter = ZipkinSpanExporter.builder().setEndpoint(endpoint).build(); Resource serviceNameResource = - Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, SERVICE_NAME)); + Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, SERVICE_NAME)); // Set to process the spans by the Zipkin Exporter SdkTracerProvider tracerProvider =