Trial update of OTel and okhttp

archetypes/archetypes/src/main/archetype/common/observability.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+    Copyright (c) 2022, 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.

archetypes/archetypes/src/main/archetype/mp/custom/tracing-outputs.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2023 Oracle and/or its affiliates.
+    Copyright (c) 2023, 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.
@@ -26,9 +26,10 @@
                     <list key="dependencies">
                         <map order="800">
                             <value key="groupId">io.opentelemetry</value>
-                            <value key="artifactId">opentelemetry-exporter-jaeger</value>
+                            <value key="artifactId">opentelemetry-exporter-otlp</value>
                         </map>
                     </list>
+                    <value key="tracing.provider.otel">otlp</value>
                 </model>
             </output>
         </method>
@@ -41,6 +42,7 @@
                             <value key="artifactId">opentelemetry-exporter-zipkin</value>
                         </map>
                     </list>
+                    <value key="tracing.provider.otel">${tracing.provider}</value>
                 </model>
             </output>
         </method>
@@ -65,7 +67,7 @@
                 <value template="mustache"><![CDATA[
 #OpenTelemetry
 otel.sdk.disabled=false
-otel.traces.exporter={{tracing.provider}}
+otel.traces.exporter={{tracing.provider.otel}}
 otel.service.name=helidon-tracing-service]]></value>
             </list>
             <list key="module-requires">

archetypes/archetypes/src/main/archetype/se/custom/tracing-outputs.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2023 Oracle and/or its affiliates.
+    Copyright (c) 2023, 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.
@@ -47,11 +47,13 @@ tracing:
                 </map>
                 <map if="${tracing.provider} == 'jaeger'">
                     <value key="groupId">io.helidon.tracing.providers</value>
-                    <value key="artifactId">helidon-tracing-providers-jaeger</value>
+                    <value key="artifactId">helidon-tracing-providers-opentelemetry</value>
+                    <value key="tracing.provider.otel">otlp</value>
                 </map>
                 <map if="${tracing.provider} == 'zipkin'">
                     <value key="groupId">io.helidon.tracing.providers</value>
                     <value key="artifactId">helidon-tracing-providers-zipkin</value>
+                    <value key="tracing.provider.otel">${tracing.provider}</value>
                 </map>
             </list>
             <list key="Main-routing-builder">

dependencies/pom.xml

@@ -145,12 +145,15 @@
         <version.lib.ojdbc.family>23</version.lib.ojdbc.family>
         <version.lib.ojdbc>${version.lib.ojdbc.family}.9.0.25.07</version.lib.ojdbc>
         <version.lib.ojdbc8>${version.lib.ojdbc}</version.lib.ojdbc8>
+        <!-- Force upgrade okio for dependency convergence: bring otel otlp exporter up to what langchain4j uses -->
+        <version.lib.okio>3.6.0</version.lib.okio>
         <!-- Force upgrade okhttp3 for dependency convergence -->
         <version.lib.okhttp3>4.12.0</version.lib.okhttp3>
         <version.lib.opentelemetry.semconv>1.29.0-alpha</version.lib.opentelemetry.semconv>
-        <version.lib.opentelemetry-sdk-extension-autoconfigure>1.29.0</version.lib.opentelemetry-sdk-extension-autoconfigure>
-        <version.lib.opentelemetry.opentracing.shim>1.29.0</version.lib.opentelemetry.opentracing.shim>
-        <version.lib.opentelemetry>1.29.0</version.lib.opentelemetry>
+        <version.lib.opentelemetry-sdk-extension-autoconfigure>1.53.0</version.lib.opentelemetry-sdk-extension-autoconfigure>
+        <version.lib.opentelemetry.opentracing.shim>1.53.0</version.lib.opentelemetry.opentracing.shim>
+        <version.lib.opentelemetry>1.53.0</version.lib.opentelemetry>
+        <version.lib.opentelemetry.instrumentation.annotations>2.19.0</version.lib.opentelemetry.instrumentation.annotations>
         <version.lib.opentracing>0.33.0</version.lib.opentracing>
         <version.lib.opentracing.grpc>0.2.1</version.lib.opentracing.grpc>
         <version.lib.opentracing.tracerresolver>0.1.8</version.lib.opentracing.tracerresolver>
@@ -273,7 +276,7 @@
             <dependency>
                 <groupId>io.opentelemetry.instrumentation</groupId>
                 <artifactId>opentelemetry-instrumentation-annotations</artifactId>
-                <version>${version.lib.opentelemetry}</version>
+                <version>${version.lib.opentelemetry.instrumentation.annotations}</version>
             </dependency>
             <dependency>
                 <groupId>io.opentelemetry.instrumentation</groupId>
@@ -1247,6 +1250,11 @@
                 <artifactId>okhttp</artifactId>
                 <version>${version.lib.okhttp3}</version>
             </dependency>
+            <dependency>
+                <groupId>com.squareup.okio</groupId>
+                <artifactId>okio</artifactId>
+                <version>${version.lib.okio}</version>
+            </dependency>
             <!-- END OF Section 3: transitive dependencies we manage the version of for convergence/upgrade -->
 
             <!-- Section 4: Testing -->

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;

tracing/providers/jaeger/pom.xml

@@ -43,7 +43,24 @@
         </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-exporter-jaeger</artifactId>
+            <artifactId>opentelemetry-exporter-otlp</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.opentelemetry</groupId>
+                    <artifactId>opentelemetry-exporter-sender-okhttp</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-exporter-sender-grpc-managed-channel</artifactId>
+            <version>${version.lib.opentelemetry}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-okhttp</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>io.helidon.tracing.providers</groupId>
@@ -97,11 +114,7 @@
             <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-exporter-otlp</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <!-- -->
 
         <dependency>

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<JaegerTracerBuilder> {
     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);
 

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;

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));