Add body to http server concurrency test response

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

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

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

instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/AbstractServerTest.java

@@ -74,7 +74,7 @@ public Future<Response> 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)) {

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

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

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

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)

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)

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

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

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

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

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

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(

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(

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(

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(

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

instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/AbstractRestletServerTest.java

@@ -208,7 +208,9 @@ public void handle(Request request, Response response) {
                 () -> {
                   INDEXED_CHILD.collectSpanAttributes(
                       name -> request.getOriginalRef().getQueryAsForm().getFirstValue(name));
-                  response.setStatus(Status.valueOf(INDEXED_CHILD.getStatus()));
+                  response.setEntity(INDEXED_CHILD.getBody(), MediaType.TEXT_PLAIN);
+                  response.setStatus(
+                      Status.valueOf(INDEXED_CHILD.getStatus()), INDEXED_CHILD.getBody());
                 });
           }
         });

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

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

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

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<String> indexed_child(ServerHttpRequest request, ServerHttpResponse respons
         () -> {
           endpoint.collectSpanAttributes(it -> request.getQueryParams().getFirst(it));
           setStatus(response, endpoint);
-          return "";
+          return endpoint.getBody();
         });
   }
 

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

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

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();
+                      ctx.response()
+                          .setStatusCode(INDEXED_CHILD.getStatus())
+                          .end(INDEXED_CHILD.getBody());
                     }));
 
     router

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

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()));
+                      end(
+                          ctx.response().setStatusCode(INDEXED_CHILD.getStatus()),
+                          INDEXED_CHILD.getBody());
                       return null;
                     }));
     router

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<HttpRequestBuilder> setter = HttpRequestBuilder::header;
 
+    List<String> 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) -> {
+                      if (throwable != null) {
+                        responses.add(throwable.toString());
+                      } else {
+                        responses.add(result.status().code() + " " + result.contentUtf8());
+                      }
+                      latch.countDown();
+                    });
           });
     }
     latch.await();
+    assertThat(responses)
+        .allSatisfy(
+            response ->
+                assertThat(response).isEqualTo(endpoint.getStatus() + " " + endpoint.getBody()));
 
     assertHighConcurrency(count);
   }