Skip to content

Commit 2d8a157

Browse files
committed
Get archive traces for es
Signed-off-by: Emmanuel Emonueje Ebenezer <[email protected]>
1 parent 256f608 commit 2d8a157

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

plugin/storage/integration/integration.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,12 @@ func (s *StorageIntegration) testArchiveTrace(t *testing.T) {
207207
var actual *model.Trace
208208
found := s.waitForCondition(t, func(_ *testing.T) bool {
209209
var err error
210-
iterTraces := s.ArchiveTraceReader.GetTraces(context.Background(), tracestore.GetTraceParams{TraceID: tID.ToOTELTraceID()})
211-
traces, err := v1adapter.V1TracesFromSeq2(iterTraces)
212-
if len(traces) > 0 {
213-
actual = traces[0]
214-
}
210+
// iterTraces := s.ArchiveTraceReader.GetTraces(context.Background(), tracestore.GetTraceParams{TraceID: tID.ToOTELTraceID()})
211+
// traces, err := v1adapter.V1TracesFromSeq2(iterTraces)
212+
// if len(traces) > 0 {
213+
// actual = traces[0]
214+
// }
215+
actual, err = s.ArchiveTraceReader.(*v1adapter.TraceReader).GetArchiveTraces(context.Background(), tracestore.GetTraceParams{TraceID: tID.ToOTELTraceID()})
215216
return err == nil && len(actual.Spans) >= len(expected.Spans)
216217
})
217218
require.True(t, found)

storage_v2/v1adapter/tracereader.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ func (tr *TraceReader) GetTraces(
6565
}
6666
}
6767

68+
func (tr *TraceReader) GetArchiveTraces(ctx context.Context, traceID tracestore.GetTraceParams) (*model.Trace, error) {
69+
tID := model.TraceIDFromOTEL(traceID.TraceID)
70+
return tr.spanReader.GetTrace(ctx, spanstore.GetTraceParameters{TraceID: tID})
71+
}
72+
6873
func (tr *TraceReader) GetServices(ctx context.Context) ([]string, error) {
6974
return tr.spanReader.GetServices(ctx)
7075
}

0 commit comments

Comments
 (0)