Skip to content

Commit 4c926e4

Browse files
committed
Fix
1 parent 4a67316 commit 4c926e4

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,21 @@ testing {
6060
}
6161
}
6262

63+
val testLatestDeps = findProperty("testLatestDeps") as Boolean
6364
tasks {
64-
if (findProperty("testLatestDeps") as Boolean) {
65+
if (testLatestDeps) {
6566
// disable regular test running and compiling tasks when latest dep test task is run
6667
named("test") {
6768
enabled = false
6869
}
70+
}
6971

70-
named("latestDepTest") {
71-
enabled = true
72-
}
72+
named("latestDepTest") {
73+
enabled = testLatestDeps
74+
}
7375

74-
check {
75-
dependsOn(testing.suites)
76-
}
76+
check {
77+
dependsOn(testing.suites)
7778
}
7879
}
7980

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
1414
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
1515

16+
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
1617
import java.util.concurrent.CompletableFuture;
1718
import java.util.concurrent.ExecutorService;
1819
import java.util.concurrent.Executors;
@@ -126,4 +127,10 @@ protected void stopServer(Server server) {
126127
server.stop();
127128
executor.shutdown();
128129
}
130+
131+
@Override
132+
protected void configure(HttpServerTestOptions options) {
133+
super.configure(options);
134+
options.setTestHttpPipelining(false);
135+
}
129136
}

0 commit comments

Comments
 (0)