File tree Expand file tree Collapse file tree
instrumentation/servlet/request-3/src/test/groovy
testing/src/main/groovy/datadog/trace/agent/test/base Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -438,6 +438,11 @@ class JettyServlet3TestSyncDispatchOnAsyncTimeout extends JettyServlet3Test {
438438 true
439439 }
440440
441+ @Override
442+ boolean testParallelRequest () {
443+ false
444+ }
445+
441446 @Override
442447 void handlerSpan (TraceAssert trace , ServerEndpoint endpoint = SUCCESS ) {
443448 dispatchSpan(trace, endpoint)
@@ -474,6 +479,11 @@ class JettyServlet3TestAsyncDispatchOnAsyncTimeout extends JettyServlet3Test {
474479 true
475480 }
476481
482+ @Override
483+ boolean testParallelRequest () {
484+ false
485+ }
486+
477487 @Override
478488 void handlerSpan (TraceAssert trace , ServerEndpoint endpoint = SUCCESS ) {
479489 dispatchSpan(trace, endpoint)
@@ -532,6 +542,11 @@ class JettyServlet3ServeFromAsyncTimeout extends JettyServlet3Test {
532542 boolean testException () {
533543 false
534544 }
545+
546+ @Override
547+ boolean testParallelRequest () {
548+ false
549+ }
535550}
536551
537552class IastJettyServlet3ForkedTest extends JettyServlet3TestSync {
Original file line number Diff line number Diff line change @@ -384,6 +384,10 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
384384 false // not all servers support session ids
385385 }
386386
387+ boolean testParallelRequest () {
388+ true
389+ }
390+
387391 @Override
388392 int version () {
389393 return 0
@@ -530,15 +534,20 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
530534 @Flaky (value = " https://github.com/DataDog/dd-trace-java/issues/4690" , suites = [" MuleHttpServerForkedTest" ])
531535 def " test success with #count requests" () {
532536 setup :
537+ def responses
533538 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+ }
539546 }
547+ responses = (1 .. count). collect { completionService. take(). get() }
548+ } else {
549+ responses = (1 .. count). collect {client. newCall(request). execute()}
540550 }
541- def responses = (1 .. count). collect {completionService. take(). get()}
542551
543552 if (isDataStreamsEnabled()) {
544553 TEST_DATA_STREAMS_WRITER . waitForGroups(1 )
You can’t perform that action at this time.
0 commit comments