Introduce ParentReference adjuster #3786
Merged
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
bobrik
force-pushed
the
ivan/reference-sorter-adjuster
branch
from
215cce0
to
816f274
Compare
Codecov Report
@@ Coverage Diff @@
## main #3786 +/- ##
==========================================
+ Coverage 97.58% 97.59% +0.01%
==========================================
Files 288 289 +1
Lines 16778 16800 +22
==========================================
+ Hits 16372 16396 +24
+ Misses 321 319 -2
Partials 85 85
Continue to review full report at Codecov.
|
yurishkuro
reviewed
Jun 28, 2022
model/adjuster/sort_references.go
Outdated
| sort.SliceStable(span.References, func(i, j int) bool { | ||
| iType := span.References[i].GetRefType() | ||
| jType := span.References[j].GetRefType() | ||
| return iType == model.SpanRefType_CHILD_OF && jType == model.SpanRefType_FOLLOWS_FROM |
There was a problem hiding this comment.
I don't think this is a sufficient condition. The logic to pick the correct parent should be:
- first ref with refType=CHILD_OF and the same trace ID
- otherwise, first ref that has the same trace ID
- otherwise no change
Also, I would avoid the actual sorting, and only do the swap into the first position.
There was a problem hiding this comment.
Makes sense, updated.
bobrik
force-pushed
the
ivan/reference-sorter-adjuster
branch
from
816f274
to
0db7af1
Compare
bobrik
changed the title
As demonstrated in https://github.com/jaegertracing/jaeger-ui/issues/966, jaeger-ui expects the first reference to be of `CHILD_OF` type to properly render the tree. This new adjuster achieves exactly that. Signed-off-by: Ivan Babrou <github@ivan.computer>
bobrik
force-pushed
the
ivan/reference-sorter-adjuster
branch
from
0db7af1
to
119210c
Compare
Signed-off-by: Yuri Shkuro <github@ysh.us>
yurishkuro
approved these changes
Jul 1, 2022
albertteoh
pushed a commit
to albertteoh/jaeger
that referenced
this pull request
Jul 13, 2022
* Introduce ParentReference adjuster As demonstrated in https://github.com/jaegertracing/jaeger-ui/issues/966, jaeger-ui expects the first reference to be of `CHILD_OF` type to properly render the tree. This new adjuster achieves exactly that. Signed-off-by: Ivan Babrou <github@ivan.computer> * Simplify algorithm, clean-up tests Signed-off-by: Yuri Shkuro <github@ysh.us> Co-authored-by: Yuri Shkuro <github@ysh.us> Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
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.
As demonstrated in https://github.com/jaegertracing/jaeger-ui/issues/966, jaeger-ui expects the first reference to be of
CHILD_OFtype to properly render the tree. This new adjuster achieves exactly that.Resolves #3785