Skip to content

Commit c93ec8f

Browse files
authored
Fix play-mvc-2.6 test java conversion (#12516)
1 parent a303e1a commit c93ec8f

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

instrumentation/play/play-mvc/play-mvc-2.6/javaagent/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ tasks {
6767
named("test") {
6868
enabled = false
6969
}
70+
named("compileTestJava") {
71+
enabled = false
72+
}
7073
}
7174

7275
check {

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import play.routing.RoutingDsl;
3030
import play.server.Server;
3131

32-
abstract class PlayServerTest extends AbstractHttpServerTest<Server> {
32+
class PlayServerTest extends AbstractHttpServerTest<Server> {
3333

3434
@RegisterExtension
3535
static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
@@ -75,9 +75,10 @@ protected Server setupServer() {
7575
Result result =
7676
Results.status(
7777
CAPTURE_HEADERS.getStatus(), CAPTURE_HEADERS.getBody());
78-
request
79-
.header("X-Test-Request")
80-
.ifPresent(value -> result.withHeader("X-Test-Response", value));
78+
result =
79+
result.withHeader(
80+
"X-Test-Response",
81+
request.header("X-Test-Request").orElse("missing"));
8182
return result;
8283
}))
8384
.GET(INDEXED_CHILD.getPath())

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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import play.routing.RoutingDsl;
3030
import play.server.Server;
3131

32-
abstract class PlayServerTest extends AbstractHttpServerTest<Server> {
32+
class PlayServerTest extends AbstractHttpServerTest<Server> {
3333

3434
@RegisterExtension
3535
static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();

0 commit comments

Comments
 (0)