Simplify webflux mono handling #3816
Merged
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
trask
requested review from
anuraaga,
iNikem,
jkwatson,
laurit,
mateuszrzeszutek,
pavolloffay and
tylerbenson
as code owners
mateuszrzeszutek
approved these changes
Aug 11, 2021
This reverts commit 484cafa.
anuraaga
approved these changes
Aug 12, 2021
| return Operators.lift( | ||
| (scannable, subscriber) -> new SpanFinishingSubscriber<>(subscriber, context)); | ||
| public static <T> Mono<T> setPublisherSpan(Mono<T> mono, Context context) { | ||
| return mono.doOnError(t -> finishSpanIfPresent(context, t)) |
There was a problem hiding this comment.
Any thoughts on doOnError only setting the exception and doOnTerminate finishing the span?
There was a problem hiding this comment.
that doesn't really fit the Instrumenter model though, of calling end() and passing the exception?
There was a problem hiding this comment.
(Instrumenter coming in #3798)
This reverts commit dacc0c1.
laurit
approved these changes
Aug 12, 2021
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.
Splitting the more problematic (and independent) part of #3798 out into a separate PR for better scrutiny/history.
Based on @HaloFour's #3798 (comment), I realized that the change in #3789 that seems to fix the flakiness that we previously fixed via #3150, is not the change in instrumentation placement, but the registeration of a cancellation handler using Mono's
doOnCancel.