Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not create duplicate child-of reference from parentSpanId #860

Merged
merged 2 commits into from
Jun 5, 2018

Conversation

yurishkuro
Copy link
Member

@yurishkuro yurishkuro commented Jun 5, 2018

Fixes a bug introduced in #831. Resolves #859.

Issue: some Jaeger clients specify parent span via both parentSpanId field and a span reference. The new method model.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.

Signed-off-by: Yuri Shkuro <ys@uber.com>
Signed-off-by: Yuri Shkuro <ys@uber.com>
@codecov
Copy link

codecov bot commented Jun 5, 2018

Codecov Report

Merging #860 into master will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@          Coverage Diff          @@
##           master   #860   +/-   ##
=====================================
  Coverage     100%   100%           
=====================================
  Files         120    120           
  Lines        5989   5989           
=====================================
  Hits         5989   5989
Impacted Files Coverage Δ
model/spanref.go 100% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8ed44f2...7d0a554. Read the comment docs.

@yurishkuro yurishkuro merged commit 50f39f3 into master Jun 5, 2018
@ghost ghost removed the review label Jun 5, 2018
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)
@pavolloffay pavolloffay deleted the parent-span-id-fix-859 branch November 5, 2018 12:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants