Skip to content

Fix play-mvc-2.6 test java conversion #12516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 25, 2024
Merged

Fix play-mvc-2.6 test java conversion #12516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions instrumentation/play/play-mvc/play-mvc-2.6/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ tasks {
named("test") {
enabled = false
}
named("compileTestJava") {
enabled = false
}
}

check {
Expand Down
9 changes: 5 additions & 4 deletions ...testDepTest/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import play.routing.RoutingDsl;
import play.server.Server;

abstract class PlayServerTest extends AbstractHttpServerTest<Server> {
class PlayServerTest extends AbstractHttpServerTest<Server> {

@RegisterExtension
static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
Expand Down Expand Up @@ -75,9 +75,10 @@ protected Server setupServer() {
Result result =
Results.status(
CAPTURE_HEADERS.getStatus(), CAPTURE_HEADERS.getBody());
request
.header("X-Test-Request")
.ifPresent(value -> result.withHeader("X-Test-Response", value));
result =
result.withHeader(
"X-Test-Response",
request.header("X-Test-Request").orElse("missing"));
return result;
}))
.GET(INDEXED_CHILD.getPath())
Expand Down
2 changes: 1 addition & 1 deletion ...nt/src/test/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import play.routing.RoutingDsl;
import play.server.Server;

abstract class PlayServerTest extends AbstractHttpServerTest<Server> {
class PlayServerTest extends AbstractHttpServerTest<Server> {

@RegisterExtension
static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
Expand Down
Loading