Skip to content

Test http server requests in parallel #8222

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 3 commits into from
Jan 16, 2025
Merged

Test http server requests in parallel #8222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
035bfdf
Test http server requests in parallel
amarziali Jan 16, 2025
ac67ac1
use executor service
amarziali Jan 16, 2025
adf899d
exclude some parallel
amarziali Jan 16, 2025
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
15 changes: 15 additions & 0 deletions dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/JettyServlet3Test.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,11 @@ class JettyServlet3TestSyncDispatchOnAsyncTimeout extends JettyServlet3Test {
true
}

@Override
boolean testParallelRequest() {
false
}

@Override
void handlerSpan(TraceAssert trace, ServerEndpoint endpoint = SUCCESS) {
dispatchSpan(trace, endpoint)
Expand Down Expand Up @@ -474,6 +479,11 @@ class JettyServlet3TestAsyncDispatchOnAsyncTimeout extends JettyServlet3Test {
true
}

@Override
boolean testParallelRequest() {
false
}

@Override
void handlerSpan(TraceAssert trace, ServerEndpoint endpoint = SUCCESS) {
dispatchSpan(trace, endpoint)
Expand Down Expand Up @@ -532,6 +542,11 @@ class JettyServlet3ServeFromAsyncTimeout extends JettyServlet3Test {
boolean testException() {
false
}

@Override
boolean testParallelRequest() {
false
}
}

class IastJettyServlet3ForkedTest extends JettyServlet3TestSync {
Expand Down
21 changes: 19 additions & 2 deletions dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ import org.slf4j.Logger
import org.slf4j.LoggerFactory

import javax.annotation.Nonnull
import java.util.concurrent.ExecutorCompletionService
import java.util.concurrent.Executors
import java.util.function.BiFunction
import java.util.function.Function
import java.util.function.Supplier
Expand Down Expand Up @@ -382,6 +384,10 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
false // not all servers support session ids
}

boolean testParallelRequest() {
true
}

@Override
int version() {
return 0
Expand Down Expand Up @@ -528,10 +534,21 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
@Flaky(value = "https://github.com/DataDog/dd-trace-java/issues/4690", suites = ["MuleHttpServerForkedTest"])
def "test success with #count requests"() {
setup:
def responses
def request = request(SUCCESS, method, body).build()
List<Response> responses = (1..count).collect {
return client.newCall(request).execute()
if (testParallelRequest()) {
def executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors())
def completionService = new ExecutorCompletionService(executor)
(1..count).each {
completionService.submit {
client.newCall(request).execute()
}
}
responses = (1..count).collect { completionService.take().get() }
} else {
responses = (1..count).collect {client.newCall(request).execute()}
}

if (isDataStreamsEnabled()) {
TEST_DATA_STREAMS_WRITER.waitForGroups(1)
}
Expand Down
Loading