Skip to content
Merged
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,8 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
if (bubblesResponse()) {
assert response.body().string().contains(ERROR.body)
assert response.code() == ERROR.status
} else {
response.close()
}

and:
Expand Down Expand Up @@ -1239,7 +1241,6 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
}
}

@Flaky(value = "https://github.com/DataDog/dd-trace-java/issues/9396", suites = ["PekkoHttpServerInstrumentationAsyncHttp2Test"])
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may want to consider keeping this for now

This PR hasn't deterministically proved that this flake is fixed so there may be other underlying issues here that may recur after this fix. If that does happen, this test may break a few PRs and we would need to re-introduce the annotation

That being said, if we can see that this fixed it empirically (i.e. this test does not flake for 30 days) we can remove this annotation afterwards with no worries

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That sounds fair. Will add it back in.

def "test exception"() {
setup:
def method = "GET"
Expand All @@ -1255,6 +1256,8 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
response.code() == EXCEPTION.status
if (testExceptionBody()) {
assert response.body().string() == EXCEPTION.body
} else {
response.close()
}

and:
Expand Down Expand Up @@ -1299,6 +1302,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {

expect:
response.code() == NOT_FOUND.status
response.close()

and:
assertTraces(1) {
Expand Down
Loading