dedupe-spans

Signed-off-by: Yuri Shkuro <[email protected]>

plugin/storage/integration/integration.go

@@ -206,7 +206,7 @@ func (s *StorageIntegration) testGetLargeSpan(t *testing.T) {
 	found := s.waitForCondition(t, func(t *testing.T) bool {
 		var err error
 		actual, err = s.SpanReader.GetTrace(context.Background(), expectedTraceID)
-		return err == nil && len(actual.Spans) == len(expected.Spans)
+		return err == nil && len(actual.Spans) >= len(expected.Spans)
 	})
 	if !assert.True(t, found) {
 		CompareTraces(t, expected, actual)

plugin/storage/integration/trace_compare.go

@@ -47,6 +47,20 @@ func CompareSliceOfTraces(t *testing.T, expected []*model.Trace, actual []*model
 	}
 }
 
+// trace.Spans may contain spans with the same SpanID. Remove duplicates
+// and keep the first one. Use a map to keep track of the spans we've seen.
+func dedupeSpans(trace *model.Trace) {
+	seen := make(map[model.SpanID]bool)
+	var newSpans []*model.Span
+	for _, span := range trace.Spans {
+		if !seen[span.SpanID] {
+			seen[span.SpanID] = true
+			newSpans = append(newSpans, span)
+		}
+	}
+	trace.Spans = newSpans
+}
+
 // CompareTraces compares two traces
 func CompareTraces(t *testing.T, expected *model.Trace, actual *model.Trace) {
 	if expected.Spans == nil {
@@ -55,6 +69,14 @@ func CompareTraces(t *testing.T, expected *model.Trace, actual *model.Trace) {
 	}
 	require.NotNil(t, actual)
 	require.NotNil(t, actual.Spans)
+
+	// some storage implementation may retry writing of spans and end up with duplicates.
+	countBefore := len(actual.Spans)
+	dedupeSpans(actual)
+	if countAfter := len(actual.Spans); countAfter != countBefore {
+		t.Logf("Removed spans with duplicate span IDs; before=%d, after=%d", countBefore, countAfter)
+	}
+
 	model.SortTrace(expected)
 	model.SortTrace(actual)
 	checkSize(t, expected, actual)

plugin/storage/integration/trace_compare_test.go

@@ -0,0 +1,30 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package integration
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/jaegertracing/jaeger/model"
+)
+
+func TestDedupeSpans(t *testing.T) {
+	trace := &model.Trace{
+		Spans: []*model.Span{
+			{
+				SpanID: 1,
+			},
+			{
+				SpanID: 1,
+			},
+			{
+				SpanID: 2,
+			},
+		},
+	}
+	dedupeSpans(trace)
+	assert.Len(t, trace.Spans, 2)
+}