Skip to content

Fix Spring WebFlux client flaky tests #12677

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
gh-worker-dd-mergequeue-cf854d merged 2 commits into from
Sep 29, 2026
Merged

Fix Spring WebFlux client flaky tests #12677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e65acb
Fix flaky Spring WebFlux client scope diagnostics
amarziali Sep 29, 2026
6720e14
address findings
amarziali Sep 29, 2026
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
24 changes: 23 additions & 1 deletion ...t/groovy/dd/trace/instrumentation/springwebflux/client/SpringWebfluxHttpClientBase.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import datadog.trace.bootstrap.instrumentation.api.Tags
import datadog.trace.bootstrap.instrumentation.api.URIUtils
import datadog.trace.instrumentation.netty41.client.NettyHttpClientDecorator
import datadog.trace.instrumentation.springwebflux.client.SpringWebfluxHttpClientDecorator
import io.netty.channel.Channel
import org.springframework.http.HttpMethod
import org.springframework.web.reactive.function.client.ClientRequest
import org.springframework.web.reactive.function.client.ClientResponse
Expand Down Expand Up @@ -44,7 +45,28 @@ abstract class SpringWebfluxHttpClientBase extends HttpClientTest implements Tes

check()

response.statusCode().value()
consumeResponse(response)
}

protected static int consumeResponse(ClientResponse response) {
int status = response.statusCode().value()
Channel channel = responseChannel(response)
response.bodyToMono(Void).block()
Comment thread
amarziali marked this conversation as resolved.
Comment thread
amarziali marked this conversation as resolved.
// Body completion can occur inside channelRead, before channelReadComplete is fired.
channel.eventLoop().submit({} as Runnable).sync()
return status
}

private static Channel responseChannel(ClientResponse response) {
def clientHttpResponse = field(response, "response")
def nettyResponse = field(clientHttpResponse, "response")
return nettyResponse.channel()
}

private static Object field(Object target, String name) {
def field = target.class.getDeclaredField(name)
field.accessible = true
Comment thread
amarziali marked this conversation as resolved.
return field.get(target)
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...e/instrumentation/springwebflux/client/SpringWebfluxHttpClientDoAfterTerminateTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class SpringWebfluxHttpClientDoAfterTerminateTest extends SpringWebfluxHttpClien

check()

response.statusCode().value()
consumeResponse(response)
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...instrumentation/springwebflux/client/SpringWebfluxHttpClientDoOnSuccessOrErrorTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ abstract class SpringWebfluxHttpClientDoOnSuccessOrErrorTest extends SpringWebfl

check()

response.statusCode().value()
consumeResponse(response)
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion .../trace/instrumentation/springwebflux/client/SpringWebfluxHttpClientDoOnSuccessTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class SpringWebfluxHttpClientDoOnSuccessTest extends SpringWebfluxHttpClientBase

check()

response.statusCode().value()
consumeResponse(response)
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...race/instrumentation/springwebflux/client/SpringWebfluxHttpClientDoOnTerminateTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class SpringWebfluxHttpClientDoOnTerminateTest extends SpringWebfluxHttpClientBa

check()

response.statusCode().value()
consumeResponse(response)
}

@Override
Expand Down
Loading