diff --git a/archetypes/archetypes/src/main/archetype/common/observability.xml b/archetypes/archetypes/src/main/archetype/common/observability.xml index 82beaf7dd0e..ab8d5c236e0 100644 --- a/archetypes/archetypes/src/main/archetype/common/observability.xml +++ b/archetypes/archetypes/src/main/archetype/common/observability.xml @@ -1,7 +1,7 @@ + 3.6.0 4.12.0 1.29.0-alpha - 1.29.0 - 1.29.0 - 1.29.0 + 1.53.0 + 1.53.0 + 1.53.0 + 2.19.0 0.33.0 0.2.1 0.1.8 @@ -273,7 +276,7 @@ io.opentelemetry.instrumentation opentelemetry-instrumentation-annotations - ${version.lib.opentelemetry} + ${version.lib.opentelemetry.instrumentation.annotations} io.opentelemetry.instrumentation @@ -1247,6 +1250,11 @@ okhttp ${version.lib.okhttp3} + + com.squareup.okio + okio + ${version.lib.okio} + diff --git a/microprofile/telemetry/src/main/java/module-info.java b/microprofile/telemetry/src/main/java/module-info.java index f2cf2bf99a9..db505ebc9bf 100644 --- a/microprofile/telemetry/src/main/java/module-info.java +++ b/microprofile/telemetry/src/main/java/module-info.java @@ -44,7 +44,7 @@ requires jakarta.annotation; requires jakarta.inject; requires microprofile.config.api; - requires opentelemetry.instrumentation.annotations; + requires io.opentelemetry.instrumentation_annotations; requires io.opentelemetry.semconv; requires static io.helidon.common.features.api; diff --git a/tracing/providers/jaeger/pom.xml b/tracing/providers/jaeger/pom.xml index 4791b2f5643..7a9ef414190 100644 --- a/tracing/providers/jaeger/pom.xml +++ b/tracing/providers/jaeger/pom.xml @@ -43,7 +43,24 @@ io.opentelemetry - opentelemetry-exporter-jaeger + opentelemetry-exporter-otlp + + + io.opentelemetry + opentelemetry-exporter-sender-okhttp + + + + + io.opentelemetry + opentelemetry-exporter-sender-grpc-managed-channel + ${version.lib.opentelemetry} + runtime + + + io.grpc + grpc-okhttp + runtime io.helidon.tracing.providers @@ -97,11 +114,7 @@ opentelemetry-sdk-extension-autoconfigure test - - io.opentelemetry - opentelemetry-exporter-otlp - test - + diff --git a/tracing/providers/jaeger/src/main/java/io/helidon/tracing/providers/jaeger/JaegerTracerBuilder.java b/tracing/providers/jaeger/src/main/java/io/helidon/tracing/providers/jaeger/JaegerTracerBuilder.java index 5e491d92e22..3b33af9c111 100644 --- a/tracing/providers/jaeger/src/main/java/io/helidon/tracing/providers/jaeger/JaegerTracerBuilder.java +++ b/tracing/providers/jaeger/src/main/java/io/helidon/tracing/providers/jaeger/JaegerTracerBuilder.java @@ -41,8 +41,8 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.propagation.ContextPropagators; import io.opentelemetry.context.propagation.TextMapPropagator; -import io.opentelemetry.exporter.jaeger.JaegerGrpcSpanExporter; -import io.opentelemetry.exporter.jaeger.JaegerGrpcSpanExporterBuilder; +import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter; +import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder; import io.opentelemetry.extension.trace.propagation.B3Propagator; import io.opentelemetry.extension.trace.propagation.JaegerPropagator; import io.opentelemetry.sdk.OpenTelemetrySdk; @@ -157,7 +157,7 @@ public class JaegerTracerBuilder implements TracerBuilder { static final boolean DEFAULT_ENABLED = true; static final String DEFAULT_HTTP_HOST = "localhost"; static final int DEFAULT_SCHEDULE_DELAY = 5_000; - static final int DEFAULT_HTTP_PORT = 14250; + static final int DEFAULT_HTTP_PORT = 4317; static final int DEFAULT_MAX_QUEUE_SIZE = 2048; static final int DEFAULT_MAX_EXPORT_BATCH_SIZE = 512; @@ -495,7 +495,7 @@ public Tracer build() { "Configuration must at least contain the 'service' key ('tracing.service` in MP) with service name"); } - JaegerGrpcSpanExporterBuilder spanExporterBuilder = JaegerGrpcSpanExporter.builder() + OtlpGrpcSpanExporterBuilder spanExporterBuilder = OtlpGrpcSpanExporter.builder() .setEndpoint(protocol + "://" + host + ":" + port + (path == null ? "" : path)) .setTimeout(exporterTimeout); diff --git a/tracing/providers/jaeger/src/main/java/module-info.java b/tracing/providers/jaeger/src/main/java/module-info.java index cb0de823165..bee7522c8c0 100644 --- a/tracing/providers/jaeger/src/main/java/module-info.java +++ b/tracing/providers/jaeger/src/main/java/module-info.java @@ -28,7 +28,7 @@ requires io.helidon.common.configurable; requires io.helidon.common.context; requires io.helidon.tracing.providers.opentelemetry; - requires io.opentelemetry.exporter.jaeger; + requires io.opentelemetry.exporter.otlp; requires io.opentelemetry.sdk.common; requires io.opentelemetry.sdk.trace; requires io.opentelemetry.sdk; diff --git a/tracing/providers/jaeger/src/test/java/io/helidon/tracing/providers/jaeger/JaegerTracerBuilderTest.java b/tracing/providers/jaeger/src/test/java/io/helidon/tracing/providers/jaeger/JaegerTracerBuilderTest.java index d97ddf28157..158bf046ba6 100644 --- a/tracing/providers/jaeger/src/test/java/io/helidon/tracing/providers/jaeger/JaegerTracerBuilderTest.java +++ b/tracing/providers/jaeger/src/test/java/io/helidon/tracing/providers/jaeger/JaegerTracerBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2024 Oracle and/or its affiliates. + * Copyright (c) 2019, 2025 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -75,7 +75,7 @@ void testConfigDefaults() { assertThat("Tags", jBuilder.tags(), is(Map.of())); assertThat("Protocol", jBuilder.protocol(), is("http")); assertThat("Host", jBuilder.host(), is("localhost")); - assertThat("Port", jBuilder.port(), is(14250)); + assertThat("Port", jBuilder.port(), is(4317)); assertThat("Path", jBuilder.path(), nullValue()); assertThat("Enabled", jBuilder.isEnabled(), is(true)); assertThat("Sampler type", jBuilder.samplerType(), is(JaegerTracerBuilder.SamplerType.CONSTANT));