Fix SpanKey bridging for unbridgeable span #12511
Merged
Conversation
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
trask
approved these changes
Oct 24, 2024
Member
trask
left a comment
trask
left a comment
There was a problem hiding this comment.
makes sense, basically giving priority to the agent span key and if not found then falling back to the application span key (if any)
...va/io/opentelemetry/javaagent/instrumentation/instrumentationapi/SpanKeyInstrumentation.java
Outdated
Show resolved
Hide resolved
…c/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/SpanKeyInstrumentation.java Co-authored-by: Trask Stalnaker <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Resolves #12504
In case of unbridgeable span we currently return
nullcontext fromSpanKey.storeInContextwhich is unexpected. This PR changes the behavior so that when the span can't be bridged we'll let the original method proceed and store the span using the unbridged key in the application context. Similarly reading the span will fall back to the application context when the span is not found from the agent context.