Skip to content

Fix Pekko HTTP async test exception flakiness #10799

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

Open
bm1549 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Pekko HTTP async test exception flakiness #10799

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
1 change: 0 additions & 1 deletion ...strumentation-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 @@ -1234,7 +1234,6 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
}
}

@Flaky(value = "https://github.com/DataDog/dd-trace-java/issues/9396", suites = ["PekkoHttpServerInstrumentationAsyncHttp2Test"])
def "test exception"() {
setup:
def method = "GET"
Expand Down
7 changes: 7 additions & 0 deletions ...gent/instrumentation/pekko/pekko-http-1.0/src/baseTest/scala/PekkoHttpTestWebServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,13 @@ object PekkoHttpTestWebServer {
): HttpRequest => Future[HttpResponse] = { request =>
Future {
syncHandler(request)
}.recover { case e: Exception =>
// Recover from exceptions to return a proper HTTP response instead of a
// failed Future. When the Future fails, the span completion depends on
// async continuation cleanup which can race with the test's trace assertion,
// causing flaky timeouts waiting for the trace to be written.
HttpResponse(status = EXCEPTION.getStatus, entity = e.getMessage)
.withDefaultHeaders(defaultHeader)
}
}

Expand Down
Loading