Merge pull request quarkusio#31356 from brunobat/bump-otel-1-23

Upgrade to OpenTelemetry v1.23.1 and smallrye-reactive-messaging to v4.4.0
Sgitario · Mar 3, 2023 · 8982d17 · 8982d17
2 parents 0676bb9 + 56f5296
commit 8982d17
Show file tree

Hide file tree

Showing 24 changed files with 119 additions and 118 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -36,10 +36,10 @@
         <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.22.0</opentelemetry.version>
-        <opentelemetry-alpha.version>1.22.0-alpha</opentelemetry-alpha.version>
-        <opentelemetry-aws.contrib.version>1.22.0-alpha</opentelemetry-aws.contrib.version>
-        <opentelemetry-aws-xray.contrib.version>1.22.0</opentelemetry-aws-xray.contrib.version>
+        <opentelemetry.version>1.23.1</opentelemetry.version>
+        <opentelemetry-alpha.version>1.23.0-alpha</opentelemetry-alpha.version>
+        <opentelemetry-aws.contrib.version>1.23.0-alpha</opentelemetry-aws.contrib.version>
+        <opentelemetry-aws-xray.contrib.version>1.23.0</opentelemetry-aws-xray.contrib.version>
         <jaeger.version>1.8.1</jaeger.version>
         <quarkus-http.version>5.0.1.Final</quarkus-http.version>
         <micrometer.version>1.10.4</micrometer.version><!-- keep in sync with hdrhistogram -->
@@ -67,7 +67,7 @@
         <smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
         <smallrye-reactive-types-converter.version>3.0.0</smallrye-reactive-types-converter.version>
         <smallrye-mutiny-vertx-binding.version>3.2.0</smallrye-mutiny-vertx-binding.version>
-        <smallrye-reactive-messaging.version>4.3.0</smallrye-reactive-messaging.version>
+        <smallrye-reactive-messaging.version>4.4.0</smallrye-reactive-messaging.version>
         <smallrye-stork.version>1.4.1</smallrye-stork.version>
         <jakarta.activation.version>2.1.1</jakarta.activation.version>
         <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>

diff --git a/...eployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java b/...eployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java
@@ -26,7 +26,7 @@ void testDevMode() {
         //and the hot replacement stuff is not messing things up
         RestAssured.when().get("/hello").then()
                 .statusCode(200)
-                .body(is("HTTP GET"));
+                .body(is("GET"));
 
         RestAssured.when().get("/tracer").then()
                 .statusCode(200)

diff --git a/...ent/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDILegacyTest.java b/...ent/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDILegacyTest.java
@@ -57,7 +57,7 @@ void telemetry() {
         List<SpanData> spans = spanExporter.getFinishedSpanItems(2);
 
         SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
-        assertEquals("/hello", server.getName());
+        assertEquals("GET /hello", server.getName());
         assertEquals(SERVER, server.getKind());
         // verify that OpenTelemetryServerFilter took place
         assertStringAttribute(server, SemanticAttributes.CODE_NAMESPACE,
@@ -81,7 +81,7 @@ void withSpan() {
         List<SpanData> spans = spanExporter.getFinishedSpanItems(3);
 
         final SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
-        assertEquals("/hello/withSpan", server.getName());
+        assertEquals("GET /hello/withSpan", server.getName());
 
         final SpanData internalFromBean = getSpanByKindAndParentId(spans, INTERNAL, server.getSpanId());
         assertEquals("withSpan", internalFromBean.getName());

diff --git a/...eployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDITest.java b/...eployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDITest.java
@@ -57,7 +57,7 @@ void telemetry() {
         List<SpanData> spans = spanExporter.getFinishedSpanItems(2);
 
         final SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
-        assertEquals("/hello", server.getName());
+        assertEquals("GET /hello", server.getName());
         // verify that OpenTelemetryServerFilter took place
         assertStringAttribute(server, SemanticAttributes.CODE_NAMESPACE,
                 "io.quarkus.opentelemetry.deployment.OpenTelemetryHttpCDITest$HelloResource");
@@ -79,7 +79,7 @@ void withSpan() {
         List<SpanData> spans = spanExporter.getFinishedSpanItems(3);
 
         final SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
-        assertEquals("/hello/withSpan", server.getName());
+        assertEquals("GET /hello/withSpan", server.getName());
 
         final SpanData withSpan = getSpanByKindAndParentId(spans, INTERNAL, server.getSpanId());
         assertEquals("withSpan", withSpan.getName());

diff --git a/...ry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryMDCTest.java b/...ry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryMDCTest.java
@@ -65,7 +65,7 @@ void vertx() {
         List<MdcEntry> expectedMdcEntries = getExpectedMDCEntries(spans);
 
         final SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
-        assertEquals("/hello", server.getName());
+        assertEquals("GET /hello", server.getName());
 
         final SpanData programmatic = getSpanByKindAndParentId(spans, INTERNAL, server.getSpanId());
         assertEquals("something", programmatic.getName());

diff --git a/...ployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java b/...ployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java
@@ -45,7 +45,7 @@ void resource() {
         List<SpanData> spans = spanExporter.getFinishedSpanItems(1);
 
         final SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
-        assertEquals("/hello", server.getName());
+        assertEquals("GET /hello", server.getName());
         assertEquals("authservice", server.getResource().getAttribute(AttributeKey.stringKey("service.name")));
         assertEquals(config.getRawValue("quarkus.uuid"),
                 server.getResource().getAttribute(AttributeKey.stringKey("service.instance.id")));

diff --git a/...java/io/quarkus/opentelemetry/deployment/instrumentation/RestClientOpenTelemetryTest.java b/...java/io/quarkus/opentelemetry/deployment/instrumentation/RestClientOpenTelemetryTest.java
@@ -63,13 +63,13 @@ void client() {
         List<SpanData> spans = spanExporter.getFinishedSpanItems(2);
 
         SpanData client = getSpanByKindAndParentId(spans, CLIENT, "0000000000000000");
-        assertEquals("HTTP GET", client.getName());
+        assertEquals("GET", client.getName());
         assertEquals(HTTP_OK, client.getAttributes().get(HTTP_STATUS_CODE));
         assertEquals(HttpMethod.GET, client.getAttributes().get(HTTP_METHOD));
         assertEquals(uri.toString() + "hello", client.getAttributes().get(HTTP_URL));
 
         SpanData server = getSpanByKindAndParentId(spans, SERVER, client.getSpanId());
-        assertEquals("/hello", server.getName());
+        assertEquals("GET /hello", server.getName());
         assertEquals(HTTP_OK, server.getAttributes().get(HTTP_STATUS_CODE));
         assertEquals(HttpMethod.GET, server.getAttributes().get(HTTP_METHOD));
         assertEquals("/hello", server.getAttributes().get(HTTP_ROUTE));
@@ -88,7 +88,7 @@ void spanNameWithoutQueryString() {
 
         SpanData client = getSpanByKindAndParentId(spans, CLIENT, "0000000000000000");
         assertEquals(CLIENT, client.getKind());
-        assertEquals("HTTP GET", client.getName());
+        assertEquals("GET", client.getName());
         assertEquals(HTTP_OK, client.getAttributes().get(HTTP_STATUS_CODE));
         assertEquals(HttpMethod.GET, client.getAttributes().get(HTTP_METHOD));
         assertEquals(uri.toString() + "hello?query=1", client.getAttributes().get(HTTP_URL));
@@ -107,7 +107,7 @@ void urlWithoutAuthentication() {
 
         SpanData client = getSpanByKindAndParentId(spans, CLIENT, "0000000000000000");
         assertEquals(CLIENT, client.getKind());
-        assertEquals("HTTP GET", client.getName());
+        assertEquals("GET", client.getName());
         assertEquals(HTTP_OK, client.getAttributes().get(HTTP_STATUS_CODE));
         assertEquals(HttpMethod.GET, client.getAttributes().get(HTTP_METHOD));
         assertEquals(uri.toString() + "hello?query=1", client.getAttributes().get(HTTP_URL));
@@ -124,14 +124,14 @@ void path() {
 
         SpanData client = getSpanByKindAndParentId(spans, CLIENT, "0000000000000000");
         assertEquals(CLIENT, client.getKind());
-        assertEquals("HTTP GET", client.getName());
+        assertEquals("GET", client.getName());
         assertEquals(HTTP_OK, client.getAttributes().get(HTTP_STATUS_CODE));
         assertEquals(HttpMethod.GET, client.getAttributes().get(HTTP_METHOD));
         assertEquals(uri.toString() + "hello/another", client.getAttributes().get(HTTP_URL));
 
         SpanData server = getSpanByKindAndParentId(spans, SERVER, client.getSpanId());
         assertEquals(SERVER, server.getKind());
-        assertEquals("/hello/{path}", server.getName());
+        assertEquals("GET /hello/{path}", server.getName());
         assertEquals(HTTP_OK, server.getAttributes().get(HTTP_STATUS_CODE));
         assertEquals(HttpMethod.GET, server.getAttributes().get(HTTP_METHOD));
         assertEquals("/hello/{path}", server.getAttributes().get(HTTP_ROUTE));

diff --git a/...ava/io/quarkus/opentelemetry/deployment/instrumentation/VertxClientOpenTelemetryTest.java b/...ava/io/quarkus/opentelemetry/deployment/instrumentation/VertxClientOpenTelemetryTest.java
@@ -69,14 +69,14 @@ void client() throws Exception {
         List<SpanData> spans = spanExporter.getFinishedSpanItems(2);
 
         SpanData client = getSpanByKindAndParentId(spans, CLIENT, "0000000000000000");
-        assertEquals("HTTP GET", client.getName());
+        assertEquals("GET", client.getName());
         assertEquals(HTTP_OK, client.getAttributes().get(HTTP_STATUS_CODE));
         assertEquals(HttpMethod.GET, client.getAttributes().get(HTTP_METHOD));
         assertEquals(uri.toString() + "hello", client.getAttributes().get(HTTP_URL));
 
         SpanData server = getSpanByKindAndParentId(spans, SERVER, client.getSpanId());
         assertEquals(SERVER, server.getKind());
-        assertEquals("/hello", server.getName());
+        assertEquals("GET /hello", server.getName());
         assertEquals(HTTP_OK, server.getAttributes().get(HTTP_STATUS_CODE));
         assertEquals(HttpMethod.GET, server.getAttributes().get(HTTP_METHOD));
         assertEquals("/hello", server.getAttributes().get(HTTP_ROUTE));
@@ -101,14 +101,14 @@ void path() throws Exception {
 
         SpanData client = getSpanByKindAndParentId(spans, CLIENT, "0000000000000000");
         assertEquals(CLIENT, client.getKind());
-        assertEquals("HTTP GET", client.getName());
+        assertEquals("GET", client.getName());
         assertEquals(HTTP_OK, client.getAttributes().get(HTTP_STATUS_CODE));
         assertEquals(HttpMethod.GET, client.getAttributes().get(HTTP_METHOD));
         assertEquals(uri.toString() + "hello/naruto", client.getAttributes().get(HTTP_URL));
 
         SpanData server = getSpanByKindAndParentId(spans, SERVER, client.getSpanId());
         assertEquals(SERVER, server.getKind());
-        assertEquals("/hello/:name", server.getName());
+        assertEquals("GET /hello/:name", server.getName());
         assertEquals(HTTP_OK, server.getAttributes().get(HTTP_STATUS_CODE));
         assertEquals(HttpMethod.GET, server.getAttributes().get(HTTP_METHOD));
         assertEquals("/hello/:name", server.getAttributes().get(HTTP_ROUTE));

diff --git a/...test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryTest.java b/...test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryTest.java
@@ -107,7 +107,7 @@ void spanNameWithoutQueryString() {
         List<SpanData> spans = spanExporter.getFinishedSpanItems(2);
 
         final SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
-        assertEquals("/tracer", server.getName());
+        assertEquals("GET /tracer", server.getName());
         assertEquals(HTTP_OK, server.getAttributes().get(HTTP_STATUS_CODE));
         assertEquals("1.1", server.getAttributes().get(HTTP_FLAVOR));
         assertEquals("/tracer?id=1", server.getAttributes().get(HTTP_TARGET));
@@ -134,7 +134,7 @@ void spanPath() {
         List<SpanData> spans = spanExporter.getFinishedSpanItems(1);
         assertEquals(1, spans.size());
 
-        assertEquals("/hello/:name", spans.get(0).getName());
+        assertEquals("GET /hello/:name", spans.get(0).getName());
         assertEquals(HTTP_OK, spans.get(0).getAttributes().get(HTTP_STATUS_CODE));
         assertEquals(GET.toString(), spans.get(0).getAttributes().get(HTTP_METHOD));
         assertEquals("/hello/:name", spans.get(0).getAttributes().get(HTTP_ROUTE));
@@ -147,7 +147,7 @@ void notFound() {
         List<SpanData> spans = spanExporter.getFinishedSpanItems(1);
         assertEquals(1, spans.size());
 
-        assertEquals("/*", spans.get(0).getName());
+        assertEquals("GET /*", spans.get(0).getName());
         assertEquals("/*", spans.get(0).getAttributes().get(HTTP_ROUTE));
         assertEquals(HTTP_NOT_FOUND, spans.get(0).getAttributes().get(HTTP_STATUS_CODE));
     }
@@ -162,7 +162,7 @@ void notFoundPath() {
         List<SpanData> spans = spanExporter.getFinishedSpanItems(1);
         assertEquals(1, spans.size());
 
-        assertEquals("/hello/:name", spans.get(0).getName());
+        assertEquals("GET /hello/:name", spans.get(0).getName());
         assertEquals(HTTP_NOT_FOUND, spans.get(0).getAttributes().get(HTTP_STATUS_CODE));
         assertEquals(GET.toString(), spans.get(0).getAttributes().get(HTTP_METHOD));
         assertEquals("/hello/:name", spans.get(0).getAttributes().get(HTTP_ROUTE));

diff --git a/...va/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcAttributesGetter.java b/...va/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcAttributesGetter.java
@@ -6,17 +6,17 @@ enum GrpcAttributesGetter implements RpcAttributesGetter<GrpcRequest> {
     INSTANCE;
 
     @Override
-    public String system(final GrpcRequest grpcRequest) {
+    public String getSystem(final GrpcRequest grpcRequest) {
         return "grpc";
     }
 
     @Override
-    public String service(final GrpcRequest grpcRequest) {
+    public String getService(final GrpcRequest grpcRequest) {
         return grpcRequest.getMethodDescriptor().getServiceName();
     }
 
     @Override
-    public String method(final GrpcRequest grpcRequest) {
+    public String getMethod(final GrpcRequest grpcRequest) {
         return grpcRequest.getMethodDescriptor().getBareMethodName();
     }
 }
diff --git a/...arkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcTracingServerInterceptor.java b/...arkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcTracingServerInterceptor.java
@@ -66,17 +66,17 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
 
     private static class GrpcServerNetServerAttributesGetter extends InetSocketAddressNetServerAttributesGetter<GrpcRequest> {
         @Override
-        public String transport(final GrpcRequest grpcRequest) {
+        public String getTransport(final GrpcRequest grpcRequest) {
             return SemanticAttributes.NetTransportValues.IP_TCP;
         }
 
         @Override
-        public String hostName(GrpcRequest grpcRequest) {
+        public String getHostName(GrpcRequest grpcRequest) {
             return null;
         }
 
         @Override
-        public Integer hostPort(GrpcRequest grpcRequest) {
+        public Integer getHostPort(GrpcRequest grpcRequest) {
             return null;
         }
 

diff --git a/...us/opentelemetry/runtime/tracing/intrumentation/restclient/OpenTelemetryClientFilter.java b/...us/opentelemetry/runtime/tracing/intrumentation/restclient/OpenTelemetryClientFilter.java
@@ -143,7 +143,7 @@ private static class ClientAttributesExtractor
             implements HttpClientAttributesGetter<ClientRequestContext, ClientResponseContext> {
 
         @Override
-        public String url(final ClientRequestContext request) {
+        public String getUrl(final ClientRequestContext request) {
             URI uri = request.getUri();
             if (uri.getUserInfo() != null) {
                 return UriBuilder.fromUri(uri).userInfo(null).build().toString();
@@ -152,28 +152,28 @@ public String url(final ClientRequestContext request) {
         }
 
         @Override
-        public String flavor(final ClientRequestContext request, final ClientResponseContext response) {
+        public String getFlavor(final ClientRequestContext request, final ClientResponseContext response) {
             return null;
         }
 
         @Override
-        public String method(final ClientRequestContext request) {
+        public String getMethod(final ClientRequestContext request) {
             return request.getMethod();
         }
 
         @Override
-        public List<String> requestHeader(final ClientRequestContext request, final String name) {
+        public List<String> getRequestHeader(final ClientRequestContext request, final String name) {
             return request.getStringHeaders().getOrDefault(name, emptyList());
         }
 
         @Override
-        public Integer statusCode(ClientRequestContext clientRequestContext,
+        public Integer getStatusCode(ClientRequestContext clientRequestContext,
                 ClientResponseContext clientResponseContext, Throwable error) {
             return clientResponseContext.getStatus();
         }
 
         @Override
-        public List<String> responseHeader(final ClientRequestContext request, final ClientResponseContext response,
+        public List<String> getResponseHeader(final ClientRequestContext request, final ClientResponseContext response,
                 final String name) {
             return response.getHeaders().getOrDefault(name, emptyList());
         }

diff --git a/...s/opentelemetry/runtime/tracing/intrumentation/vertx/EventBusInstrumenterVertxTracer.java b/...s/opentelemetry/runtime/tracing/intrumentation/vertx/EventBusInstrumenterVertxTracer.java
@@ -90,57 +90,57 @@ private enum EventBusAttributesGetter implements MessagingAttributesGetter<Messa
         INSTANCE;
 
         @Override
-        public String system(final Message message) {
+        public String getSystem(final Message message) {
             return "vert.x";
         }
 
         @Override
-        public String destinationKind(final Message message) {
+        public String getDestinationKind(final Message message) {
             return message.isSend() ? "queue" : "topic";
         }
 
         @Override
-        public String destination(final Message message) {
+        public String getDestination(final Message message) {
             return message.address();
         }
 
         @Override
-        public boolean temporaryDestination(final Message message) {
+        public boolean isTemporaryDestination(final Message message) {
             return false;
         }
 
         @Override
-        public String protocol(final Message message) {
+        public String getProtocol(final Message message) {
             return null;
         }
 
         @Override
-        public String protocolVersion(final Message message) {
+        public String getProtocolVersion(final Message message) {
             return "4.0";
         }
 
         @Override
-        public String url(final Message message) {
+        public String getUrl(final Message message) {
             return null;
         }
 
         @Override
-        public String conversationId(final Message message) {
+        public String getConversationId(final Message message) {
             return message.replyAddress();
         }
 
         @Override
-        public Long messagePayloadSize(final Message message) {
+        public Long getMessagePayloadSize(final Message message) {
             return null;
         }
 
         @Override
-        public Long messagePayloadCompressedSize(final Message message) {
+        public Long getMessagePayloadCompressedSize(final Message message) {
             return null;
         }
 
         @Override
-        public String messageId(final Message message, final Message message2) {
+        public String getMessageId(final Message message, final Message message2) {
             return null;
         }
     }