Merge pull request #156 from grafana/query-404

Correctly return trace not found to jaeger-query

cmd/tempo-query/tempo/plugin.go

@@ -38,6 +38,10 @@ func (b *Backend) GetTrace(ctx context.Context, traceID jaeger.TraceID) (*jaeger
 		return nil, fmt.Errorf("failed get to tempo %w", err)
 	}
 
+	if resp.StatusCode == http.StatusNotFound {
+		return nil, jaeger_spanstore.ErrTraceNotFound
+	}
+
 	out := &tempopb.Trace{}
 	unmarshaller := &jsonpb.Unmarshaler{}
 	err = unmarshaller.Unmarshal(resp.Body, out)
@@ -46,10 +50,6 @@ func (b *Backend) GetTrace(ctx context.Context, traceID jaeger.TraceID) (*jaeger
 	}
 	resp.Body.Close()
 
-	if len(out.Batches) == 0 {
-		return nil, fmt.Errorf("traceID not found: %s", hexID)
-	}
-
 	otTrace := ot_pdata.TracesFromOtlp(out.Batches)
 	jaegerBatches, err := ot_jaeger.InternalTracesToJaegerProto(otTrace)
 

modules/querier/http.go

@@ -2,6 +2,7 @@ package querier
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	"time"
 
@@ -44,6 +45,11 @@ func (q *Querier) TraceByIDHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if resp.Trace == nil || len(resp.Trace.Batches) == 0 {
+		http.Error(w, fmt.Sprintf("Unable to find %s", traceID), http.StatusNotFound)
+		return
+	}
+
 	marshaller := &jsonpb.Marshaler{}
 	err = marshaller.Marshal(w, resp.Trace)
 	if err != nil {