diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index d41300b3b26d83..80a02d2040b68e 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -36,10 +36,10 @@
0.2.4
0.1.15
0.1.5
- 1.22.0
- 1.22.0-alpha
- 1.22.0-alpha
- 1.22.0
+ 1.23.1
+ 1.23.0-alpha
+ 1.23.0-alpha
+ 1.23.0
1.8.1
5.0.1.Final
1.10.4
@@ -67,7 +67,7 @@
1.0.13
3.0.0
3.2.0
- 4.3.0
+ 4.4.0
1.4.1
2.1.1
2.1.1
diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java
index 4f0355ab44a566..d7462d2d846594 100644
--- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java
+++ b/extensions/opentelemetry/deployment/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/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDILegacyTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDILegacyTest.java
index 19d118f7f7625a..2f0f5e675f706c 100644
--- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDILegacyTest.java
+++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDILegacyTest.java
@@ -57,7 +57,7 @@ void telemetry() {
List 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 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/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDITest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDITest.java
index b1cc666d2f2d2c..906623827b50b8 100644
--- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDITest.java
+++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDITest.java
@@ -57,7 +57,7 @@ void telemetry() {
List 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 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/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryMDCTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryMDCTest.java
index 59961d68ceda0d..42f39ba9dabafb 100644
--- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryMDCTest.java
+++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryMDCTest.java
@@ -65,7 +65,7 @@ void vertx() {
List 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/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java
index 9a125d705d7798..eee793a01ba4a4 100644
--- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java
+++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java
@@ -45,7 +45,7 @@ void resource() {
List 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/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/RestClientOpenTelemetryTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/RestClientOpenTelemetryTest.java
index f50a7838ec43e9..4344f340923cb3 100644
--- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/RestClientOpenTelemetryTest.java
+++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/RestClientOpenTelemetryTest.java
@@ -63,13 +63,13 @@ void client() {
List 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/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxClientOpenTelemetryTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxClientOpenTelemetryTest.java
index f5d60a2a3ff9eb..584b86ec98ac4d 100644
--- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxClientOpenTelemetryTest.java
+++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxClientOpenTelemetryTest.java
@@ -69,14 +69,14 @@ void client() throws Exception {
List 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/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryTest.java
index c33858a084bf13..805daa25c7b44f 100644
--- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryTest.java
+++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryTest.java
@@ -107,7 +107,7 @@ void spanNameWithoutQueryString() {
List 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 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 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 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/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcAttributesGetter.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcAttributesGetter.java
index ef3a97bf5f7adf..9cc912eca23d3a 100644
--- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcAttributesGetter.java
+++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcAttributesGetter.java
@@ -6,17 +6,17 @@ enum GrpcAttributesGetter implements RpcAttributesGetter {
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/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
index 584589a31cc495..4019a46efd347e 100644
--- 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
@@ -66,17 +66,17 @@ public ServerCall.Listener interceptCall(
private static class GrpcServerNetServerAttributesGetter extends InetSocketAddressNetServerAttributesGetter {
@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/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
index c470f5a5d9cf0f..e05ac4c529b1d1 100644
--- 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
@@ -143,7 +143,7 @@ private static class ClientAttributesExtractor
implements HttpClientAttributesGetter {
@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 requestHeader(final ClientRequestContext request, final String name) {
+ public List 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 responseHeader(final ClientRequestContext request, final ClientResponseContext response,
+ public List getResponseHeader(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/EventBusInstrumenterVertxTracer.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/EventBusInstrumenterVertxTracer.java
index 538f5de947e73b..2354b36edd8e02 100644
--- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/EventBusInstrumenterVertxTracer.java
+++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/EventBusInstrumenterVertxTracer.java
@@ -90,57 +90,57 @@ private enum EventBusAttributesGetter implements MessagingAttributesGetter getServerInstrumenter(fin
.addAttributesExtractor(
HttpServerAttributesExtractor.create(serverAttributesExtractor, new HttpServerNetAttributesGetter()))
.addAttributesExtractor(new AdditionalServerAttributesExtractor())
- .addContextCustomizer(HttpRouteHolder.get())
+ .addContextCustomizer(HttpRouteHolder.create(serverAttributesExtractor))
.buildServerInstrumenter(new HttpRequestTextMapGetter());
}
@@ -166,7 +166,7 @@ public String get(final io.opentelemetry.context.Context context, final HttpRequ
private static class ServerAttributesExtractor implements HttpServerAttributesGetter {
@Override
- public String flavor(final HttpRequest request) {
+ public String getFlavor(final HttpRequest request) {
if (request instanceof HttpServerRequest) {
HttpVersion version = ((HttpServerRequest) request).version();
if (version != null) {
@@ -188,17 +188,17 @@ public String flavor(final HttpRequest request) {
}
@Override
- public String target(final HttpRequest request) {
+ public String getTarget(final HttpRequest request) {
return request.uri();
}
@Override
- public String route(final HttpRequest request) {
+ public String getRoute(final HttpRequest request) {
return null;
}
@Override
- public String scheme(final HttpRequest request) {
+ public String getScheme(final HttpRequest request) {
if (request instanceof HttpServerRequest) {
return ((HttpServerRequest) request).scheme();
}
@@ -206,22 +206,22 @@ public String scheme(final HttpRequest request) {
}
@Override
- public String method(final HttpRequest request) {
+ public String getMethod(final HttpRequest request) {
return request.method().name();
}
@Override
- public List requestHeader(final HttpRequest request, final String name) {
+ public List getRequestHeader(final HttpRequest request, final String name) {
return request.headers().getAll(name);
}
@Override
- public Integer statusCode(HttpRequest httpRequest, HttpResponse httpResponse, Throwable error) {
+ public Integer getStatusCode(HttpRequest httpRequest, HttpResponse httpResponse, Throwable error) {
return httpResponse != null ? httpResponse.statusCode() : null;
}
@Override
- public List responseHeader(final HttpRequest request, final HttpResponse response, final String name) {
+ public List getResponseHeader(final HttpRequest request, final HttpResponse response, final String name) {
return response != null ? response.headers().getAll(name) : Collections.emptyList();
}
@@ -268,13 +268,13 @@ public void onEnd(
private static class HttpServerNetAttributesGetter implements NetServerAttributesGetter {
@Nullable
@Override
- public String transport(HttpRequest httpRequest) {
+ public String getTransport(HttpRequest httpRequest) {
return null;
}
@Nullable
@Override
- public String hostName(HttpRequest httpRequest) {
+ public String getHostName(HttpRequest httpRequest) {
if (httpRequest instanceof HttpServerRequest) {
return VertxUtil.extractRemoteHostname((HttpServerRequest) httpRequest);
}
@@ -283,7 +283,7 @@ public String hostName(HttpRequest httpRequest) {
@Nullable
@Override
- public Integer hostPort(HttpRequest httpRequest) {
+ public Integer getHostPort(HttpRequest httpRequest) {
if (httpRequest instanceof HttpServerRequest) {
Long remoteHostPort = VertxUtil.extractRemoteHostPort((HttpServerRequest) httpRequest);
if (remoteHostPort == null) {
@@ -313,32 +313,32 @@ public String get(final HttpRequest carrier, final String key) {
private static class ClientAttributesExtractor implements HttpClientAttributesGetter {
@Override
- public String url(final HttpRequest request) {
+ public String getUrl(final HttpRequest request) {
return request.absoluteURI();
}
@Override
- public String flavor(final HttpRequest request, final HttpResponse response) {
+ public String getFlavor(final HttpRequest request, final HttpResponse response) {
return null;
}
@Override
- public String method(final HttpRequest request) {
+ public String getMethod(final HttpRequest request) {
return request.method().name();
}
@Override
- public List requestHeader(final HttpRequest request, final String name) {
+ public List getRequestHeader(final HttpRequest request, final String name) {
return request.headers().getAll(name);
}
@Override
- public Integer statusCode(HttpRequest httpRequest, HttpResponse httpResponse, Throwable error) {
+ public Integer getStatusCode(HttpRequest httpRequest, HttpResponse httpResponse, Throwable error) {
return httpResponse.statusCode();
}
@Override
- public List responseHeader(final HttpRequest request, final HttpResponse response, final String name) {
+ public List getResponseHeader(final HttpRequest request, final HttpResponse response, final String name) {
return response.headers().getAll(name);
}
}
diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/SqlClientInstrumenterVertxTracer.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/SqlClientInstrumenterVertxTracer.java
index fae488888b2dca..a9f28ebaf7ed29 100644
--- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/SqlClientInstrumenterVertxTracer.java
+++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/SqlClientInstrumenterVertxTracer.java
@@ -120,27 +120,27 @@ static class SqlClientAttributesGetter implements
io.opentelemetry.instrumentation.api.instrumenter.db.SqlClientAttributesGetter {
@Override
- public String rawStatement(final QueryTrace queryTrace) {
+ public String getRawStatement(final QueryTrace queryTrace) {
return queryTrace.rawStatement();
}
@Override
- public String system(final QueryTrace queryTrace) {
+ public String getSystem(final QueryTrace queryTrace) {
return queryTrace.system();
}
@Override
- public String user(final QueryTrace queryTrace) {
+ public String getUser(final QueryTrace queryTrace) {
return queryTrace.user();
}
@Override
- public String name(final QueryTrace queryTrace) {
+ public String getName(final QueryTrace queryTrace) {
return null;
}
@Override
- public String connectionString(final QueryTrace queryTrace) {
+ public String getConnectionString(final QueryTrace queryTrace) {
return queryTrace.connectionString();
}
}
diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/VertxUtil.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/VertxUtil.java
index 7563a394a4cd65..ef0f120c2fab54 100644
--- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/VertxUtil.java
+++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/VertxUtil.java
@@ -86,7 +86,7 @@ public static Long extractRemoteHostPort(HttpServerRequest httpRequest) {
}
}
if (httpRequest.remoteAddress() != null) {
- Integer.toUnsignedLong(httpRequest.remoteAddress().port());
+ return Integer.toUnsignedLong(httpRequest.remoteAddress().port());
}
return null;
}
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
index 428a1e2c080525..de096dab07bd33 100644
--- 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
@@ -61,7 +61,7 @@ void grpc() {
// First span is the rest server call. It does not have a parent span.
Map rest = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
assertEquals(SpanKind.SERVER.toString(), rest.get("kind"));
- assertEquals("/grpc/{name}", rest.get("name"));
+ assertEquals("GET /grpc/{name}", rest.get("name"));
assertEquals("/grpc/{name}", getAttributes(rest).get(HTTP_ROUTE.getKey()));
assertEquals("/grpc/Naruto", getAttributes(rest).get(HTTP_TARGET.getKey()));
assertEquals(HTTP_OK, getAttributes(rest).get(HTTP_STATUS_CODE.getKey()));
diff --git a/integration-tests/opentelemetry-reactive-messaging/src/test/java/io/quarkus/it/opentelemetry/OpenTelemetryTestCase.java b/integration-tests/opentelemetry-reactive-messaging/src/test/java/io/quarkus/it/opentelemetry/OpenTelemetryTestCase.java
index eef2b75cb6daf8..fc4e41c2eb30f3 100644
--- a/integration-tests/opentelemetry-reactive-messaging/src/test/java/io/quarkus/it/opentelemetry/OpenTelemetryTestCase.java
+++ b/integration-tests/opentelemetry-reactive-messaging/src/test/java/io/quarkus/it/opentelemetry/OpenTelemetryTestCase.java
@@ -110,7 +110,7 @@ private void verifyServer(Map spanData, Map pare
Assertions.assertNotNull(spanData.get("spanId"));
verifyResource(spanData, parentSpanData);
- Assertions.assertEquals("/direct", spanData.get("name"));
+ Assertions.assertEquals("GET /direct", spanData.get("name"));
Assertions.assertEquals(SpanKind.SERVER.toString(), spanData.get("kind"));
Assertions.assertTrue((Boolean) spanData.get("ended"));
Assertions.assertFalse((Boolean) spanData.get("parent_remote"));
diff --git a/integration-tests/opentelemetry-reactive/src/test/java/io/quarkus/it/opentelemetry/reactive/OpenTelemetryReactiveClientTest.java b/integration-tests/opentelemetry-reactive/src/test/java/io/quarkus/it/opentelemetry/reactive/OpenTelemetryReactiveClientTest.java
index aa6178651c306f..affc16ea67bad1 100644
--- a/integration-tests/opentelemetry-reactive/src/test/java/io/quarkus/it/opentelemetry/reactive/OpenTelemetryReactiveClientTest.java
+++ b/integration-tests/opentelemetry-reactive/src/test/java/io/quarkus/it/opentelemetry/reactive/OpenTelemetryReactiveClientTest.java
@@ -56,7 +56,7 @@ void get() {
// First span is the client call. It does not have a parent span.
Map client = getSpanByKindAndParentId(spans, CLIENT, "0000000000000000");
assertEquals(SpanKind.CLIENT.toString(), client.get("kind"));
- assertEquals("HTTP GET", client.get("name"));
+ assertEquals("GET", client.get("name"));
assertEquals(HTTP_OK, ((Map) client.get("attributes")).get(HTTP_STATUS_CODE.getKey()));
assertEquals(HttpMethod.GET.name(), ((Map) client.get("attributes")).get(HTTP_METHOD.getKey()));
@@ -64,7 +64,7 @@ void get() {
Map server = getSpanByKindAndParentId(spans, SERVER, client.get("spanId"));
assertEquals(SpanKind.SERVER.toString(), server.get("kind"));
assertEquals(server.get("parentSpanId"), client.get("spanId"));
- assertEquals("/reactive", server.get("name"));
+ assertEquals("GET /reactive", server.get("name"));
assertEquals("/reactive", ((Map) server.get("attributes")).get(HTTP_ROUTE.getKey()));
assertEquals("/reactive?name=Naruto", ((Map) server.get("attributes")).get(HTTP_TARGET.getKey()));
assertEquals(HTTP_OK, ((Map) server.get("attributes")).get(HTTP_STATUS_CODE.getKey()));
@@ -91,7 +91,7 @@ void post() {
// First span is the client call. It does not have a parent span.
Map client = getSpanByKindAndParentId(spans, CLIENT, "0000000000000000");
assertEquals(SpanKind.CLIENT.toString(), client.get("kind"));
- assertEquals("HTTP POST", client.get("name"));
+ assertEquals("POST", client.get("name"));
assertEquals(HTTP_OK, ((Map) client.get("attributes")).get(HTTP_STATUS_CODE.getKey()));
assertEquals(HttpMethod.POST.name(), ((Map) client.get("attributes")).get(HTTP_METHOD.getKey()));
@@ -99,7 +99,7 @@ void post() {
Map server = getSpanByKindAndParentId(spans, SERVER, client.get("spanId"));
assertEquals(SpanKind.SERVER.toString(), server.get("kind"));
assertEquals(server.get("parentSpanId"), client.get("spanId"));
- assertEquals("/reactive", server.get("name"));
+ assertEquals("POST /reactive", server.get("name"));
assertEquals("/reactive", ((Map) server.get("attributes")).get(HTTP_ROUTE.getKey()));
assertEquals("/reactive", ((Map) server.get("attributes")).get(HTTP_TARGET.getKey()));
assertEquals(HTTP_OK, ((Map) server.get("attributes")).get(HTTP_STATUS_CODE.getKey()));
diff --git a/integration-tests/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/HelloRouterTest.java b/integration-tests/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/HelloRouterTest.java
index 10d9e7c1cf33a7..1217d06b3decde 100644
--- a/integration-tests/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/HelloRouterTest.java
+++ b/integration-tests/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/HelloRouterTest.java
@@ -8,8 +8,8 @@
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HTTP_ROUTE;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HTTP_STATUS_CODE;
-import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION_KIND;
+import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION_NAME;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_OPERATION;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_SYSTEM;
import static io.restassured.RestAssured.get;
@@ -59,7 +59,7 @@ void span() {
assertEquals(1, spans.size());
assertEquals(SERVER.toString(), spans.get(0).get("kind"));
- assertEquals("/hello", spans.get(0).get("name"));
+ assertEquals("GET /hello", spans.get(0).get("name"));
assertEquals(HTTP_OK, ((Map) spans.get(0).get("attributes")).get(HTTP_STATUS_CODE.toString()));
assertEquals(HttpMethod.GET.toString(), ((Map) spans.get(0).get("attributes")).get(HTTP_METHOD.toString()));
assertEquals("/hello", ((Map) spans.get(0).get("attributes")).get(HTTP_ROUTE.toString()));
@@ -78,7 +78,7 @@ void spanPath() {
assertEquals(1, spans.size());
assertEquals(SERVER.toString(), spans.get(0).get("kind"));
- assertEquals("/hello/:name", spans.get(0).get("name"));
+ assertEquals("GET /hello/:name", spans.get(0).get("name"));
assertEquals(HTTP_OK, ((Map) spans.get(0).get("attributes")).get(HTTP_STATUS_CODE.toString()));
assertEquals(HttpMethod.GET.toString(), ((Map) spans.get(0).get("attributes")).get(HTTP_METHOD.toString()));
assertEquals("/hello/:name", ((Map) spans.get(0).get("attributes")).get(HTTP_ROUTE.toString()));
@@ -99,7 +99,7 @@ void post() {
assertEquals(1, spans.size());
assertEquals(SERVER.toString(), spans.get(0).get("kind"));
- assertEquals("/hello", spans.get(0).get("name"));
+ assertEquals("POST /hello", spans.get(0).get("name"));
assertEquals(HTTP_OK, ((Map) spans.get(0).get("attributes")).get(HTTP_STATUS_CODE.toString()));
assertEquals(HttpMethod.POST.toString(), ((Map) spans.get(0).get("attributes")).get(HTTP_METHOD.toString()));
assertEquals("/hello", ((Map) spans.get(0).get("attributes")).get(HTTP_ROUTE.toString()));
@@ -136,14 +136,14 @@ void bus() {
assertEquals(PRODUCER.toString(), producer.get("kind"));
assertEquals("vert.x", ((Map) producer.get("attributes")).get(MESSAGING_SYSTEM.toString()));
assertEquals("topic", ((Map) producer.get("attributes")).get(MESSAGING_DESTINATION_KIND.toString()));
- assertEquals("bus", ((Map) producer.get("attributes")).get(MESSAGING_DESTINATION.toString()));
+ assertEquals("bus", ((Map) producer.get("attributes")).get(MESSAGING_DESTINATION_NAME.toString()));
assertEquals(producer.get("parentSpanId"), server.get("spanId"));
Map consumer = getSpanByKindAndParentId(spans, CONSUMER, producer.get("spanId"));
assertEquals(CONSUMER.toString(), consumer.get("kind"));
assertEquals("vert.x", ((Map) consumer.get("attributes")).get(MESSAGING_SYSTEM.toString()));
assertEquals("topic", ((Map) consumer.get("attributes")).get(MESSAGING_DESTINATION_KIND.toString()));
- assertEquals("bus", ((Map) consumer.get("attributes")).get(MESSAGING_DESTINATION.toString()));
+ assertEquals("bus", ((Map) consumer.get("attributes")).get(MESSAGING_DESTINATION_NAME.toString()));
assertEquals(MessageOperation.RECEIVE.toString().toLowerCase(Locale.ROOT),
((Map) consumer.get("attributes")).get(MESSAGING_OPERATION.toString()));
assertEquals(consumer.get("parentSpanId"), producer.get("spanId"));
diff --git a/integration-tests/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/SqlClientTest.java b/integration-tests/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/SqlClientTest.java
index 4717f20f7303da..a0ad1ca5ca333f 100644
--- a/integration-tests/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/SqlClientTest.java
+++ b/integration-tests/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/SqlClientTest.java
@@ -93,7 +93,7 @@ void sqlClient() {
assertEquals(spans.get(0).getTraceId(), spans.get(1).getTraceId());
assertEquals(spans.get(0).getSpanId(), spans.get(1).getParentSpanId());
- assertEquals("/sqlClient", spans.get(0).getName());
+ assertEquals("GET /sqlClient", spans.get(0).getName());
assertEquals(HTTP_OK, spans.get(0).getAttributes().get(HTTP_STATUS_CODE));
assertEquals("SELECT USERS", spans.get(1).getName());
diff --git a/integration-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/OpenTelemetryTest.java b/integration-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/OpenTelemetryTest.java
index 6246a160480723..0dc21f7f5cd307 100644
--- a/integration-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/OpenTelemetryTest.java
+++ b/integration-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/OpenTelemetryTest.java
@@ -82,7 +82,7 @@ void testResourceTracing() {
verifyResource(spanData);
- assertEquals("/direct", spanData.get("name"));
+ assertEquals("GET /direct", spanData.get("name"));
assertEquals(SERVER.toString(), spanData.get("kind"));
assertTrue((Boolean) spanData.get("ended"));
@@ -119,7 +119,7 @@ void testEmptyClientPath() {
Map server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
assertEquals(SERVER.toString(), server.get("kind"));
verifyResource(server);
- assertEquals("/nopath", server.get("name"));
+ assertEquals("GET /nopath", server.get("name"));
assertEquals(SERVER.toString(), server.get("kind"));
assertTrue((Boolean) server.get("ended"));
assertEquals(SpanId.getInvalid(), server.get("parent_spanId"));
@@ -140,7 +140,7 @@ void testEmptyClientPath() {
Map client = getSpanByKindAndParentId(spans, CLIENT, server.get("spanId"));
assertEquals(CLIENT.toString(), client.get("kind"));
verifyResource(client);
- assertEquals("HTTP GET", client.get("name"));
+ assertEquals("GET", client.get("name"));
assertEquals(SpanKind.CLIENT.toString(), client.get("kind"));
assertTrue((Boolean) client.get("ended"));
assertTrue((Boolean) client.get("parent_valid"));
@@ -153,7 +153,7 @@ void testEmptyClientPath() {
Map clientServer = getSpanByKindAndParentId(spans, SERVER, client.get("spanId"));
assertEquals(SERVER.toString(), clientServer.get("kind"));
verifyResource(clientServer);
- assertEquals("HTTP GET", clientServer.get("name"));
+ assertEquals("GET", clientServer.get("name"));
assertEquals(SERVER.toString(), clientServer.get("kind"));
assertTrue((Boolean) clientServer.get("ended"));
assertTrue((Boolean) clientServer.get("parent_valid"));
@@ -188,7 +188,7 @@ void testSlashClientPath() {
Map server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
assertEquals(SERVER.toString(), server.get("kind"));
verifyResource(server);
- assertEquals("/slashpath", server.get("name"));
+ assertEquals("GET /slashpath", server.get("name"));
assertEquals(SERVER.toString(), server.get("kind"));
assertTrue((Boolean) server.get("ended"));
assertEquals(SpanId.getInvalid(), server.get("parent_spanId"));
@@ -208,7 +208,7 @@ void testSlashClientPath() {
Map client = getSpanByKindAndParentId(spans, CLIENT, server.get("spanId"));
assertEquals(CLIENT.toString(), client.get("kind"));
- assertEquals("HTTP GET", client.get("name"));
+ assertEquals("GET", client.get("name"));
assertEquals(SpanKind.CLIENT.toString(), client.get("kind"));
assertTrue((Boolean) client.get("ended"));
assertTrue((Boolean) client.get("parent_valid"));
@@ -221,7 +221,7 @@ void testSlashClientPath() {
Map clientServer = getSpanByKindAndParentId(spans, SERVER, client.get("spanId"));
assertEquals(SERVER.toString(), clientServer.get("kind"));
verifyResource(clientServer);
- assertEquals("HTTP GET", clientServer.get("name"));
+ assertEquals("GET", clientServer.get("name"));
assertEquals(SERVER.toString(), clientServer.get("kind"));
assertTrue((Boolean) clientServer.get("ended"));
assertTrue((Boolean) clientServer.get("parent_valid"));
@@ -256,7 +256,7 @@ void testChainedResourceTracing() {
Map server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
assertEquals(SERVER.toString(), server.get("kind"));
verifyResource(server);
- assertEquals("/chained", server.get("name"));
+ assertEquals("GET /chained", server.get("name"));
assertEquals(SERVER.toString(), server.get("kind"));
assertTrue((Boolean) server.get("ended"));
assertEquals(SpanId.getInvalid(), server.get("parent_spanId"));
@@ -310,7 +310,7 @@ void testTracingWithParentHeaders() {
verifyResource(spanData);
- assertEquals("/direct", spanData.get("name"));
+ assertEquals("GET /direct", spanData.get("name"));
assertEquals(SERVER.toString(), spanData.get("kind"));
assertTrue((Boolean) spanData.get("ended"));
@@ -346,7 +346,7 @@ void testDeepPathNaming() {
verifyResource(spanData);
- assertEquals("/deep/path", spanData.get("name"));
+ assertEquals("GET /deep/path", spanData.get("name"));
assertEquals(SERVER.toString(), spanData.get("kind"));
assertTrue((Boolean) spanData.get("ended"));
@@ -382,7 +382,7 @@ void testPathParameter() {
verifyResource(spanData);
- assertEquals("/param/{paramId}", spanData.get("name"));
+ assertEquals("GET /param/{paramId}", spanData.get("name"));
assertEquals(SERVER.toString(), spanData.get("kind"));
assertTrue((Boolean) spanData.get("ended"));
@@ -419,7 +419,7 @@ void testClientTracing() {
Map server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
assertEquals(SERVER.toString(), server.get("kind"));
verifyResource(server);
- assertEquals("/client/ping/{message}", server.get("name"));
+ assertEquals("GET /client/ping/{message}", server.get("name"));
assertEquals(SERVER.toString(), server.get("kind"));
assertTrue((Boolean) server.get("ended"));
assertEquals(SpanId.getInvalid(), server.get("parent_spanId"));
@@ -438,7 +438,7 @@ void testClientTracing() {
assertNotNull(server.get("attr_http.user_agent"));
Map client = getSpanByKindAndParentId(spans, CLIENT, server.get("spanId"));
- assertEquals("HTTP GET", client.get("name"));
+ assertEquals("GET", client.get("name"));
assertEquals(SpanKind.CLIENT.toString(), client.get("kind"));
assertTrue((Boolean) client.get("ended"));
assertTrue((Boolean) client.get("parent_valid"));
@@ -450,7 +450,7 @@ void testClientTracing() {
Map clientServer = getSpanByKindAndParentId(spans, SERVER, client.get("spanId"));
assertEquals(SERVER.toString(), clientServer.get("kind"));
verifyResource(clientServer);
- assertEquals("/client/pong/{message}", clientServer.get("name"));
+ assertEquals("GET /client/pong/{message}", clientServer.get("name"));
assertEquals(SERVER.toString(), clientServer.get("kind"));
assertTrue((Boolean) clientServer.get("ended"));
assertTrue((Boolean) clientServer.get("parent_valid"));
@@ -484,7 +484,7 @@ void testAsyncClientTracing() {
Map server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
assertEquals(SERVER.toString(), server.get("kind"));
verifyResource(server);
- assertEquals("/client/async-ping/{message}", server.get("name"));
+ assertEquals("GET /client/async-ping/{message}", server.get("name"));
assertEquals(SERVER.toString(), server.get("kind"));
assertTrue((Boolean) server.get("ended"));
assertEquals(SpanId.getInvalid(), server.get("parent_spanId"));
@@ -503,7 +503,7 @@ void testAsyncClientTracing() {
assertNotNull(server.get("attr_http.user_agent"));
Map client = getSpanByKindAndParentId(spans, CLIENT, server.get("spanId"));
- assertEquals("HTTP GET", client.get("name"));
+ assertEquals("GET", client.get("name"));
assertEquals(SpanKind.CLIENT.toString(), client.get("kind"));
assertTrue((Boolean) client.get("ended"));
assertTrue((Boolean) client.get("parent_valid"));
@@ -515,7 +515,7 @@ void testAsyncClientTracing() {
Map clientServer = getSpanByKindAndParentId(spans, SERVER, client.get("spanId"));
assertEquals(SERVER.toString(), clientServer.get("kind"));
verifyResource(clientServer);
- assertEquals("/client/pong/{message}", clientServer.get("name"));
+ assertEquals("GET /client/pong/{message}", clientServer.get("name"));
assertEquals(SERVER.toString(), clientServer.get("kind"));
assertTrue((Boolean) clientServer.get("ended"));
assertTrue((Boolean) clientServer.get("parent_valid"));
@@ -548,7 +548,7 @@ void testTemplatedPathOnClass() {
verifyResource(spanData);
- assertEquals("/template/path/{value}", spanData.get("name"));
+ assertEquals("GET /template/path/{value}", spanData.get("name"));
assertEquals(SERVER.toString(), spanData.get("kind"));
assertTrue((Boolean) spanData.get("ended"));
diff --git a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/BasicTest.java b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/BasicTest.java
index bfe4f408ed506f..077448dc2fe7a0 100644
--- a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/BasicTest.java
+++ b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/BasicTest.java
@@ -131,19 +131,19 @@ void shouldCreateClientSpans() {
String serverSpanId = null;
String serverTraceId = null;
String clientSpanId = null;
-
+ // brunobat: This tests has been remade, for resilience, in another branch and will be merged in the future.
for (Map spanData : getSpans()) {
Assertions.assertNotNull(spanData);
Assertions.assertNotNull(spanData.get("spanId"));
if (spanData.get("kind").equals(SpanKind.SERVER.toString())
- && spanData.get("name").equals("/call-hello-client")) {
+ && spanData.get("name").equals("POST /call-hello-client")) {
outsideServerFound = true;
// Server Span
serverSpanId = (String) spanData.get("spanId");
serverTraceId = (String) spanData.get("traceId");
- Assertions.assertEquals("/call-hello-client", spanData.get("name"));
+ Assertions.assertEquals("POST /call-hello-client", spanData.get("name"));
Assertions.assertEquals(SpanKind.SERVER.toString(), spanData.get("kind"));
Assertions.assertTrue((Boolean) spanData.get("ended"));
@@ -160,10 +160,10 @@ void shouldCreateClientSpans() {
Assertions.assertNotNull(spanData.get("attr_http.client_ip"));
Assertions.assertNotNull(spanData.get("attr_http.user_agent"));
} else if (spanData.get("kind").equals(SpanKind.CLIENT.toString())
- && spanData.get("name").equals("HTTP POST")) {
+ && spanData.get("name").equals("POST")) {
clientFound = true;
// Client span
- Assertions.assertEquals("HTTP POST", spanData.get("name"));
+ Assertions.assertEquals("POST", spanData.get("name"));
Assertions.assertEquals(SpanKind.CLIENT.toString(), spanData.get("kind"));
Assertions.assertTrue((Boolean) spanData.get("ended"));
@@ -183,11 +183,11 @@ void shouldCreateClientSpans() {
clientSpanId = (String) spanData.get("spanId");
} else if (spanData.get("kind").equals(SpanKind.SERVER.toString())
- && spanData.get("name").equals("/hello")) {
+ && spanData.get("name").equals("POST /hello")) {
clientServerFound = true;
// Server span of client
- Assertions.assertEquals("/hello", spanData.get("name"));
+ Assertions.assertEquals("POST /hello", spanData.get("name"));
Assertions.assertEquals(SpanKind.SERVER.toString(), spanData.get("kind"));
Assertions.assertTrue((Boolean) spanData.get("ended"));
diff --git a/tcks/microprofile-opentelemetry/pom.xml b/tcks/microprofile-opentelemetry/pom.xml
index aa434bfd4852b5..bbdd787dd053ec 100644
--- a/tcks/microprofile-opentelemetry/pom.xml
+++ b/tcks/microprofile-opentelemetry/pom.xml
@@ -23,7 +23,8 @@
maven-surefire-plugin
- org.eclipse.microprofile.telemetry.tracing:microprofile-telemetry-tracing-tck
+
+