Merge pull request quarkusio#35733 from brunobat/bump-otel-1-29

geoand · web-flow · commit 7903aa76e414 · 2023-09-19T17:00:09.000+03:00
Bump OTel to 1.29.0
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -31,8 +31,8 @@
         <opentracing-jdbc.version>0.2.4</opentracing-jdbc.version>
         <opentracing-kafka.version>0.1.15</opentracing-kafka.version>
         <opentracing-mongo.version>0.1.5</opentracing-mongo.version>
-        <opentelemetry.version>1.28.0</opentelemetry.version>
-        <opentelemetry-alpha.version>1.28.0-alpha</opentelemetry-alpha.version>
+        <opentelemetry.version>1.29.0</opentelemetry.version>
+        <opentelemetry-alpha.version>1.29.0-alpha</opentelemetry-alpha.version>
         <jaeger.version>1.8.1</jaeger.version>
         <quarkus-http.version>5.0.3.Final</quarkus-http.version>
         <micrometer.version>1.11.1</micrometer.version><!-- keep in sync with hdrhistogram -->
diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/GrpcOpenTelemetryTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/GrpcOpenTelemetryTest.java
@@ -4,7 +4,8 @@
 import static io.opentelemetry.api.trace.SpanKind.CLIENT;
 import static io.opentelemetry.api.trace.SpanKind.INTERNAL;
 import static io.opentelemetry.api.trace.SpanKind.SERVER;
-import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_TRANSPORT;
+import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_HOST_PORT;
+import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_SOCK_HOST_ADDR;
 import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.RPC_GRPC_STATUS_CODE;
 import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.RPC_METHOD;
 import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.RPC_SERVICE;
@@ -13,6 +14,7 @@
 import static io.quarkus.opentelemetry.runtime.config.build.OTelBuildConfig.INSTRUMENTATION_NAME;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -122,9 +124,8 @@ void grpc() {
         assertEquals("helloworld.Greeter", server.getAttributes().get(RPC_SERVICE));
         assertEquals("SayHello", server.getAttributes().get(RPC_METHOD));
         assertEquals(Status.Code.OK.value(), server.getAttributes().get(RPC_GRPC_STATUS_CODE));
-        //        assertNotNull(server.getAttributes().get(NET_PEER_IP));
-        //        assertNotNull(server.getAttributes().get(NET_PEER_PORT));
-        assertEquals("ip_tcp", server.getAttributes().get(NET_TRANSPORT));
+        assertNotNull(server.getAttributes().get(NET_HOST_PORT));
+        assertNotNull(server.getAttributes().get(NET_SOCK_HOST_ADDR));
 
         final SpanData internal = getSpanByKindAndParentId(spans, INTERNAL, server.getSpanId());
         assertEquals("span.internal", internal.getName());
@@ -161,9 +162,8 @@ void error() {
         assertEquals("helloworld.Greeter", server.getAttributes().get(RPC_SERVICE));
         assertEquals("SayHello", server.getAttributes().get(RPC_METHOD));
         assertEquals(Status.Code.UNKNOWN.value(), server.getAttributes().get(RPC_GRPC_STATUS_CODE));
-        //        assertNotNull(server.getAttributes().get(NET_PEER_IP));
-        //        assertNotNull(server.getAttributes().get(NET_PEER_PORT));
-        assertEquals("ip_tcp", server.getAttributes().get(NET_TRANSPORT));
+        assertNotNull(server.getAttributes().get(NET_HOST_PORT));
+        assertNotNull(server.getAttributes().get(NET_SOCK_HOST_ADDR));
         assertEquals(Status.Code.UNKNOWN.value(), server.getAttributes().get(RPC_GRPC_STATUS_CODE));
 
         assertEquals(server.getTraceId(), client.getTraceId());
@@ -213,9 +213,8 @@ void streaming() {
         assertEquals("streaming.Streaming", server.getAttributes().get(RPC_SERVICE));
         assertEquals("Pipe", server.getAttributes().get(RPC_METHOD));
         assertEquals(Status.Code.OK.value(), server.getAttributes().get(RPC_GRPC_STATUS_CODE));
-        //        assertNotNull(server.getAttributes().get(NET_PEER_IP));
-        //        assertNotNull(server.getAttributes().get(NET_PEER_PORT));
-        assertEquals("ip_tcp", server.getAttributes().get(NET_TRANSPORT));
+        assertNotNull(server.getAttributes().get(NET_HOST_PORT));
+        assertNotNull(server.getAttributes().get(NET_SOCK_HOST_ADDR));
         assertEquals("true", server.getAttributes().get(stringKey("grpc.service.propagated")));
 
         assertEquals(server.getTraceId(), client.getTraceId());
@@ -250,9 +249,8 @@ void streamingBlocking() {
         assertEquals("streaming.Streaming", server.getAttributes().get(RPC_SERVICE));
         assertEquals("PipeBlocking", server.getAttributes().get(RPC_METHOD));
         assertEquals(Status.Code.OK.value(), server.getAttributes().get(RPC_GRPC_STATUS_CODE));
-        //        assertNotNull(server.getAttributes().get(NET_PEER_IP));//now shows up on net.sock.peer.addr. Not available on attributes yet. FIXME
-        //        assertNotNull(server.getAttributes().get(NET_PEER_PORT)); // same for port. FIXME
-        assertEquals("ip_tcp", server.getAttributes().get(NET_TRANSPORT));
+        assertNotNull(server.getAttributes().get(NET_HOST_PORT));
+        assertNotNull(server.getAttributes().get(NET_SOCK_HOST_ADDR));
         assertEquals("true", server.getAttributes().get(stringKey("grpc.service.propagated.blocking")));
 
         assertEquals(server.getTraceId(), client.getTraceId());
diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/Substitutions.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/Substitutions.java
@@ -10,6 +10,7 @@
 
 import io.opentelemetry.api.events.EventEmitterProvider;
 import io.opentelemetry.api.metrics.MeterProvider;
+import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder;
 import io.opentelemetry.sdk.logs.export.LogRecordExporter;
@@ -24,7 +25,7 @@ static final class Target_MeterProviderConfiguration {
         @Substitute
         static List<MetricReader> configureMetricReaders(
                 ConfigProperties config,
-                ClassLoader serviceClassLoader,
+                SpiHelper spiHelper,
                 BiFunction<? super MetricExporter, ConfigProperties, ? extends MetricExporter> metricExporterCustomizer,
                 List<Closeable> closeables) {
             // OTel metrics not supported and there is no need to call
@@ -40,7 +41,7 @@ static final class Target_LoggerProviderConfiguration {
         static void configureLoggerProvider(
                 SdkLoggerProviderBuilder loggerProviderBuilder,
                 ConfigProperties config,
-                ClassLoader serviceClassLoader,
+                SpiHelper spiHelper,
                 MeterProvider meterProvider,
                 BiFunction<? super LogRecordExporter, ConfigProperties, ? extends LogRecordExporter> logRecordExporterCustomizer,
                 List<Closeable> closeables) {
diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcTracingServerInterceptor.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcTracingServerInterceptor.java
@@ -22,10 +22,12 @@
 import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
-import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesExtractor;
-import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter;
+import io.opentelemetry.instrumentation.api.instrumenter.network.ClientAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.network.ClientAttributesGetter;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesGetter;
+import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter;
 import io.opentelemetry.instrumentation.api.instrumenter.rpc.RpcServerAttributesExtractor;
-import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import io.quarkus.grpc.GlobalInterceptor;
 
 @Singleton
@@ -39,8 +41,12 @@ public GrpcTracingServerInterceptor(final OpenTelemetry openTelemetry) {
                 INSTRUMENTATION_NAME,
                 new GrpcSpanNameExtractor());
 
+        GrpcServerNetworkAttributesGetter getter = new GrpcServerNetworkAttributesGetter();
+
         builder.addAttributesExtractor(RpcServerAttributesExtractor.create(GrpcAttributesGetter.INSTANCE))
-                .addAttributesExtractor(NetServerAttributesExtractor.create(new GrpcServerNetServerAttributesGetter()))
+                .addAttributesExtractor(
+                        ServerAttributesExtractor.createForServerSide(getter))
+                .addAttributesExtractor(ClientAttributesExtractor.create(getter))
                 .addAttributesExtractor(new GrpcStatusCodeExtractor())
                 .setSpanStatusExtractor(new GrpcSpanStatusExtractor());
 
@@ -65,11 +71,9 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
         return next.startCall(call, headers);
     }
 
-    private static class GrpcServerNetServerAttributesGetter implements NetServerAttributesGetter<GrpcRequest, Status> {
-        @Override
-        public String getTransport(final GrpcRequest grpcRequest) {
-            return SemanticAttributes.NetTransportValues.IP_TCP;
-        }
+    static class GrpcServerNetworkAttributesGetter implements NetworkAttributesGetter<GrpcRequest, Status>,
+            ServerAttributesGetter<GrpcRequest, Status>,
+            ClientAttributesGetter<GrpcRequest, Status> {
 
         @Override
         public String getServerAddress(GrpcRequest grpcRequest) {
diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/restclient/OpenTelemetryClientFilter.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/restclient/OpenTelemetryClientFilter.java
@@ -26,7 +26,6 @@
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesGetter;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanNameExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanStatusExtractor;
-import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import io.quarkus.arc.Unremovable;
 import io.quarkus.opentelemetry.runtime.QuarkusContextStorage;
@@ -62,7 +61,6 @@ public OpenTelemetryClientFilter() {
     @Inject
     public OpenTelemetryClientFilter(final OpenTelemetry openTelemetry) {
         ClientAttributesExtractor clientAttributesExtractor = new ClientAttributesExtractor();
-        ClientNetAttributesGetter clientNetAttributesExtractor = new ClientNetAttributesGetter();
 
         InstrumenterBuilder<ClientRequestContext, ClientResponseContext> builder = Instrumenter.builder(
                 openTelemetry,
@@ -72,7 +70,7 @@ public OpenTelemetryClientFilter(final OpenTelemetry openTelemetry) {
         this.instrumenter = builder
                 .setSpanStatusExtractor(HttpSpanStatusExtractor.create(clientAttributesExtractor))
                 .addAttributesExtractor(HttpClientAttributesExtractor.create(
-                        clientAttributesExtractor, clientNetAttributesExtractor))
+                        clientAttributesExtractor))
                 .buildClientInstrumenter(new ClientRequestContextTextMapSetter());
     }
 
@@ -155,32 +153,6 @@ public String getUrlFull(final ClientRequestContext request) {
             return uri.toString();
         }
 
-        @Override
-        public String getHttpRequestMethod(final ClientRequestContext request) {
-            return request.getMethod();
-        }
-
-        @Override
-        public List<String> getHttpRequestHeader(final ClientRequestContext request, final String name) {
-            return request.getStringHeaders().getOrDefault(name, emptyList());
-        }
-
-        @Override
-        public Integer getHttpResponseStatusCode(ClientRequestContext clientRequestContext,
-                ClientResponseContext clientResponseContext, Throwable error) {
-            return clientResponseContext.getStatus();
-        }
-
-        @Override
-        public List<String> getHttpResponseHeader(final ClientRequestContext request, final ClientResponseContext response,
-                final String name) {
-            return response.getHeaders().getOrDefault(name, emptyList());
-        }
-    }
-
-    private static class ClientNetAttributesGetter
-            implements NetClientAttributesGetter<ClientRequestContext, ClientResponseContext> {
-
         @Override
         public String getTransport(ClientRequestContext clientRequestContext, ClientResponseContext clientResponseContext) {
             return SemanticAttributes.NetTransportValues.IP_TCP;
@@ -207,5 +179,27 @@ public String getNetworkProtocolVersion(ClientRequestContext clientRequestContex
                 ClientResponseContext clientResponseContext) {
             return null;
         }
+
+        @Override
+        public String getHttpRequestMethod(final ClientRequestContext request) {
+            return request.getMethod();
+        }
+
+        @Override
+        public List<String> getHttpRequestHeader(final ClientRequestContext request, final String name) {
+            return request.getStringHeaders().getOrDefault(name, emptyList());
+        }
+
+        @Override
+        public Integer getHttpResponseStatusCode(ClientRequestContext clientRequestContext,
+                ClientResponseContext clientResponseContext, Throwable error) {
+            return clientResponseContext.getStatus();
+        }
+
+        @Override
+        public List<String> getHttpResponseHeader(final ClientRequestContext request, final ClientResponseContext response,
+                final String name) {
+            return response.getHeaders().getOrDefault(name, emptyList());
+        }
     }
 }
diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/HttpInstrumenterVertxTracer.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/HttpInstrumenterVertxTracer.java
diff --git a/integration-tests/opentelemetry-grpc/src/test/java/io/quarkus/it/opentelemetry/grpc/OpenTelemetryGrpcTest.java b/integration-tests/opentelemetry-grpc/src/test/java/io/quarkus/it/opentelemetry/grpc/OpenTelemetryGrpcTest.java
