From fc1cc72bdde960eb1a898aa3c69c306bfbfe8d38 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Mon, 17 Mar 2025 14:30:53 +0200 Subject: [PATCH 1/7] Add body to http server concurrency test response --- .../junit/http/AbstractHttpServerTest.java | 15 ++++++++++++++- .../testing/junit/http/ServerEndpoint.java | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java index 8fa507bd7980..45d8d465ceef 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java @@ -403,6 +403,7 @@ void highConcurrency() throws InterruptedException { TextMapPropagator propagator = GlobalOpenTelemetry.getPropagators().getTextMapPropagator(); TextMapSetter setter = HttpRequestBuilder::header; + List responses = new ArrayList<>(); for (int i = 0; i < count; i++) { int index = i; HttpRequestBuilder request = @@ -419,10 +420,22 @@ void highConcurrency() throws InterruptedException { client .execute(request.build()) .aggregate() - .whenComplete((result, throwable) -> latch.countDown()); + .whenComplete( + (result, throwable) -> { + latch.countDown(); + if (throwable != null) { + responses.add(throwable.toString()); + } else { + responses.add(result.status().code() + " " + result.contentUtf8()); + } + }); }); } latch.await(); + assertThat(responses) + .allSatisfy( + response -> + assertThat(response).isEqualTo(endpoint.getStatus() + " " + endpoint.getBody())); assertHighConcurrency(count); } diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/ServerEndpoint.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/ServerEndpoint.java index 218eddd0c9ae..ced8475fcc05 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/ServerEndpoint.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/ServerEndpoint.java @@ -47,7 +47,7 @@ public class ServerEndpoint { public static final ServerEndpoint AUTH_ERROR = new ServerEndpoint("AUTH_ERROR", "basicsecured/endpoint", 401, null); public static final ServerEndpoint INDEXED_CHILD = - new ServerEndpoint("INDEXED_CHILD", "child", 200, ""); + new ServerEndpoint("INDEXED_CHILD", "child", 200, "success"); public static final String ID_ATTRIBUTE_NAME = "test.request.id"; public static final String ID_PARAMETER_NAME = "id"; From 125adabe24bfdc5ec792def15bdecefd82c055f7 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Mon, 17 Mar 2025 15:40:48 +0200 Subject: [PATCH 2/7] send body --- .../instrumentation/akkahttp/AkkaHttpTestAsyncWebServer.scala | 2 +- .../instrumentation/akkahttp/AkkaHttpTestSyncWebServer.scala | 2 +- .../instrumentation/akkahttp/AkkaHttpTestWebServer.scala | 2 +- .../instrumentation/jaxrs/v2_0/test/JaxRsTestResource.java | 2 +- .../instrumentation/netty/v4_0/server/Netty40ServerTest.java | 4 +++- .../instrumentation/netty/v4_1/AbstractNetty41ServerTest.java | 2 +- .../pekkohttp/v1_0/PekkoHttpTestAsyncWebServer.scala | 2 +- .../pekkohttp/v1_0/PekkoHttpTestServerSourceWebServer.scala | 2 +- .../pekkohttp/v1_0/PekkoHttpTestSyncWebServer.scala | 2 +- .../pekkohttp/v1_0/PekkoHttpTestWebServer.scala | 2 +- .../ratpack/server/AbstractRatpackHttpServerTest.java | 2 +- .../restlet/v1_1/AbstractRestletServerTest.java | 1 + .../javaagent/instrumentation/servlet/v5_0/TestServlet5.java | 3 +++ .../spring/webflux/v5_0/server/base/ServerTestController.java | 2 +- .../javaagent/instrumentation/tomcat/v10_0/AsyncServlet.java | 3 ++- .../javaagent/instrumentation/tomcat/v7_0/AsyncServlet.java | 3 ++- .../testing/junit/http/AbstractHttpServerTest.java | 2 +- 17 files changed, 23 insertions(+), 15 deletions(-) diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestAsyncWebServer.scala b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestAsyncWebServer.scala index 43f3edd54283..c0616676c42d 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestAsyncWebServer.scala +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestAsyncWebServer.scala @@ -43,7 +43,7 @@ object AkkaHttpTestAsyncWebServer { override def getParameter(name: String): String = uri.query().get(name).orNull }) - resp.withEntity("") + resp.withEntity(endpoint.getBody) case QUERY_PARAM => resp.withEntity(uri.queryString().orNull) case REDIRECT => resp.withHeaders(headers.Location(endpoint.getBody)) diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestSyncWebServer.scala b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestSyncWebServer.scala index 9b55cb3f899a..0153b4a8f77c 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestSyncWebServer.scala +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestSyncWebServer.scala @@ -40,7 +40,7 @@ object AkkaHttpTestSyncWebServer { override def getParameter(name: String): String = uri.query().get(name).orNull }) - resp.withEntity("") + resp.withEntity(endpoint.getBody) case QUERY_PARAM => resp.withEntity(uri.queryString().orNull) case REDIRECT => resp.withHeaders(headers.Location(endpoint.getBody)) diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestWebServer.scala b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestWebServer.scala index bc808be6a18e..938274365552 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestWebServer.scala +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestWebServer.scala @@ -38,7 +38,7 @@ object AkkaHttpTestWebServer { override def getParameter(name: String): String = map.get(name).orNull }) - "" + INDEXED_CHILD.getBody } } complete(AbstractHttpServerTest.controller(INDEXED_CHILD, supplier)) diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/v2_0/test/JaxRsTestResource.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/v2_0/test/JaxRsTestResource.java index 7424a5f41237..0b93c9920c79 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/v2_0/test/JaxRsTestResource.java +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/v2_0/test/JaxRsTestResource.java @@ -105,7 +105,7 @@ public void indexed_child(@Context UriInfo uriInfo, @Suspended AsyncResponse res INDEXED_CHILD, () -> { INDEXED_CHILD.collectSpanAttributes(parameters::getFirst); - response.resume(""); + response.resume(INDEXED_CHILD.getBody()); })); } diff --git a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/Netty40ServerTest.java b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/Netty40ServerTest.java index 874c999010d6..947a97ca1716 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/Netty40ServerTest.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/Netty40ServerTest.java @@ -106,7 +106,9 @@ protected void channelRead0(ChannelHandlerContext ctx, Object msg) HttpResponseStatus.valueOf(endpoint.getStatus()), content); } else if (endpoint.equals(INDEXED_CHILD)) { - content = Unpooled.EMPTY_BUFFER; + content = + Unpooled.copiedBuffer( + endpoint.getBody(), CharsetUtil.UTF_8); endpoint.collectSpanAttributes( it -> new QueryStringDecoder(uri) diff --git a/instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ServerTest.java b/instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ServerTest.java index 59b7ee8448e9..d25d14cfcd16 100644 --- a/instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ServerTest.java +++ b/instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ServerTest.java @@ -117,7 +117,7 @@ private static Object handle(HttpRequest request, URI uri, ServerEndpoint endpoi new DefaultFullHttpResponse( HTTP_1_1, HttpResponseStatus.valueOf(endpoint.getStatus()), content); } else if (INDEXED_CHILD.equals(endpoint)) { - content = Unpooled.EMPTY_BUFFER; + content = Unpooled.copiedBuffer(endpoint.getBody(), CharsetUtil.UTF_8); endpoint.collectSpanAttributes( name -> new QueryStringDecoder(uri).parameters().get(name).stream().findFirst().orElse("")); diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestAsyncWebServer.scala b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestAsyncWebServer.scala index cede574d0de0..74e46444c2d1 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestAsyncWebServer.scala +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestAsyncWebServer.scala @@ -41,7 +41,7 @@ object PekkoHttpTestAsyncWebServer { override def getParameter(name: String): String = uri.query().get(name).orNull }) - resp.withEntity("") + resp.withEntity(endpoint.getBody) case QUERY_PARAM => resp.withEntity(uri.queryString().orNull) case REDIRECT => resp.withHeaders(headers.Location(endpoint.getBody)) diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestServerSourceWebServer.scala b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestServerSourceWebServer.scala index aa5075349fad..f2ec5551cea2 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestServerSourceWebServer.scala +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestServerSourceWebServer.scala @@ -50,7 +50,7 @@ object PekkoHttpTestServerSourceWebServer { override def getParameter(name: String): String = map.get(name).orNull }) - "" + INDEXED_CHILD.getBody } } complete(AbstractHttpServerTest.controller(INDEXED_CHILD, supplier)) diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestSyncWebServer.scala b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestSyncWebServer.scala index dcf0f0cd90a2..0dee649501e8 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestSyncWebServer.scala +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestSyncWebServer.scala @@ -38,7 +38,7 @@ object PekkoHttpTestSyncWebServer { override def getParameter(name: String): String = uri.query().get(name).orNull }) - resp.withEntity("") + resp.withEntity(endpoint.getBody) case QUERY_PARAM => resp.withEntity(uri.queryString().orNull) case REDIRECT => resp.withHeaders(headers.Location(endpoint.getBody)) diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestWebServer.scala b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestWebServer.scala index 19dcbbad0263..509939fd19b6 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestWebServer.scala +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestWebServer.scala @@ -50,7 +50,7 @@ object PekkoHttpTestWebServer { override def getParameter(name: String): String = map.get(name).orNull }) - "" + INDEXED_CHILD.getBody } } complete(AbstractHttpServerTest.controller(INDEXED_CHILD, supplier)) diff --git a/instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackHttpServerTest.java b/instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackHttpServerTest.java index c2828217f2be..6f4e8c0f3696 100644 --- a/instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackHttpServerTest.java +++ b/instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackHttpServerTest.java @@ -96,7 +96,7 @@ protected RatpackServer setupServer() throws Exception { context .getResponse() .status(endpoint.getStatus()) - .send(); + .send(endpoint.getBody()); })))); handlerChain.prefix( diff --git a/instrumentation/restlet/restlet-1.1/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/AbstractRestletServerTest.java b/instrumentation/restlet/restlet-1.1/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/AbstractRestletServerTest.java index 97e53fcb5292..ae25bf60ca06 100644 --- a/instrumentation/restlet/restlet-1.1/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/AbstractRestletServerTest.java +++ b/instrumentation/restlet/restlet-1.1/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/AbstractRestletServerTest.java @@ -186,6 +186,7 @@ public void handle(Request request, Response response) { () -> { INDEXED_CHILD.collectSpanAttributes( name -> request.getOriginalRef().getQueryAsForm().getFirst(name).getValue()); + response.setEntity(INDEXED_CHILD.getBody(), MediaType.TEXT_PLAIN); response.setStatus(Status.valueOf(INDEXED_CHILD.getStatus())); }); } diff --git a/instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/TestServlet5.java b/instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/TestServlet5.java index 95345f376976..72cf2b3612b1 100644 --- a/instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/TestServlet5.java +++ b/instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/TestServlet5.java @@ -53,6 +53,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws } else if (INDEXED_CHILD.equals(endpoint)) { endpoint.collectSpanAttributes(req::getParameter); resp.setStatus(endpoint.getStatus()); + resp.getWriter().print(endpoint.getBody()); } else if (QUERY_PARAM.equals(endpoint)) { resp.setStatus(endpoint.getStatus()); resp.getWriter().print(req.getQueryString()); @@ -118,6 +119,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) { } else if (INDEXED_CHILD.equals(endpoint)) { endpoint.collectSpanAttributes(req::getParameter); resp.setStatus(endpoint.getStatus()); + resp.getWriter().print(endpoint.getBody()); context.complete(); } else if (QUERY_PARAM.equals(endpoint)) { resp.setStatus(endpoint.getStatus()); @@ -206,6 +208,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws } else if (INDEXED_CHILD.equals(endpoint)) { endpoint.collectSpanAttributes(req::getParameter); resp.setStatus(endpoint.getStatus()); + resp.getWriter().print(endpoint.getBody()); } else if (QUERY_PARAM.equals(endpoint)) { resp.setStatus(endpoint.getStatus()); resp.getWriter().print(req.getQueryString()); diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ServerTestController.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ServerTestController.java index 812c976457c1..432f23eb961a 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ServerTestController.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ServerTestController.java @@ -99,7 +99,7 @@ Mono indexed_child(ServerHttpRequest request, ServerHttpResponse respons () -> { endpoint.collectSpanAttributes(it -> request.getQueryParams().getFirst(it)); setStatus(response, endpoint); - return ""; + return endpoint.getBody(); }); } diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/AsyncServlet.java b/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/AsyncServlet.java index 5a2efa691725..fd7a19aebeb4 100644 --- a/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/AsyncServlet.java +++ b/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/AsyncServlet.java @@ -45,8 +45,9 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) { resp.setStatus(endpoint.getStatus()); resp.getWriter().print(endpoint.getBody()); } else if (endpoint.equals(INDEXED_CHILD)) { - endpoint.collectSpanAttributes(x -> req.getParameter(x)); + endpoint.collectSpanAttributes(req::getParameter); resp.setStatus(endpoint.getStatus()); + resp.getWriter().print(endpoint.getBody()); } else if (endpoint.equals(QUERY_PARAM)) { resp.setStatus(endpoint.getStatus()); resp.getWriter().print(req.getQueryString()); diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/AsyncServlet.java b/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/AsyncServlet.java index 8276de3ca989..4a011920c426 100644 --- a/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/AsyncServlet.java +++ b/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/AsyncServlet.java @@ -44,8 +44,9 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) { resp.setStatus(endpoint.getStatus()); resp.getWriter().print(endpoint.getBody()); } else if (endpoint.equals(INDEXED_CHILD)) { - endpoint.collectSpanAttributes(x -> req.getParameter(x)); + endpoint.collectSpanAttributes(req::getParameter); resp.setStatus(endpoint.getStatus()); + resp.getWriter().print(endpoint.getBody()); } else if (endpoint.equals(QUERY_PARAM)) { resp.setStatus(endpoint.getStatus()); resp.getWriter().print(req.getQueryString()); diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java index 45d8d465ceef..4a10a62b6575 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java @@ -422,12 +422,12 @@ void highConcurrency() throws InterruptedException { .aggregate() .whenComplete( (result, throwable) -> { - latch.countDown(); if (throwable != null) { responses.add(throwable.toString()); } else { responses.add(result.status().code() + " " + result.contentUtf8()); } + latch.countDown(); }); }); } From 3e54a0e83e6f91ba78237a9814549260cad08973 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Mon, 17 Mar 2025 17:06:37 +0200 Subject: [PATCH 3/7] send body --- .../instrumentation/grizzly/GrizzlyTest.java | 28 ++++--------------- .../jaxrs/v3_0/test/JaxRsTestResource.java | 2 +- .../play/v2_4/server/PlayAsyncServerTest.java | 3 +- .../play/v2_4/server/PlayServerTest.java | 2 +- .../play/v2_4/server/PlayServerTest.java | 2 +- .../v2_0/AbstractRestletServerTest.java | 3 +- .../servlet/v3_0/TestServlet3.java | 3 ++ 7 files changed, 16 insertions(+), 27 deletions(-) diff --git a/instrumentation/grizzly-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyTest.java b/instrumentation/grizzly-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyTest.java index af07764dcf82..f046b225c053 100644 --- a/instrumentation/grizzly-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyTest.java +++ b/instrumentation/grizzly-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyTest.java @@ -20,7 +20,6 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions; import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint; -import java.io.IOException; import java.util.HashSet; import java.util.Set; import org.glassfish.grizzly.http.server.HttpHandler; @@ -52,33 +51,18 @@ public void service(Request request, Response response) throws Exception { endpoint, () -> { if (endpoint.equals(SUCCESS)) { - try { - response.getWriter().write(endpoint.getBody()); - } catch (IOException e) { - throw new RuntimeException(e); - } + response.getWriter().write(endpoint.getBody()); } else if (endpoint.equals(INDEXED_CHILD)) { - response.setStatus(endpoint.getStatus()); endpoint.collectSpanAttributes(request::getParameter); + response.setStatus(endpoint.getStatus()); + response.getWriter().write(endpoint.getBody()); } else if (endpoint.equals(QUERY_PARAM)) { response.setStatus(endpoint.getStatus()); - try { - response.getWriter().write(request.getQueryString()); - } catch (IOException e) { - throw new RuntimeException(e); - } + response.getWriter().write(request.getQueryString()); } else if (endpoint.equals(REDIRECT)) { - try { - response.sendRedirect(endpoint.getBody()); - } catch (IOException e) { - throw new RuntimeException(e); - } + response.sendRedirect(endpoint.getBody()); } else if (endpoint.equals(ERROR)) { - try { - response.sendError(endpoint.getStatus(), endpoint.getBody()); - } catch (IOException e) { - throw new RuntimeException(e); - } + response.sendError(endpoint.getStatus(), endpoint.getBody()); } else if (endpoint.equals(NOT_FOUND)) { response.setStatus(endpoint.getStatus()); } else if (endpoint.equals(EXCEPTION)) { diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/v3_0/test/JaxRsTestResource.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/v3_0/test/JaxRsTestResource.java index cb27d90828b4..de799e83dc95 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/v3_0/test/JaxRsTestResource.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/v3_0/test/JaxRsTestResource.java @@ -105,7 +105,7 @@ public void indexed_child(@Context UriInfo uriInfo, @Suspended AsyncResponse res INDEXED_CHILD, () -> { INDEXED_CHILD.collectSpanAttributes(parameters::getFirst); - response.resume(""); + response.resume(INDEXED_CHILD.getBody()); })); } diff --git a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayAsyncServerTest.java b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayAsyncServerTest.java index f0fd0e762e5f..aec08c0fa644 100644 --- a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayAsyncServerTest.java +++ b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayAsyncServerTest.java @@ -47,7 +47,8 @@ protected Server setupServer() { it -> play.mvc.Http.Context.Implicit.request() .getQueryString(it)); - return Results.status(INDEXED_CHILD.getStatus()); + return Results.status( + INDEXED_CHILD.getStatus(), INDEXED_CHILD.getBody()); }))) .GET(QUERY_PARAM.getPath()) .routeAsync( diff --git a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayServerTest.java b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayServerTest.java index b4c18d29f6f6..c4f5fb6dadc8 100644 --- a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayServerTest.java +++ b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayServerTest.java @@ -55,7 +55,7 @@ protected Server setupServer() { () -> { INDEXED_CHILD.collectSpanAttributes( it -> play.mvc.Http.Context.Implicit.request().getQueryString(it)); - return Results.status(INDEXED_CHILD.getStatus()); + return Results.status(INDEXED_CHILD.getStatus(), INDEXED_CHILD.getBody()); })) .GET(QUERY_PARAM.getPath()) .routeTo( diff --git a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayServerTest.java b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayServerTest.java index fe4da606af53..a537860e7499 100644 --- a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayServerTest.java +++ b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayServerTest.java @@ -52,7 +52,7 @@ protected Server setupServer() { () -> { INDEXED_CHILD.collectSpanAttributes( it -> play.mvc.Http.Context.Implicit.request().getQueryString(it)); - return Results.status(INDEXED_CHILD.getStatus()); + return Results.status(INDEXED_CHILD.getStatus(), INDEXED_CHILD.getBody()); })) .GET(QUERY_PARAM.getPath()) .routeTo( diff --git a/instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/AbstractRestletServerTest.java b/instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/AbstractRestletServerTest.java index 7ba0e3bc01e2..33c8bafe3cb6 100644 --- a/instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/AbstractRestletServerTest.java +++ b/instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/AbstractRestletServerTest.java @@ -208,7 +208,8 @@ public void handle(Request request, Response response) { () -> { INDEXED_CHILD.collectSpanAttributes( name -> request.getOriginalRef().getQueryAsForm().getFirstValue(name)); - response.setStatus(Status.valueOf(INDEXED_CHILD.getStatus())); + response.setStatus( + Status.valueOf(INDEXED_CHILD.getStatus()), INDEXED_CHILD.getBody()); }); } }); diff --git a/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/TestServlet3.java b/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/TestServlet3.java index d05cc8e6d0ce..f4db76924ca8 100644 --- a/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/TestServlet3.java +++ b/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/TestServlet3.java @@ -53,6 +53,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws } else if (INDEXED_CHILD.equals(endpoint)) { endpoint.collectSpanAttributes(req::getParameter); resp.setStatus(endpoint.getStatus()); + resp.getWriter().print(endpoint.getBody()); } else if (QUERY_PARAM.equals(endpoint)) { resp.setStatus(endpoint.getStatus()); resp.getWriter().print(req.getQueryString()); @@ -118,6 +119,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) { } else if (INDEXED_CHILD.equals(endpoint)) { endpoint.collectSpanAttributes(req::getParameter); resp.setStatus(endpoint.getStatus()); + resp.getWriter().print(endpoint.getBody()); context.complete(); } else if (QUERY_PARAM.equals(endpoint)) { resp.setStatus(endpoint.getStatus()); @@ -206,6 +208,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws } else if (INDEXED_CHILD.equals(endpoint)) { endpoint.collectSpanAttributes(req::getParameter); resp.setStatus(endpoint.getStatus()); + resp.getWriter().print(endpoint.getBody()); } else if (QUERY_PARAM.equals(endpoint)) { resp.setStatus(endpoint.getStatus()); resp.getWriter().print(req.getQueryString()); From 2ca2e21a131feafbdc81c75921fd8fc8f9b9183b Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Mon, 17 Mar 2025 18:12:23 +0200 Subject: [PATCH 4/7] send body --- .../finaglehttp/v23_11/AbstractServerTest.java | 2 +- .../restlet/v2_0/AbstractRestletServerTest.java | 1 + .../instrumentation/restlet/v2_0/RestletAppTestBase.java | 4 +--- .../vertx/reactive/server/AbstractVertxRxVerticle.java | 4 +++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/AbstractServerTest.java b/instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/AbstractServerTest.java index 7fefb76a85f3..418ffaf97913 100644 --- a/instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/AbstractServerTest.java +++ b/instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/AbstractServerTest.java @@ -74,7 +74,7 @@ public Future apply(Request request) { name -> new QueryStringDecoder(uri) .parameters().get(name).stream().findFirst().orElse("")); - response.content(Buf.Empty()); + response.content(Buf.Utf8$.MODULE$.apply(endpoint.getBody())); } else if (QUERY_PARAM.equals(endpoint)) { response.content(Buf.Utf8$.MODULE$.apply(uri.getQuery())); } else if (REDIRECT.equals(endpoint)) { diff --git a/instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/AbstractRestletServerTest.java b/instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/AbstractRestletServerTest.java index 33c8bafe3cb6..6e907bc6dfc9 100644 --- a/instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/AbstractRestletServerTest.java +++ b/instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/AbstractRestletServerTest.java @@ -208,6 +208,7 @@ public void handle(Request request, Response response) { () -> { INDEXED_CHILD.collectSpanAttributes( name -> request.getOriginalRef().getQueryAsForm().getFirstValue(name)); + response.setEntity(INDEXED_CHILD.getBody(), MediaType.TEXT_PLAIN); response.setStatus( Status.valueOf(INDEXED_CHILD.getStatus()), INDEXED_CHILD.getBody()); }); diff --git a/instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletAppTestBase.java b/instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletAppTestBase.java index 6ab660e9b95a..5eb9f4a8dacd 100644 --- a/instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletAppTestBase.java +++ b/instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletAppTestBase.java @@ -154,9 +154,7 @@ public String represent() { () -> { INDEXED_CHILD.collectSpanAttributes( name -> getRequest().getOriginalRef().getQueryAsForm().getFirstValue(name)); - // INDEXED_CHILD.getBody() returns an empty string, in which case Restlet sets status to - // 204 - return "child"; + return INDEXED_CHILD.getBody(); }); } } diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/server/AbstractVertxRxVerticle.java b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/server/AbstractVertxRxVerticle.java index b2b03f85bbfb..b3cd1ad73637 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/server/AbstractVertxRxVerticle.java +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/server/AbstractVertxRxVerticle.java @@ -43,7 +43,9 @@ void configure(Router router) { () -> { INDEXED_CHILD.collectSpanAttributes( parameter -> ctx.request().params().get(parameter)); - ctx.response().setStatusCode(INDEXED_CHILD.getStatus()).end(); + ctx.response() + .setStatusCode(INDEXED_CHILD.getStatus()) + .end(INDEXED_CHILD.getBody()); })); router From 8c66eab0e41934ab6297d4aeec676c5d59c25f1c Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Mon, 17 Mar 2025 19:43:10 +0200 Subject: [PATCH 5/7] send body --- .../instrumentation/netty/v3_8/server/Netty38ServerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/Netty38ServerTest.java b/instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/Netty38ServerTest.java index 9569d178c182..20505a1e40f5 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/Netty38ServerTest.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/Netty38ServerTest.java @@ -127,7 +127,8 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent msg) { HTTP_1_1, HttpResponseStatus.valueOf(endpoint.getStatus())); response.setContent(responseContent); } else if (INDEXED_CHILD.equals(endpoint)) { - responseContent = ChannelBuffers.EMPTY_BUFFER; + responseContent = + ChannelBuffers.copiedBuffer(endpoint.getBody(), CharsetUtil.UTF_8); endpoint.collectSpanAttributes( name -> new QueryStringDecoder(uri) From 7bf73b09671c796f418332a5d013eb44f44ccb5c Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Mon, 17 Mar 2025 22:53:14 +0200 Subject: [PATCH 6/7] send body --- .../vertx/reactive/server/AbstractVertxRxVerticle.java | 2 +- .../javaagent/instrumentation/vertx/AbstractVertxWebServer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/server/AbstractVertxRxVerticle.java b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/server/AbstractVertxRxVerticle.java index b2b03f85bbfb..d9d774956b4c 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/server/AbstractVertxRxVerticle.java +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/server/AbstractVertxRxVerticle.java @@ -43,7 +43,7 @@ void configure(Router router) { () -> { INDEXED_CHILD.collectSpanAttributes( parameter -> ctx.request().params().get(parameter)); - ctx.response().setStatusCode(INDEXED_CHILD.getStatus()).end(); + ctx.response().setStatusCode(INDEXED_CHILD.getStatus()).end(INDEXED_CHILD.getBody()); })); router diff --git a/instrumentation/vertx/vertx-web-3.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/AbstractVertxWebServer.java b/instrumentation/vertx/vertx-web-3.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/AbstractVertxWebServer.java index 8546e12e2966..14a2bcd8e561 100644 --- a/instrumentation/vertx/vertx-web-3.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/AbstractVertxWebServer.java +++ b/instrumentation/vertx/vertx-web-3.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/AbstractVertxWebServer.java @@ -58,7 +58,7 @@ public void handle(RoutingContext ctx) { INDEXED_CHILD, () -> { INDEXED_CHILD.collectSpanAttributes(it -> ctx.request().getParam(it)); - end(ctx.response().setStatusCode(INDEXED_CHILD.getStatus())); + end(ctx.response().setStatusCode(INDEXED_CHILD.getStatus()), INDEXED_CHILD.getBody()); return null; })); router From ce7a59628bcd37845082ea6dd96ec58425035ea2 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Tue, 18 Mar 2025 09:36:00 +0200 Subject: [PATCH 7/7] spotless --- .../vertx/reactive/server/AbstractVertxRxVerticle.java | 4 +++- .../instrumentation/vertx/AbstractVertxWebServer.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/server/AbstractVertxRxVerticle.java b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/server/AbstractVertxRxVerticle.java index d9d774956b4c..b3cd1ad73637 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/server/AbstractVertxRxVerticle.java +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/server/AbstractVertxRxVerticle.java @@ -43,7 +43,9 @@ void configure(Router router) { () -> { INDEXED_CHILD.collectSpanAttributes( parameter -> ctx.request().params().get(parameter)); - ctx.response().setStatusCode(INDEXED_CHILD.getStatus()).end(INDEXED_CHILD.getBody()); + ctx.response() + .setStatusCode(INDEXED_CHILD.getStatus()) + .end(INDEXED_CHILD.getBody()); })); router diff --git a/instrumentation/vertx/vertx-web-3.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/AbstractVertxWebServer.java b/instrumentation/vertx/vertx-web-3.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/AbstractVertxWebServer.java index 14a2bcd8e561..265e74761ff3 100644 --- a/instrumentation/vertx/vertx-web-3.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/AbstractVertxWebServer.java +++ b/instrumentation/vertx/vertx-web-3.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/AbstractVertxWebServer.java @@ -58,7 +58,9 @@ public void handle(RoutingContext ctx) { INDEXED_CHILD, () -> { INDEXED_CHILD.collectSpanAttributes(it -> ctx.request().getParam(it)); - end(ctx.response().setStatusCode(INDEXED_CHILD.getStatus()), INDEXED_CHILD.getBody()); + end( + ctx.response().setStatusCode(INDEXED_CHILD.getStatus()), + INDEXED_CHILD.getBody()); return null; })); router