Make reactor-core / reactive-streams context propagation Context-first#11578
Open
amarziali wants to merge 3 commits into
Open
Make reactor-core / reactive-streams context propagation Context-first#11578amarziali wants to merge 3 commits into
amarziali wants to merge 3 commits into
Conversation
Contributor
🟢 Java Benchmark SLOs — All performance SLOs passed
PR vs. master results
Commit: Load and DaCapo benchmarks can be triggered manually in the GitLab pipeline. Results will appear in the Benchmarking Platform UI after completion. |
PerfectSlayer
added
the
tag: concurrency
mcculls
reviewed
Jun 8, 2026
mcculls
reviewed
Jun 8, 2026
mcculls
reviewed
Jun 8, 2026
mcculls
reviewed
Jun 8, 2026
| public static ContextScope activateOnSignal( | ||
| final Subscriber<?> subscriber, final ContextStore<Subscriber, Context> subscriberContexts) { | ||
| final Context activeContext = Java8BytecodeBridge.getCurrentContext(); | ||
| if (nonRootContext(activeContext) != null) { |
Contributor
There was a problem hiding this comment.
prefer if (context == Context.root()) {
Contributor
Author
There was a problem hiding this comment.
nonRootContext was null if == root so replaced with if (context != Context.root()) {
mcculls
reviewed
Jun 8, 2026
|
|
||
| private static ContextScope attachIfRequired( | ||
| final Context context, final Context activeContext, final boolean allowReplacingActive) { | ||
| if (nonRootContext(context) == null || context == activeContext) { |
Contributor
There was a problem hiding this comment.
if (context == activeContext || context == Context.root()) {
Contributor
Author
There was a problem hiding this comment.
OK but I also left the null check since there is a call that takes context from the contextStore (hence can be null)
mcculls
reviewed
Jun 8, 2026
mcculls
reviewed
Jun 8, 2026
mcculls
reviewed
Jun 8, 2026
mcculls
reviewed
Jun 8, 2026
This comment has been minimized.
This comment has been minimized.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
What Does This Do
Reworks the reactor-core-3.1 and reactive-streams-1.0 instrumentations to propagate the full Context (instead of just AgentSpan). The new behaviour refactor only a bit the code and should not add major changes.
The context is only propagated on the reactor chain - the user can only infer a SpanContext but not a full one since Context is not part of the public API.
Also, we used instanceOf to identify Reactor's context-aware types on the hot-path. This has been changed by type matching at transform time that will be more efficient.
Additional tests have been added for the full context propagation cases and also to avoid reintroducing perf regressions because of reading the reactor context each time in the hot path.
Motivation
Additional Notes
Contributor Checklist
type:and (comp:orinst:) labels in addition to any other useful labelsclose,fix, or any linking keywords when referencing an issueUse
solvesinstead, and assign the PR milestone to the issue/merge. You can also:/merge --commit-message "..."/merge -c/merge -f --reason "reason"; please use this judiciously, as some checks do not run at the PR-level (note: the PR still needs to be mergeable, this will only skip the pre-merge build)Jira ticket: [PROJ-IDENT]