util/tracing: fix an edge case for active span registration #70850
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
|
This change is |
tbg
requested review from
a team
and removed request for
tbg and
irfansharif
andreimatei
force-pushed
the
tracing.noop-parent
branch
2 times, most recently
from
11d726c
to
f07be42
Compare
rimadeodhar
approved these changes
Oct 1, 2021
There was a problem hiding this comment.
Reviewed 6 of 6 files at r1, 3 of 3 files at r2, all commit messages.
Reviewable status:complete! 0 of 0 LGTMs obtained (waiting on @aayushshah15 and @andreimatei)
pkg/util/tracing/span_options.go, line 147 at r2 (raw file):
// obligation to manually propagate the trace data to the parent Span. func WithParentAndAutoCollection(sp *Span) SpanOption { if sp == nil {
Nit: This can be written as:
if sp == nil || sp.IsNoop() {
return (*parentAndAutoCollectionOption)(nil)
}
return (*parentAndAutoCollectionOption)(sp)
This was hidden in an internal helper, but it's such a common concern that it deserves better ergonomics, and it even deserves to be public. Release note: None
Before this patch, a span with a no-op parent (as opposed to a span with no parent), would not be present in the active spans registry. The code was confused: the span didn't qualify as a "local root" because it had a local parent, but of course it also wasn't really recorded by the local parent cause a no-op span can't record anything. As such, the span in question was missing from the registry. This patch makes a span with a no-op parent behave like a root span. Release note: None
andreimatei
force-pushed
the
tracing.noop-parent
branch
from
f07be42
to
f299cf2
Compare
andreimatei
commented
Oct 1, 2021
There was a problem hiding this comment.
TFTR!
bors r+
Reviewable status:
pkg/util/tracing/span_options.go, line 147 at r2 (raw file):
Previously, rimadeodhar (Rima Deodhar) wrote…
Nit: This can be written as:
if sp == nil || sp.IsNoop() { return (*parentAndAutoCollectionOption)(nil) } return (*parentAndAutoCollectionOption)(sp)
done
|
Build succeeded: |
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.
Before this patch, a span with a no-op parent (as opposed to a span
with no parent), would not be present in the active spans registry. The
code was confused: the span didn't qualify as a "local root" because it
had a local parent, but of course it also wasn't really recorded by the
local parent cause a no-op span can't record anything. As such, the span
in question was missing from the registry.
This patch makes a span with a no-op parent behave like a root span.
Release note: None