Skip to content

Commit 3e54a0e

Browse files
lauritlaurit
committed
send body
1 parent 125adab commit 3e54a0e

File tree

7 files changed

+16
-27
lines changed

7 files changed

+16
-27
lines changed

‎instrumentation/grizzly-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyTest.java

+6-22
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
2121
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
2222
import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
23-
import java.io.IOException;
2423
import java.util.HashSet;
2524
import java.util.Set;
2625
import org.glassfish.grizzly.http.server.HttpHandler;
@@ -52,33 +51,18 @@ public void service(Request request, Response response) throws Exception {
5251
endpoint,
5352
() -> {
5453
if (endpoint.equals(SUCCESS)) {
55-
try {
56-
response.getWriter().write(endpoint.getBody());
57-
} catch (IOException e) {
58-
throw new RuntimeException(e);
59-
}
54+
response.getWriter().write(endpoint.getBody());
6055
} else if (endpoint.equals(INDEXED_CHILD)) {
61-
response.setStatus(endpoint.getStatus());
6256
endpoint.collectSpanAttributes(request::getParameter);
57+
response.setStatus(endpoint.getStatus());
58+
response.getWriter().write(endpoint.getBody());
6359
} else if (endpoint.equals(QUERY_PARAM)) {
6460
response.setStatus(endpoint.getStatus());
65-
try {
66-
response.getWriter().write(request.getQueryString());
67-
} catch (IOException e) {
68-
throw new RuntimeException(e);
69-
}
61+
response.getWriter().write(request.getQueryString());
7062
} else if (endpoint.equals(REDIRECT)) {
71-
try {
72-
response.sendRedirect(endpoint.getBody());
73-
} catch (IOException e) {
74-
throw new RuntimeException(e);
75-
}
63+
response.sendRedirect(endpoint.getBody());
7664
} else if (endpoint.equals(ERROR)) {
77-
try {
78-
response.sendError(endpoint.getStatus(), endpoint.getBody());
79-
} catch (IOException e) {
80-
throw new RuntimeException(e);
81-
}
65+
response.sendError(endpoint.getStatus(), endpoint.getBody());
8266
} else if (endpoint.equals(NOT_FOUND)) {
8367
response.setStatus(endpoint.getStatus());
8468
} else if (endpoint.equals(EXCEPTION)) {

‎instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/v3_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/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayAsyncServerTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ protected Server setupServer() {
4747
it ->
4848
play.mvc.Http.Context.Implicit.request()
4949
.getQueryString(it));
50-
return Results.status(INDEXED_CHILD.getStatus());
50+
return Results.status(
51+
INDEXED_CHILD.getStatus(), INDEXED_CHILD.getBody());
5152
})))
5253
.GET(QUERY_PARAM.getPath())
5354
.routeAsync(

‎instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayServerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ protected Server setupServer() {
5555
() -> {
5656
INDEXED_CHILD.collectSpanAttributes(
5757
it -> play.mvc.Http.Context.Implicit.request().getQueryString(it));
58-
return Results.status(INDEXED_CHILD.getStatus());
58+
return Results.status(INDEXED_CHILD.getStatus(), INDEXED_CHILD.getBody());
5959
}))
6060
.GET(QUERY_PARAM.getPath())
6161
.routeTo(

‎instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayServerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected Server setupServer() {
5252
() -> {
5353
INDEXED_CHILD.collectSpanAttributes(
5454
it -> play.mvc.Http.Context.Implicit.request().getQueryString(it));
55-
return Results.status(INDEXED_CHILD.getStatus());
55+
return Results.status(INDEXED_CHILD.getStatus(), INDEXED_CHILD.getBody());
5656
}))
5757
.GET(QUERY_PARAM.getPath())
5858
.routeTo(

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ public void handle(Request request, Response response) {
208208
() -> {
209209
INDEXED_CHILD.collectSpanAttributes(
210210
name -> request.getOriginalRef().getQueryAsForm().getFirstValue(name));
211-
response.setStatus(Status.valueOf(INDEXED_CHILD.getStatus()));
211+
response.setStatus(
212+
Status.valueOf(INDEXED_CHILD.getStatus()), INDEXED_CHILD.getBody());
212213
});
213214
}
214215
});

‎instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/TestServlet3.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());

0 commit comments

Comments
 (0)