File tree 2 files changed +25
-6
lines changed
instrumentation/servlet/request-3/src/test/groovy
testing/src/main/groovy/datadog/trace/agent/test/base
2 files changed +25
-6
lines changed Original file line number Diff line number Diff line change @@ -474,6 +474,11 @@ class JettyServlet3TestAsyncDispatchOnAsyncTimeout extends JettyServlet3Test {
474
474
true
475
475
}
476
476
477
+ @Override
478
+ boolean testParallelRequest () {
479
+ false
480
+ }
481
+
477
482
@Override
478
483
void handlerSpan (TraceAssert trace , ServerEndpoint endpoint = SUCCESS ) {
479
484
dispatchSpan(trace, endpoint)
@@ -532,6 +537,11 @@ class JettyServlet3ServeFromAsyncTimeout extends JettyServlet3Test {
532
537
boolean testException () {
533
538
false
534
539
}
540
+
541
+ @Override
542
+ boolean testParallelRequest () {
543
+ false
544
+ }
535
545
}
536
546
537
547
class IastJettyServlet3ForkedTest extends JettyServlet3TestSync {
Original file line number Diff line number Diff line change @@ -384,6 +384,10 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
384
384
false // not all servers support session ids
385
385
}
386
386
387
+ boolean testParallelRequest () {
388
+ true
389
+ }
390
+
387
391
@Override
388
392
int version () {
389
393
return 0
@@ -530,15 +534,20 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
530
534
@Flaky (value = " https://github.com/DataDog/dd-trace-java/issues/4690" , suites = [" MuleHttpServerForkedTest" ])
531
535
def " test success with #count requests" () {
532
536
setup :
537
+ def responses
533
538
def request = request(SUCCESS , method, body). build()
534
- def executor = Executors . newFixedThreadPool(Runtime . getRuntime(). availableProcessors())
535
- def completionService = new ExecutorCompletionService (executor)
536
- (1 .. count). each {
537
- completionService. submit {
538
- client. newCall(request). execute()
539
+ if (testParallelRequest()) {
540
+ def executor = Executors . newFixedThreadPool(Runtime . getRuntime(). availableProcessors())
541
+ def completionService = new ExecutorCompletionService (executor)
542
+ (1 .. count). each {
543
+ completionService. submit {
544
+ client. newCall(request). execute()
545
+ }
539
546
}
547
+ responses = (1 .. count). collect { completionService. take(). get() }
548
+ } else {
549
+ responses = (1 .. count). collect {client. newCall(request). execute()}
540
550
}
541
- def responses = (1 .. count). collect {completionService. take(). get()}
542
551
543
552
if (isDataStreamsEnabled()) {
544
553
TEST_DATA_STREAMS_WRITER . waitForGroups(1 )
You can’t perform that action at this time.
0 commit comments