Properly return Optional.empty() for current span if there is no current OTel span #8583
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
…ent OTel span Signed-off-by: Tim Quinn <tim.quinn@oracle.com>
oracle-contributor-agreement
bot
added
the
OCA Verified
ljnelson
reviewed
Mar 28, 2024
| @@ -90,10 +97,17 @@ public static Tracer globalTracer() { | |||
| * @return optional of the current span | |||
| */ | |||
| public static Optional<Span> activeSpan() { | |||
| // OTel returns a no-op span if there is no current one. | |||
| io.opentelemetry.api.trace.Span otelSpan = io.opentelemetry.api.trace.Span.current(); | |||
| io.opentelemetry.context.Context otelContext = io.opentelemetry.context.Context.current(); | |||
There was a problem hiding this comment.
I think this entire method can be just:
return Optional.ofNullable(io.opentelemetry.api.trace.Span.fromContextOrNull(io.opentelemetry.context.Context.current()))
.map(otelSpan -> HelidonOpenTelemetry.create(otelSpan, io.opentelemetry.api.baggage.Baggage.current());
(Some static imports would make this a little easier, maybe.) What do you think?
ljnelson
approved these changes
Mar 28, 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 #8575
Basically a forward-port of the 3.x fix for the same problem; see the comment there for details. #8574 (comment)
Documentation
But fix; no doc impact