handle follows from as parent span id

Signed-off-by: Jakub Rydz <niechzyjetequila@gmail.com>
jaegertracing · Apr 14, 2023 · c46960b · c46960b
1 parent 506adaf
commit c46960b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/model/adjuster/clockskew.go b/model/adjuster/clockskew.go
@@ -119,7 +119,6 @@ func (a *clockSkewAdjuster) buildNodesMap() {
 func (a *clockSkewAdjuster) buildSubGraphs() {
 	a.roots = make(map[model.SpanID]*node)
 	for _, n := range a.spans {
-		// TODO handle FOLLOWS_FROM references
 		if n.span.ParentSpanID() == 0 {
 			a.roots[n.span.SpanID] = n
 			continue

diff --git a/model/span.go b/model/span.go
@@ -101,7 +101,7 @@ func (s *Span) NormalizeTimestamps() {
 func (s *Span) ParentSpanID() SpanID {
 	for i := range s.References {
 		ref := &s.References[i]
-		if ref.TraceID == s.TraceID && ref.RefType == ChildOf {
+		if ref.TraceID == s.TraceID && (ref.RefType == ChildOf || ref.RefType == FollowsFrom) {
 			return ref.SpanID
 		}
 	}

diff --git a/model/span_test.go b/model/span_test.go
@@ -279,6 +279,10 @@ func TestParentSpanID(t *testing.T) {
 
 	span.References = []model.SpanRef{
 		model.NewFollowsFromRef(span.TraceID, model.NewSpanID(777)),
+	}
+	assert.Equal(t, model.NewSpanID(777), span.ParentSpanID())
+
+	span.References = []model.SpanRef{
 		model.NewChildOfRef(span.TraceID, model.NewSpanID(888)),
 	}
 	assert.Equal(t, model.NewSpanID(888), span.ParentSpanID())