mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2026-05-04 20:06:12 +02:00
Code Issues Projects Releases Wiki Activity

fix tests

Browse Source 
Signed-off-by: Owen Williams <owen.williams@grafana.com>
This commit is contained in:
Owen Williams 2026-04-14 10:56:10 -04:00
parent 62b4d1dc3f
commit cdb74257ce
No known key found for this signature in database
GPG Key ID: 711C61A216D34A69
4 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tsdb/agent/db_append_v2_test.go
View File

@ -232,12 +232,36 @@ func TestCommit_AppendV2(t *testing.T) {
walSamplesCount += len(samples)
case record.HistogramSamples, record.CustomBucketsHistogramSamples:
if enableSTStorage {
t.Errorf("Got V1 Samples when ST enabled")
}
var histograms []record.RefHistogramSample
histograms, err = dec.HistogramSamples(rec, histograms)
require.NoError(t, err)
walHistogramCount += len(histograms)
case record.HistogramSamplesV2, record.CustomBucketsHistogramSamplesV2:
if !enableSTStorage {
t.Errorf("Got V2 Samples when ST disabled")
}
var histograms []record.RefHistogramSample
histograms, err = dec.HistogramSamples(rec, histograms)
require.NoError(t, err)
walHistogramCount += len(histograms)
case record.FloatHistogramSamples, record.CustomBucketsFloatHistogramSamples:
if enableSTStorage {
t.Errorf("Got V1 Samples when ST enabled")
}
var floatHistograms []record.RefFloatHistogramSample
floatHistograms, err = dec.FloatHistogramSamples(rec, floatHistograms)
require.NoError(t, err)
walFloatHistogramCount += len(floatHistograms)
case record.FloatHistogramSamplesV2, record.CustomBucketsFloatHistogramSamplesV2:
if !enableSTStorage {
t.Errorf("Got V2 Samples when ST disabled")
}
var floatHistograms []record.RefFloatHistogramSample
floatHistograms, err = dec.FloatHistogramSamples(rec, floatHistograms)
require.NoError(t, err)

8
tsdb/wlog/checkpoint.go
View File

@ -218,7 +218,7 @@ func Checkpoint(logger *slog.Logger, w *WL, from, to int, keep func(id chunks.He
stats.TotalSamples += len(samples)
stats.DroppedSamples += len(samples) - len(repl)
case record.HistogramSamples:
case record.HistogramSamples, record.HistogramSamplesV2:
histogramSamples, err = dec.HistogramSamples(rec, histogramSamples)
if err != nil {
return nil, fmt.Errorf("decode histogram samples: %w", err)
@ -235,7 +235,7 @@ func Checkpoint(logger *slog.Logger, w *WL, from, to int, keep func(id chunks.He
}
stats.TotalSamples += len(histogramSamples)
stats.DroppedSamples += len(histogramSamples) - len(repl)
case record.CustomBucketsHistogramSamples:
case record.CustomBucketsHistogramSamples, record.CustomBucketsHistogramSamplesV2:
histogramSamples, err = dec.HistogramSamples(rec, histogramSamples)
if err != nil {
return nil, fmt.Errorf("decode histogram samples: %w", err)
@ -252,7 +252,7 @@ func Checkpoint(logger *slog.Logger, w *WL, from, to int, keep func(id chunks.He
}
stats.TotalSamples += len(histogramSamples)
stats.DroppedSamples += len(histogramSamples) - len(repl)
case record.FloatHistogramSamples:
case record.FloatHistogramSamples, record.FloatHistogramSamplesV2:
floatHistogramSamples, err = dec.FloatHistogramSamples(rec, floatHistogramSamples)
if err != nil {
return nil, fmt.Errorf("decode float histogram samples: %w", err)
@ -269,7 +269,7 @@ func Checkpoint(logger *slog.Logger, w *WL, from, to int, keep func(id chunks.He
}
stats.TotalSamples += len(floatHistogramSamples)
stats.DroppedSamples += len(floatHistogramSamples) - len(repl)
case record.CustomBucketsFloatHistogramSamples:
case record.CustomBucketsFloatHistogramSamples, record.CustomBucketsFloatHistogramSamplesV2:
floatHistogramSamples, err = dec.FloatHistogramSamples(rec, floatHistogramSamples)
if err != nil {
return nil, fmt.Errorf("decode float histogram samples: %w", err)

4
tsdb/wlog/checkpoint_test.go
View File

@ -332,14 +332,14 @@ func TestCheckpoint(t *testing.T) {
require.GreaterOrEqual(t, s.T, last/2, "sample with wrong timestamp")
}
samplesInCheckpoint += len(samples)
case record.HistogramSamples, record.CustomBucketsHistogramSamples:
case record.HistogramSamples, record.CustomBucketsHistogramSamples, record.HistogramSamplesV2, record.CustomBucketsHistogramSamplesV2:
histograms, err := dec.HistogramSamples(rec, nil)
require.NoError(t, err)
for _, h := range histograms {
require.GreaterOrEqual(t, h.T, last/2, "histogram with wrong timestamp")
}
histogramsInCheckpoint += len(histograms)
case record.FloatHistogramSamples, record.CustomBucketsFloatHistogramSamples:
case record.FloatHistogramSamples, record.CustomBucketsFloatHistogramSamples, record.FloatHistogramSamplesV2, record.CustomBucketsFloatHistogramSamplesV2:
floatHistograms, err := dec.FloatHistogramSamples(rec, nil)
require.NoError(t, err)
for _, h := range floatHistograms {

4
tsdb/wlog/watcher.go
View File

@ -588,7 +588,7 @@ func (w *Watcher) readSegment(r *LiveReader, segmentNum int, tail bool) error {
}
w.writer.AppendExemplars(exemplars)
case record.HistogramSamples, record.CustomBucketsHistogramSamples:
case record.HistogramSamples, record.CustomBucketsHistogramSamples, record.HistogramSamplesV2, record.CustomBucketsHistogramSamplesV2:
// Skip if "native histograms over remote write" is not enabled.
if !w.sendHistograms {
break
@ -618,7 +618,7 @@ func (w *Watcher) readSegment(r *LiveReader, segmentNum int, tail bool) error {
w.writer.AppendHistograms(histogramsToSend)
}
case record.FloatHistogramSamples, record.CustomBucketsFloatHistogramSamples:
case record.FloatHistogramSamples, record.CustomBucketsFloatHistogramSamples, record.FloatHistogramSamplesV2, record.CustomBucketsFloatHistogramSamplesV2:
// Skip if "native histograms over remote write" is not enabled.
if !w.sendHistograms {
break