refactor to use archive trace reader-writer

Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
jaegertracing · Jan 26, 2025 · 71b5e38 · 71b5e38
1 parent 6ab854c
commit 71b5e38
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/plugin/storage/integration/integration.go b/plugin/storage/integration/integration.go
@@ -206,12 +206,11 @@ func (s *StorageIntegration) testArchiveTrace(t *testing.T) {
 	var actual *model.Trace
 	found := s.waitForCondition(t, func(_ *testing.T) bool {
 		var err error
-		// iterTraces := s.ArchiveTraceReader.GetTraces(context.Background(), tracestore.GetTraceParams{TraceID: tID.ToOTELTraceID()})
-		// traces, err := v1adapter.V1TracesFromSeq2(iterTraces)
-		// if len(traces) > 0 {
-		// 	actual = traces[0]
-		// }
-		actual, err = s.ArchiveTraceReader.(*v1adapter.TraceReader).GetArchiveTraces(context.Background(), tracestore.GetTraceParams{TraceID: tID.ToOTELTraceID()})
+		iterTraces := s.ArchiveTraceReader.GetTraces(context.Background(), tracestore.GetTraceParams{TraceID: v1adapter.FromV1TraceID(tID)})
+		traces, err := v1adapter.V1TracesFromSeq2(iterTraces)
+		if len(traces) > 0 {
+			actual = traces[0]
+		}
 		return err == nil && len(actual.Spans) >= len(expected.Spans)
 	})
 	require.True(t, found)

diff --git a/storage_v2/v1adapter/tracereader.go b/storage_v2/v1adapter/tracereader.go
@@ -65,11 +65,6 @@ func (tr *TraceReader) GetTraces(
 	}
 }
 
-func (tr *TraceReader) GetArchiveTraces(ctx context.Context, traceID tracestore.GetTraceParams) (*model.Trace, error) {
-	tID := model.TraceIDFromOTEL(traceID.TraceID)
-	return tr.spanReader.GetTrace(ctx, spanstore.GetTraceParameters{TraceID: tID})
-}
-
 func (tr *TraceReader) GetServices(ctx context.Context) ([]string, error) {
 	return tr.spanReader.GetServices(ctx)
 }