opensource/loki
1
0
Fork 0
mirror of https://github.com/grafana/loki.git synced 2026-03-13 09:33:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(querytee): Compare parsed labels instead of structured metadata (#21018)

Browse Source
This commit is contained in:
Dylan Guedes
2026-03-02 07:36:43 -03:00
committed by GitHub
parent 0ebaec55d8
commit 7a5ef78c04
2 changed files with 71 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/querytee/comparator/response_comparator.go
View File

@@ -459,7 +459,7 @@ func compareStreams(expectedRaw, actualRaw json.RawMessage, evaluationTime time.
return &ComparisonSummary{MismatchCause: CauseParsedLabelsCountMismatch}, fmt.Errorf("expected %d parsed label pairs for timestamp %v but got %d pairs for stream %s: %w", expectedSamplePair.Parsed.Len(),
expectedSamplePair.Timestamp.UnixNano(), actualSamplePair.Parsed.Len(), expectedStream.Labels, ErrComparisonMismatch)
}
if !labels.Equal(expectedSamplePair.StructuredMetadata, actualSamplePair.StructuredMetadata) {
if !labels.Equal(expectedSamplePair.Parsed, actualSamplePair.Parsed) {
return &ComparisonSummary{MismatchCause: CauseParsedLabelsMismatch}, fmt.Errorf("expected parsed labels %v for timestamp %v but got %v for stream %s: %w", expectedSamplePair.Parsed.String(),
expectedSamplePair.Timestamp.UnixNano(), actualSamplePair.Parsed.String(), expectedStream.Labels, ErrComparisonMismatch)
}

70
pkg/querytee/comparator/response_comparator_test.go
View File

@@ -632,6 +632,76 @@ func TestCompareStreams(t *testing.T) {
}
}
func TestCompareStreams_ParsedLabels(t *testing.T) {
for _, tc := range []struct {
name string
expected json.RawMessage
actual json.RawMessage
err error
expectMismatch bool
mismatchCause string
}{
{
name: "matching parsed labels",
expected: json.RawMessage(`[
{"stream":{"foo":"bar"},"values":[["1","line1",{"structuredMetadata":{"trace":"123"},"parsed":{"level":"info"}}]]}
]`),
actual: json.RawMessage(`[
{"stream":{"foo":"bar"},"values":[["1","line1",{"structuredMetadata":{"trace":"123"},"parsed":{"level":"info"}}]]}
]`),
},
{
name: "different parsed labels count",
expected: json.RawMessage(`[
{"stream":{"foo":"bar"},"values":[["1","line1",{"structuredMetadata":{"trace":"123"},"parsed":{"level":"info","msg":"hello"}}]]}
]`),
actual: json.RawMessage(`[
{"stream":{"foo":"bar"},"values":[["1","line1",{"structuredMetadata":{"trace":"123"},"parsed":{"level":"info"}}]]}
]`),
err: errors.New("expected 2 parsed label pairs for timestamp 1 but got 1 pairs for stream"),
expectMismatch: true,
mismatchCause: CauseParsedLabelsCountMismatch,
},
{
name: "different parsed labels values",
expected: json.RawMessage(`[
{"stream":{"foo":"bar"},"values":[["1","line1",{"structuredMetadata":{"trace":"123"},"parsed":{"level":"info"}}]]}
]`),
actual: json.RawMessage(`[
{"stream":{"foo":"bar"},"values":[["1","line1",{"structuredMetadata":{"trace":"123"},"parsed":{"level":"error"}}]]}
]`),
err: errors.New("expected parsed labels"),
expectMismatch: true,
mismatchCause: CauseParsedLabelsMismatch,
},
{
name: "same structured metadata but different parsed labels",
expected: json.RawMessage(`[
{"stream":{"foo":"bar"},"values":[["1","line1",{"structuredMetadata":{"trace":"123"},"parsed":{"level":"info"}}]]}
]`),
actual: json.RawMessage(`[
{"stream":{"foo":"bar"},"values":[["1","line1",{"structuredMetadata":{"trace":"123"},"parsed":{"level":"warn"}}]]}
]`),
err: errors.New("expected parsed labels"),
expectMismatch: true,
mismatchCause: CauseParsedLabelsMismatch,
},
} {
t.Run(tc.name, func(t *testing.T) {
summary, err := compareStreams(tc.expected, tc.actual, time.Now(), SampleComparisonOptions{})
if tc.err == nil {
require.NoError(t, err)
return
}
assertError(t, err, tc.err, tc.expectMismatch)
if tc.mismatchCause != "" {
require.NotNil(t, summary)
require.Equal(t, tc.mismatchCause, summary.MismatchCause)
}
})
}
}
func TestCompareStreams_SamplesOutsideComparableWindow(t *testing.T) {
for _, tc := range []struct {
name string