Fix ParentReference to avoid moving a parent reference to the second …

…place Signed-off-by: Sherwood Wang <sherwoodwang@users.noreply.github.com>
jaegertracing · Jan 19, 2024 · 3d420a9 · 3d420a9
1 parent 88efe47
commit 3d420a9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/model/adjuster/parent_reference.go b/model/adjuster/parent_reference.go
@@ -26,7 +26,7 @@ func ParentReference() Adjuster {
 		for _, span := range trace.Spans {
 			firstChildOfRef := -1
 			firstOtherRef := -1
-			for i := 1; i < len(span.References); i++ {
+			for i := 0; i < len(span.References); i++ {
 				if span.References[i].TraceID == span.TraceID {
 					if span.References[i].RefType == model.SpanRefType_CHILD_OF {
 						firstChildOfRef = i
@@ -40,7 +40,7 @@ func ParentReference() Adjuster {
 			if swap == -1 {
 				swap = firstOtherRef
 			}
-			if swap != -1 {
+			if swap != 0 && swap != -1 {
 				span.References[swap], span.References[0] = span.References[0], span.References[swap]
 			}
 		}

diff --git a/model/adjuster/parent_reference_test.go b/model/adjuster/parent_reference_test.go
@@ -56,6 +56,11 @@ func TestParentReference(t *testing.T) {
 			incoming: []model.SpanRef{childOf(b)},
 			expected: []model.SpanRef{childOf(b)},
 		},
+		{
+			name:     "local, local follows - keep order",
+			incoming: []model.SpanRef{childOf(a), followsFrom(b)},
+			expected: []model.SpanRef{childOf(a), followsFrom(b)},
+		},
 		{
 			name:     "local and remote child in order",
 			incoming: []model.SpanRef{childOf(a), childOf(b)},