GH-9259: Fix Reactor context propagation on reactive reply #9284
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…eply Fixes: spring-projects#9259 The `Mono.toFuture()` does not propagate context to thread locals of the `CompletableFuture` consumer. See `MonoToCompletableFuture` * Fix `AbstractMessageProducingHandler` to convert reply `Mono` to `CompletableFuture` manually. Use `doOnEach()` and set thread locals from the Reactor context manually around `replyFuture.complete()/completeExceptionally()` * Add respective unit test into `WebFluxObservationPropagationTests` to ensure that same trace is used in downstream endpoints after WebFlux client reply **Auto-cherry-pick to `6.3.x` & `6.2.x`**
sobychacko
approved these changes
Jun 28, 2024
spring-builds
pushed a commit
that referenced
this pull request
Jun 28, 2024
Fixes: #9259 The `Mono.toFuture()` does not propagate context to thread locals of the `CompletableFuture` consumer. See `MonoToCompletableFuture` * Fix `AbstractMessageProducingHandler` to convert reply `Mono` to `CompletableFuture` manually. Use `doOnEach()` and set thread locals from the Reactor context manually around `replyFuture.complete()/completeExceptionally()` * Add respective unit test into `WebFluxObservationPropagationTests` to ensure that same trace is used in downstream endpoints after WebFlux client reply (cherry picked from commit 4a77dbc)
spring-builds
pushed a commit
that referenced
this pull request
Jun 28, 2024
Fixes: #9259 The `Mono.toFuture()` does not propagate context to thread locals of the `CompletableFuture` consumer. See `MonoToCompletableFuture` * Fix `AbstractMessageProducingHandler` to convert reply `Mono` to `CompletableFuture` manually. Use `doOnEach()` and set thread locals from the Reactor context manually around `replyFuture.complete()/completeExceptionally()` * Add respective unit test into `WebFluxObservationPropagationTests` to ensure that same trace is used in downstream endpoints after WebFlux client reply (cherry picked from commit 4a77dbc)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #9259
The
Mono.toFuture()does not propagate context to thread locals of theCompletableFutureconsumer. SeeMonoToCompletableFutureAbstractMessageProducingHandlerto convert replyMonotoCompletableFuturemanually. UsedoOnEach()and set thread locals from the Reactor context manually aroundreplyFuture.complete()/completeExceptionally()WebFluxObservationPropagationTeststo ensure that same trace is used in downstream endpoints after WebFlux client replyAuto-cherry-pick to
6.3.x&6.2.x