upstream/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2026-06-04 22:22:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge pull request #15252 from fionaliao/fl/fix-ooonh-reset

Browse source 
Stop ignoring `ignoreCounterResets` in `requireEqualSeries` test method
This commit is contained in:
George Krajcsovits 2024-10-31 18:33:06 +01:00 committed by GitHub
commit 50fd0dbd2e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tsdb/db_test.go
View file

@ -7039,9 +7039,8 @@ func TestOOOHistogramCompactionWithCounterResets(t *testing.T) {
}
series1ExpSamplesPostCompact = append(series1ExpSamplesPostCompact, s)
}
// Counter reset.
// Counter reset, but set as unknown since the first sample of OOO chunks have UnknownCounterReset
s = addSample(int64(490), series1, 100000, histogram.UnknownCounterReset)
s = copyWithCounterReset(s, histogram.CounterReset)
series1ExpSamplesPreCompact = append(series1ExpSamplesPreCompact, s)
series1ExpSamplesPostCompact = append(series1ExpSamplesPostCompact, s)
// Add some more samples after the counter reset.
@ -7064,9 +7063,8 @@ func TestOOOHistogramCompactionWithCounterResets(t *testing.T) {
}
series2ExpSamplesPostCompact = append(series2ExpSamplesPostCompact, s)
}
// Counter reset.
// Counter reset, but set as unknown since the first sample of OOO chunks have UnknownCounterReset
s = addSample(int64(300), series2, 100000, histogram.UnknownCounterReset)
s = copyWithCounterReset(s, histogram.CounterReset)
series2ExpSamplesPreCompact = append(series2ExpSamplesPreCompact, s)
series2ExpSamplesPostCompact = append(series2ExpSamplesPostCompact, s)
// Add some more samples after the counter reset.

6
tsdb/testutil.go
View file

@ -111,7 +111,11 @@ func requireEqualSeries(t *testing.T, expected, actual map[string][]chunks.Sampl
for name, expectedItem := range expected {
actualItem, ok := actual[name]
require.True(t, ok, "Expected series %s not found", name)
requireEqualSamples(t, name, expectedItem, actualItem, requireEqualSamplesIgnoreCounterResets)
if ignoreCounterResets {
requireEqualSamples(t, name, expectedItem, actualItem, requireEqualSamplesIgnoreCounterResets)
} else {
requireEqualSamples(t, name, expectedItem, actualItem)
}
}
for name := range actual {
_, ok := expected[name]