Tidy up for PR feedback

grafana · Sep 2, 2021 · a119dc2 · a119dc2
1 parent 0e781c1
commit a119dc2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/cmd/tempo-vulture/main.go b/cmd/tempo-vulture/main.go
@@ -383,11 +383,11 @@ func constructTraceFromEpoch(epoch time.Time) *tempopb.Trace {
 		// get the parentSpanID to match.  In the case of an empty []byte in place
 		// for the ParentSpanId, we set to nil here to ensure that the final result
 		// matches the json.Unmarshal value when tempo is queried.
-		for ib, b := range t.Batches {
-			for il, l := range b.InstrumentationLibrarySpans {
-				for is, s := range l.Spans {
+		for _, b := range t.Batches {
+			for _, l := range b.InstrumentationLibrarySpans {
+				for _, s := range l.Spans {
 					if len(s.GetParentSpanId()) == 0 {
-						t.Batches[ib].InstrumentationLibrarySpans[il].Spans[is].ParentSpanId = nil
+						s.ParentSpanId = nil
 					}
 				}
 			}

diff --git a/cmd/tempo-vulture/main_test.go b/cmd/tempo-vulture/main_test.go
@@ -253,4 +253,11 @@ func TestResponseFixture(t *testing.T) {
 	}
 }
 
+func TestEqualTraces(t *testing.T) {
+	seed := time.Now()
+	a := constructTraceFromEpoch(seed)
+	b := constructTraceFromEpoch(seed)
+	require.True(t, equalTraces(a, b))
+}
+
 func stringPointer(s string) *string { return &s }