Return Timestamps From GetTraceIDs

Signed-off-by: Mahad Zaryab <[email protected]>

cmd/jaeger/internal/integration/trace_reader.go

@@ -12,7 +12,6 @@ import (
 	"math"
 	"strings"
 
-	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
@@ -138,7 +137,7 @@ func (r *traceReader) FindTraces(
 func (*traceReader) FindTraceIDs(
 	_ context.Context,
 	_ tracestore.TraceQueryParams,
-) iter.Seq2[[]pcommon.TraceID, error] {
+) iter.Seq2[[]tracestore.GetTraceParams, error] {
 	panic("not implemented")
 }
 

internal/storage/v2/api/tracestore/reader.go

@@ -61,7 +61,7 @@ type Reader interface {
 	// of matching trace IDs. This is useful in some contexts, such as batch jobs, where a
 	// large list of trace IDs may be queried first and then the full traces are loaded
 	// in batches.
-	FindTraceIDs(ctx context.Context, query TraceQueryParams) iter.Seq2[[]pcommon.TraceID, error]
+	FindTraceIDs(ctx context.Context, query TraceQueryParams) iter.Seq2[[]GetTraceParams, error]
 }
 
 // GetTraceParams contains single-trace parameters for a GetTraces request.

internal/storage/v2/v1adapter/tracereader.go

@@ -8,7 +8,6 @@ import (
 	"errors"
 	"iter"
 
-	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
@@ -113,18 +112,20 @@ func (tr *TraceReader) FindTraces(
 func (tr *TraceReader) FindTraceIDs(
 	ctx context.Context,
 	query tracestore.TraceQueryParams,
-) iter.Seq2[[]pcommon.TraceID, error] {
-	return func(yield func([]pcommon.TraceID, error) bool) {
+) iter.Seq2[[]tracestore.GetTraceParams, error] {
+	return func(yield func([]tracestore.GetTraceParams, error) bool) {
 		traceIDs, err := tr.spanReader.FindTraceIDs(ctx, query.ToSpanStoreQueryParameters())
 		if err != nil {
 			yield(nil, err)
 			return
 		}
-		otelIDs := make([]pcommon.TraceID, 0, len(traceIDs))
+		getTraceParams := make([]tracestore.GetTraceParams, 0, len(traceIDs))
 		for _, traceID := range traceIDs {
-			otelIDs = append(otelIDs, FromV1TraceID(traceID))
+			getTraceParams = append(getTraceParams, tracestore.GetTraceParams{
+				TraceID: FromV1TraceID(traceID),
+			})
 		}
-		yield(otelIDs, nil)
+		yield(getTraceParams, nil)
 	}
 }
 

internal/storage/v2/v1adapter/translator.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
 	"github.com/jaegertracing/jaeger/internal/jptrace"
+	"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
 )
 
 // V1BatchesFromTraces converts OpenTelemetry traces (ptrace.Traces)
@@ -62,18 +63,18 @@ func V1TracesFromSeq2(otelSeq iter.Seq2[[]ptrace.Traces, error]) ([]*model.Trace
 	return jaegerTraces, nil
 }
 
-func V1TraceIDsFromSeq2(traceIDsIter iter.Seq2[[]pcommon.TraceID, error]) ([]model.TraceID, error) {
+func V1TraceIDsFromSeq2(traceIDsIter iter.Seq2[[]tracestore.GetTraceParams, error]) ([]model.TraceID, error) {
 	var (
 		iterErr       error
 		modelTraceIDs []model.TraceID
 	)
-	traceIDsIter(func(traceIDs []pcommon.TraceID, err error) bool {
+	traceIDsIter(func(getTraceParams []tracestore.GetTraceParams, err error) bool {
 		if err != nil {
 			iterErr = err
 			return false
 		}
-		for _, traceID := range traceIDs {
-			modelTraceIDs = append(modelTraceIDs, ToV1TraceID(traceID))
+		for _, param := range getTraceParams {
+			modelTraceIDs = append(modelTraceIDs, ToV1TraceID(param.TraceID))
 		}
 		return true
 	})