Skip to content

Commit 2fa61d1

Browse files
committed
Fix latestDepTest asyncserver test
1 parent 4c926e4 commit 2fa61d1

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayAsyncServerTest.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,12 @@ protected Server setupServer() {
7575
.routingAsync(
7676
request ->
7777
CompletableFuture.supplyAsync(
78-
() -> {
79-
controller(
80-
EXCEPTION,
81-
() -> {
82-
throw new IllegalArgumentException(EXCEPTION.getBody());
83-
});
84-
return null;
85-
},
78+
() ->
79+
controller(
80+
EXCEPTION,
81+
() -> {
82+
throw new IllegalArgumentException(EXCEPTION.getBody());
83+
}),
8684
executionContextExecutor))
8785
.GET(CAPTURE_HEADERS.getPath())
8886
.routingAsync(
@@ -96,11 +94,10 @@ protected Server setupServer() {
9694
Results.status(
9795
CAPTURE_HEADERS.getStatus(),
9896
CAPTURE_HEADERS.getBody());
99-
request
97+
return request
10098
.header("X-Test-Request")
101-
.ifPresent(
102-
value -> result.withHeader("X-Test-Response", value));
103-
return result;
99+
.map(value -> result.withHeader("X-Test-Response", value))
100+
.orElse(result);
104101
}),
105102
executionContextExecutor))
106103
.GET(INDEXED_CHILD.getPath())

instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayServerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ protected void stopServer(Server server) {
101101

102102
@Override
103103
protected void configure(HttpServerTestOptions options) {
104+
super.configure(options);
104105
options.setHasHandlerSpan(unused -> true);
105106
options.setTestHttpPipelining(false);
106107
options.setHttpAttributes(endpoint -> emptySet());

instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayServerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ protected void stopServer(Server server) throws Exception {
102102

103103
@Override
104104
protected void configure(HttpServerTestOptions options) {
105+
super.configure(options);
105106
options.setHasHandlerSpan(unused -> true);
106107
options.setHttpAttributes(endpoint -> emptySet());
107108
options.setExpectedException(new IllegalArgumentException(EXCEPTION.getBody()));

0 commit comments

Comments
 (0)