Fix Failures After Merge

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

cmd/query/app/http_handler.go

@@ -361,14 +361,6 @@ func (aH *APIHandler) metrics(w http.ResponseWriter, r *http.Request, getMetrics
 	aH.writeJSON(w, r, m)
 }
 
-func (aH *APIHandler) convertModelToUI(trc *model.Trace, adjust bool) *ui.Trace {
-	if adjust {
-		aH.queryService.Adjust(trc)
-	}
-	uiTrace := uiconv.FromDomain(trc)
-	return uiTrace
-}
-
 func (*APIHandler) deduplicateDependencies(dependencies []model.DependencyLink) []ui.DependencyLink {
 	type Key struct {
 		parent string

cmd/query/app/http_handler_test.go

@@ -338,7 +338,10 @@ func TestGetTrace(t *testing.T) {
 
 			ts := initializeTestServer(t, HandlerOptions.Tracer(jTracer.OTEL))
 
-			ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), spanstore.GetTraceParameters{TraceID: model.NewTraceID(0, 0x123456abc)}).
+			ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), spanstore.GetTraceParameters{
+				TraceID:   model.NewTraceID(0, 0x123456abc),
+				RawTraces: testCase.suffix == "?raw=true",
+			}).
 				Return(makeMockTrace(t), nil).Once()
 
 			var response structuredResponse

cmd/query/app/querysvc/query_service.go

@@ -78,9 +78,9 @@ func (qs QueryService) GetTrace(ctx context.Context, query spanstore.GetTracePar
 		return nil, err
 	}
 	if !query.RawTraces {
-		trace, err = qs.adjust(trace)
+		qs.adjust(trace)
 	}
-	return trace, err
+	return trace, nil
 }
 
 // GetServices is the queryService implementation of spanstore.Reader.GetServices
@@ -113,10 +113,7 @@ func (qs QueryService) FindTraces(ctx context.Context, query *spanstore.TraceQue
 	traces, err := spanReader.FindTraces(ctx, query)
 	if !query.RawTraces {
 		for _, trace := range traces {
-			_, err := qs.adjust(trace)
-			if err != nil {
-				return nil, err
-			}
+			qs.adjust(trace)
 		}
 	}
 	return traces, err