Fix Span.current() behavior with OTel - return Optional.empty() if there is no current span #8574
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
…current span Signed-off-by: Tim Quinn <tim.quinn@oracle.com>
oracle-contributor-agreement
bot
added
the
OCA Verified
ljnelson
approved these changes
Mar 27, 2024
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.
Description
Resolves #8573
For some time, our OTel implementation of
Span.current()used OTel'sSpan.current()which (also for some time) always returns a value. If there is no current span, OTel returns a new no-op span (with the trace and span IDs set to 0). (Because Jaeger has come to rely on OTel as well, this affected the Jaeger current span behavior as well.)But our
Span.current()contract says we returnOptional.empty()if there is no current span.This PR instead uses OTel's
Span.fromContextOrNullto retrieve the actual current span if there is one or 'null' if there is none. Then our code wraps that in anOptional, thus honoring the documented contract.Documentation
Bug fix; no doc impact