From dc0888c650918dd07ef662ce78561739c03b74c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Pazos?= Date: Tue, 19 Dec 2023 11:39:21 -0300 Subject: [PATCH] additional merge fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nicolás Pazos --- storage/remote/codec_test.go | 4 ++-- storage/remote/storage_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/storage/remote/codec_test.go b/storage/remote/codec_test.go index 39e1040bf..e5d608555 100644 --- a/storage/remote/codec_test.go +++ b/storage/remote/codec_test.go @@ -94,13 +94,13 @@ var writeRequestMinimizedFixture = func() *prompb.MinimizedWriteRequestStr { LabelSymbols: labels, Samples: []prompb.Sample{{Value: 1, Timestamp: 0}}, Exemplars: []prompb.Exemplar{{Labels: []prompb.Label{{Name: "f", Value: "g"}}, Value: 1, Timestamp: 0}}, - Histograms: []prompb.Histogram{HistogramToHistogramProto(0, &testHistogram), FloatHistogramToHistogramProto(1, testHistogram.ToFloat())}, + Histograms: []prompb.Histogram{HistogramToHistogramProto(0, &testHistogram), FloatHistogramToHistogramProto(1, testHistogram.ToFloat(nil))}, }, { LabelSymbols: labels, Samples: []prompb.Sample{{Value: 2, Timestamp: 1}}, Exemplars: []prompb.Exemplar{{Labels: []prompb.Label{{Name: "h", Value: "i"}}, Value: 2, Timestamp: 1}}, - Histograms: []prompb.Histogram{HistogramToHistogramProto(2, &testHistogram), FloatHistogramToHistogramProto(3, testHistogram.ToFloat())}, + Histograms: []prompb.Histogram{HistogramToHistogramProto(2, &testHistogram), FloatHistogramToHistogramProto(3, testHistogram.ToFloat(nil))}, }, }, Symbols: st.LabelsStrings(), diff --git a/storage/remote/storage_test.go b/storage/remote/storage_test.go index d5f5785ff..dd58bec70 100644 --- a/storage/remote/storage_test.go +++ b/storage/remote/storage_test.go @@ -158,7 +158,7 @@ func baseRemoteReadConfig(host string) *config.RemoteReadConfig { // ApplyConfig runs concurrently with Notify // See https://github.com/prometheus/prometheus/issues/12747 func TestWriteStorageApplyConfigsDuringCommit(t *testing.T) { - s := NewStorage(nil, nil, nil, t.TempDir(), defaultFlushDeadline, nil) + s := NewStorage(nil, nil, nil, t.TempDir(), defaultFlushDeadline, nil, Base1) var wg sync.WaitGroup wg.Add(2000)