test: extend GetTraceWithRawTracesParameter to verify span deduplication based on the raw parameter.

Author: aliyasirnac

cmd/jaeger/internal/extension/jaegerquery/internal/http_handler_test.go

@@ -447,25 +447,51 @@ func TestGetTraceBadTimeWindow(t *testing.T) {
 }
 
 func TestGetTraceWithRawTracesParameter(t *testing.T) {
-	// TODO: extend the test cases to ensure raw traces are obtained
-	// when the flag is set once the differentiating logic has been implemented
+	// Create a trace with a duplicate span (span1 and span3 share SpanID=1).
+	// When raw=false, the standard adjusters deduplicate spans, returning 2.
+	// When raw=true, no adjusters run, so all 3 spans are returned as-is.
+	makeMockTraceWithDupe := func() ptrace.Traces {
+		trace := ptrace.NewTraces()
+		resources := trace.ResourceSpans().AppendEmpty()
+		resources.Resource().Attributes().PutStr("service.name", "service")
+		scopes := resources.ScopeSpans().AppendEmpty()
+
+		span1 := scopes.Spans().AppendEmpty()
+		span1.SetTraceID(v1adapter.FromV1TraceID(mockTraceID))
+		span1.SetSpanID(v1adapter.FromV1SpanID(model.NewSpanID(1)))
+
+		span2 := scopes.Spans().AppendEmpty()
+		span2.SetTraceID(v1adapter.FromV1TraceID(mockTraceID))
+		span2.SetSpanID(v1adapter.FromV1SpanID(model.NewSpanID(2)))
+
+		span3 := scopes.Spans().AppendEmpty()
+		span3.SetTraceID(v1adapter.FromV1TraceID(mockTraceID))
+		span3.SetSpanID(v1adapter.FromV1SpanID(model.NewSpanID(1)))
+
+		return trace
+	}
+
 	tests := []struct {
-		rawTraces bool
+		rawTraces        bool
+		expectedNumSpans int
 	}{
-		{rawTraces: true},
-		{rawTraces: false},
+		{rawTraces: true, expectedNumSpans: 3},
+		{rawTraces: false, expectedNumSpans: 2},
 	}
 	for _, test := range tests {
 		t.Run(fmt.Sprintf("rawTraces=%v", test.rawTraces), func(t *testing.T) {
 			ts := initializeTestServer(t)
 			ts.traceReader.On("GetTraces", mock.Anything, mock.MatchedBy(func(params []tracestore.GetTraceParams) bool {
 				return len(params) == 1 && params[0].TraceID == v1adapter.FromV1TraceID(mockTraceID)
-			})).Return(tracesIter(makeMockPTrace())).Once()
+			})).Return(tracesIter(makeMockTraceWithDupe())).Once()
 
 			var response structuredResponse
 			err := getJSON(fmt.Sprintf("%s/api/traces/%s?raw=%v", ts.server.URL, mockTraceID.String(), test.rawTraces), &response)
 			require.NoError(t, err)
 			assert.Empty(t, response.Errors)
+
+			traces := extractTraces(t, &response)
+			assert.Len(t, traces[0].Spans, test.expectedNumSpans)
 		})
 	}
 }