Do not create duplicate child-of reference from parentSpanId#860
Merged
yurishkuro merged 2 commits intomasterfrom Jun 5, 2018
Merged
Do not create duplicate child-of reference from parentSpanId#860yurishkuro merged 2 commits intomasterfrom
yurishkuro merged 2 commits intomasterfrom
Conversation
Signed-off-by: Yuri Shkuro <ys@uber.com>
yurishkuro
requested review from
black-adder,
jpkrohling,
pavolloffay and
vprithvi
as code owners
ghost
assigned
Signed-off-by: Yuri Shkuro <ys@uber.com>
black-adder
approved these changes
Jun 5, 2018
Codecov Report
@@ Coverage Diff @@
## master #860 +/- ##
=====================================
Coverage 100% 100%
=====================================
Files 120 120
Lines 5989 5989
=====================================
Hits 5989 5989
Continue to review full report at Codecov.
|
mabn
pushed a commit
to mabn/jaeger
that referenced
this pull request
Jun 13, 2018
* master: Add back quotes Adding CONTRIBUTING_GUIDELINES.md (jaegertracing#864) Close span writer in standalone (jaegertracing#863) Fix Process IP problem/inconsistency (jaegertracing#821) (jaegertracing#865) Use NewSpanID()/NewTraceID() instead of type-specific intializations (jaegertracing#861) Do not create duplicate child-of reference from parentSpanId (jaegertracing#860) Switch to codecov (jaegertracing#857) Log configuration options for memory storage (jaegertracing#852) Add jpkrohling to maintainers / code owners (jaegertracing#851)
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
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.
Fixes a bug introduced in #831. Resolves #859.
Issue: some Jaeger clients specify parent span via both
parentSpanIdfield and a span reference. The new methodmodel.MaybeAddParentSpanID(traceID, parentSpanID, refs)was checking for duplicate reference, but only of child-of type, which was incorrect, since there should be no situations when the same parent span is linked via two reference types.