From cdb74257ce887a291b37e473bf60ca29268eb272 Mon Sep 17 00:00:00 2001 From: Owen Williams Date: Tue, 14 Apr 2026 10:56:10 -0400 Subject: [PATCH] fix tests Signed-off-by: Owen Williams --- tsdb/agent/db_append_v2_test.go | 24 ++++++++++++++++++++++++ tsdb/wlog/checkpoint.go | 8 ++++---- tsdb/wlog/checkpoint_test.go | 4 ++-- tsdb/wlog/watcher.go | 4 ++-- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/tsdb/agent/db_append_v2_test.go b/tsdb/agent/db_append_v2_test.go index 92a5bb8f35..9d50d53710 100644 --- a/tsdb/agent/db_append_v2_test.go +++ b/tsdb/agent/db_append_v2_test.go @@ -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) diff --git a/tsdb/wlog/checkpoint.go b/tsdb/wlog/checkpoint.go index a41935044d..f214714291 100644 --- a/tsdb/wlog/checkpoint.go +++ b/tsdb/wlog/checkpoint.go @@ -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) diff --git a/tsdb/wlog/checkpoint_test.go b/tsdb/wlog/checkpoint_test.go index 9056aab70b..579c7db12d 100644 --- a/tsdb/wlog/checkpoint_test.go +++ b/tsdb/wlog/checkpoint_test.go @@ -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 { diff --git a/tsdb/wlog/watcher.go b/tsdb/wlog/watcher.go index aedf16fecf..563ad32e6d 100644 --- a/tsdb/wlog/watcher.go +++ b/tsdb/wlog/watcher.go @@ -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