Skip to content

Commit 125adab

Browse files
lauritlaurit
committed
send body
1 parent fc1cc72 commit 125adab

File tree

17 files changed

+23
-15
lines changed

17 files changed

+23
-15
lines changed

‎instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestAsyncWebServer.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ object AkkaHttpTestAsyncWebServer {
4343
override def getParameter(name: String): String =
4444
uri.query().get(name).orNull
4545
})
46-
resp.withEntity("")
46+
resp.withEntity(endpoint.getBody)
4747
case QUERY_PARAM => resp.withEntity(uri.queryString().orNull)
4848
case REDIRECT =>
4949
resp.withHeaders(headers.Location(endpoint.getBody))

‎instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestSyncWebServer.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ object AkkaHttpTestSyncWebServer {
4040
override def getParameter(name: String): String =
4141
uri.query().get(name).orNull
4242
})
43-
resp.withEntity("")
43+
resp.withEntity(endpoint.getBody)
4444
case QUERY_PARAM => resp.withEntity(uri.queryString().orNull)
4545
case REDIRECT =>
4646
resp.withHeaders(headers.Location(endpoint.getBody))

‎instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestWebServer.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ object AkkaHttpTestWebServer {
3838
override def getParameter(name: String): String =
3939
map.get(name).orNull
4040
})
41-
""
41+
INDEXED_CHILD.getBody
4242
}
4343
}
4444
complete(AbstractHttpServerTest.controller(INDEXED_CHILD, supplier))

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/v2_0/test/JaxRsTestResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void indexed_child(@Context UriInfo uriInfo, @Suspended AsyncResponse res
105105
INDEXED_CHILD,
106106
() -> {
107107
INDEXED_CHILD.collectSpanAttributes(parameters::getFirst);
108-
response.resume("");
108+
response.resume(INDEXED_CHILD.getBody());
109109
}));
110110
}
111111

‎instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/Netty40ServerTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ protected void channelRead0(ChannelHandlerContext ctx, Object msg)
106106
HttpResponseStatus.valueOf(endpoint.getStatus()),
107107
content);
108108
} else if (endpoint.equals(INDEXED_CHILD)) {
109-
content = Unpooled.EMPTY_BUFFER;
109+
content =
110+
Unpooled.copiedBuffer(
111+
endpoint.getBody(), CharsetUtil.UTF_8);
110112
endpoint.collectSpanAttributes(
111113
it ->
112114
new QueryStringDecoder(uri)

‎instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ServerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private static Object handle(HttpRequest request, URI uri, ServerEndpoint endpoi
117117
new DefaultFullHttpResponse(
118118
HTTP_1_1, HttpResponseStatus.valueOf(endpoint.getStatus()), content);
119119
} else if (INDEXED_CHILD.equals(endpoint)) {
120-
content = Unpooled.EMPTY_BUFFER;
120+
content = Unpooled.copiedBuffer(endpoint.getBody(), CharsetUtil.UTF_8);
121121
endpoint.collectSpanAttributes(
122122
name ->
123123
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ object PekkoHttpTestAsyncWebServer {
4141
override def getParameter(name: String): String =
4242
uri.query().get(name).orNull
4343
})
44-
resp.withEntity("")
44+
resp.withEntity(endpoint.getBody)
4545
case QUERY_PARAM => resp.withEntity(uri.queryString().orNull)
4646
case REDIRECT =>
4747
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ object PekkoHttpTestServerSourceWebServer {
5050
override def getParameter(name: String): String =
5151
map.get(name).orNull
5252
})
53-
""
53+
INDEXED_CHILD.getBody
5454
}
5555
}
5656
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ object PekkoHttpTestSyncWebServer {
3838
override def getParameter(name: String): String =
3939
uri.query().get(name).orNull
4040
})
41-
resp.withEntity("")
41+
resp.withEntity(endpoint.getBody)
4242
case QUERY_PARAM => resp.withEntity(uri.queryString().orNull)
4343
case REDIRECT =>
4444
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ object PekkoHttpTestWebServer {
5050
override def getParameter(name: String): String =
5151
map.get(name).orNull
5252
})
53-
""
53+
INDEXED_CHILD.getBody
5454
}
5555
}
5656
complete(AbstractHttpServerTest.controller(INDEXED_CHILD, supplier))

‎instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackHttpServerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ protected RatpackServer setupServer() throws Exception {
9696
context
9797
.getResponse()
9898
.status(endpoint.getStatus())
99-
.send();
99+
.send(endpoint.getBody());
100100
}))));
101101

102102
handlerChain.prefix(

‎instrumentation/restlet/restlet-1.1/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/AbstractRestletServerTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ public void handle(Request request, Response response) {
186186
() -> {
187187
INDEXED_CHILD.collectSpanAttributes(
188188
name -> request.getOriginalRef().getQueryAsForm().getFirst(name).getValue());
189+
response.setEntity(INDEXED_CHILD.getBody(), MediaType.TEXT_PLAIN);
189190
response.setStatus(Status.valueOf(INDEXED_CHILD.getStatus()));
190191
});
191192
}

‎instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/TestServlet5.java

+3
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
5353
} else if (INDEXED_CHILD.equals(endpoint)) {
5454
endpoint.collectSpanAttributes(req::getParameter);
5555
resp.setStatus(endpoint.getStatus());
56+
resp.getWriter().print(endpoint.getBody());
5657
} else if (QUERY_PARAM.equals(endpoint)) {
5758
resp.setStatus(endpoint.getStatus());
5859
resp.getWriter().print(req.getQueryString());
@@ -118,6 +119,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) {
118119
} else if (INDEXED_CHILD.equals(endpoint)) {
119120
endpoint.collectSpanAttributes(req::getParameter);
120121
resp.setStatus(endpoint.getStatus());
122+
resp.getWriter().print(endpoint.getBody());
121123
context.complete();
122124
} else if (QUERY_PARAM.equals(endpoint)) {
123125
resp.setStatus(endpoint.getStatus());
@@ -206,6 +208,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
206208
} else if (INDEXED_CHILD.equals(endpoint)) {
207209
endpoint.collectSpanAttributes(req::getParameter);
208210
resp.setStatus(endpoint.getStatus());
211+
resp.getWriter().print(endpoint.getBody());
209212
} else if (QUERY_PARAM.equals(endpoint)) {
210213
resp.setStatus(endpoint.getStatus());
211214
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Mono<String> indexed_child(ServerHttpRequest request, ServerHttpResponse respons
9999
() -> {
100100
endpoint.collectSpanAttributes(it -> request.getQueryParams().getFirst(it));
101101
setStatus(response, endpoint);
102-
return "";
102+
return endpoint.getBody();
103103
});
104104
}
105105

‎instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/AsyncServlet.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) {
4545
resp.setStatus(endpoint.getStatus());
4646
resp.getWriter().print(endpoint.getBody());
4747
} else if (endpoint.equals(INDEXED_CHILD)) {
48-
endpoint.collectSpanAttributes(x -> req.getParameter(x));
48+
endpoint.collectSpanAttributes(req::getParameter);
4949
resp.setStatus(endpoint.getStatus());
50+
resp.getWriter().print(endpoint.getBody());
5051
} else if (endpoint.equals(QUERY_PARAM)) {
5152
resp.setStatus(endpoint.getStatus());
5253
resp.getWriter().print(req.getQueryString());

‎instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/AsyncServlet.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) {
4444
resp.setStatus(endpoint.getStatus());
4545
resp.getWriter().print(endpoint.getBody());
4646
} else if (endpoint.equals(INDEXED_CHILD)) {
47-
endpoint.collectSpanAttributes(x -> req.getParameter(x));
47+
endpoint.collectSpanAttributes(req::getParameter);
4848
resp.setStatus(endpoint.getStatus());
49+
resp.getWriter().print(endpoint.getBody());
4950
} else if (endpoint.equals(QUERY_PARAM)) {
5051
resp.setStatus(endpoint.getStatus());
5152
resp.getWriter().print(req.getQueryString());

‎testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -422,12 +422,12 @@ void highConcurrency() throws InterruptedException {
422422
.aggregate()
423423
.whenComplete(
424424
(result, throwable) -> {
425-
latch.countDown();
426425
if (throwable != null) {
427426
responses.add(throwable.toString());
428427
} else {
429428
responses.add(result.status().code() + " " + result.contentUtf8());
430429
}
430+
latch.countDown();
431431
});
432432
});
433433
}

0 commit comments

Comments
 (0)