Skip to content
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.

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

Clear context before flux retry #8456

Merged
merged 3 commits into from
May 10, 2023
Merged

Conversation

laurit
Copy link
Contributor

@laurit laurit commented May 9, 2023

Resolves #8454
Flux retry calls subscribe from onError where we might have active context. We need to clear the context before subscribe is called to avoid having retried operations run with that context. This pr handles handles Flux.retry and Flux.retryWhen it is possible that there are more methods with he same issue.

@laurit laurit requested a review from a team May 9, 2023 18:09
Copy link
Member

@trask trask left a comment

Choose a reason for hiding this comment

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

nice 👍

Comment on lines 433 to 447
Flux.defer(() -> publish.delaySubscription(Duration.ofMillis(1)))
.doOnNext(
message -> {
tracer.spanBuilder("process " + message).startSpan().end();
})
.handle(
(message, sink) -> {
if (message == 1 && beforeRetry.compareAndSet(true, false)) {
sink.error(new RuntimeException("Message has error"));
} else {
sink.next(message);
}
})
.retry()
.subscribe();
Copy link
Member

Choose a reason for hiding this comment

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

can you add a test where there's an active parent span when .subscribe() is called?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added a test with parent span, all child spans are under that parent.

@trask
Copy link
Member

trask commented May 9, 2023

cc @lmolkova

@trask trask added this to the v1.26.0 milestone May 9, 2023
Copy link
Contributor

@lmolkova lmolkova left a comment

Choose a reason for hiding this comment

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

Thank you!

On a side note, I think we need to revisit context propagation in Reactor. It seems by propagating context beyond current operation (into consequent operations such as flatMap), we're leaking it.

I did not have a chance to investigate deeply, but we're seeing issues where all operations happening in background threads (where there is no incoming request or another parent) are correlated to something random happening on this thread (e.g. Azure/azure-sdk-for-java#32807).

I want to look into new reactor context propagation helpers once I get a chance, but it does not block this PR :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Repeated span_id and trace_id after re-subscribing to a Flux sequence because of error (retry)
4 participants