Adapt remote.chunkedSeries to use prompb.ChunkedSeries

leizor · Jul 17, 2024 · 604a84e · 604a84e
1 parent 6616a90
commit 604a84e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 23 deletions.
diff --git a/storage/remote/client.go b/storage/remote/client.go
@@ -36,6 +36,7 @@ import (
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/trace"
 
+	"github.com/prometheus/prometheus/config"
 	"github.com/prometheus/prometheus/prompb"
 	"github.com/prometheus/prometheus/storage"
 	"github.com/prometheus/prometheus/storage/remote/azuread"

diff --git a/storage/remote/codec.go b/storage/remote/codec.go
@@ -580,10 +580,12 @@ func (s *chunkedSeriesSet) Next() bool {
 	}
 
 	s.current = &chunkedSeries{
-		labels: res.ChunkedSeries[0].Labels,
-		chunks: res.ChunkedSeries[0].Chunks,
-		mint:   s.mint,
-		maxt:   s.maxt,
+		ChunkedSeries: prompb.ChunkedSeries{
+			Labels: res.ChunkedSeries[0].Labels,
+			Chunks: res.ChunkedSeries[0].Chunks,
+		},
+		mint: s.mint,
+		maxt: s.maxt,
 	}
 
 	return true
@@ -602,25 +604,24 @@ func (s *chunkedSeriesSet) Warnings() annotations.Annotations {
 }
 
 type chunkedSeries struct {
-	labels     []prompb.Label
-	chunks     []prompb.Chunk
+	prompb.ChunkedSeries
 	mint, maxt int64
 }
 
 var _ storage.Series = &chunkedSeries{}
 
 func (s *chunkedSeries) Labels() labels.Labels {
-	b := labels.NewScratchBuilder(len(s.labels))
-	return labelProtosToLabels(&b, s.labels)
+	b := labels.NewScratchBuilder(0)
+	return s.ToLabels(&b, nil)
 }
 
 func (s *chunkedSeries) Iterator(it chunkenc.Iterator) chunkenc.Iterator {
 	csIt, ok := it.(*chunkedSeriesIterator)
 	if ok {
-		csIt.reset(s.chunks, s.mint, s.maxt)
+		csIt.reset(s.Chunks, s.mint, s.maxt)
 		return csIt
 	}
-	return newChunkedSeriesIterator(s.chunks, s.mint, s.maxt)
+	return newChunkedSeriesIterator(s.Chunks, s.mint, s.maxt)
 }
 
 type chunkedSeriesIterator struct {
@@ -825,15 +826,6 @@ func FromLabelMatchers(matchers []*prompb.LabelMatcher) ([]*labels.Matcher, erro
 	return result, nil
 }
 
-// LabelProtosToMetric unpack a []*prompb.Label to a model.Metric.
-func LabelProtosToMetric(labelPairs []*prompb.Label) model.Metric {
-	metric := make(model.Metric, len(labelPairs))
-	for _, l := range labelPairs {
-		metric[model.LabelName(l.Name)] = model.LabelValue(l.Value)
-	}
-	return metric
-}
-
 // DecodeWriteRequest from an io.Reader into a prompb.WriteRequest, handling
 // snappy decompression.
 // Used also by documentation/examples/remote_storage.

diff --git a/storage/remote/codec_test.go b/storage/remote/codec_test.go
@@ -820,11 +820,13 @@ func TestChunkedSeries(t *testing.T) {
 		chks := buildTestChunks(t)
 
 		s := chunkedSeries{
-			labels: []prompb.Label{
-				{Name: "foo", Value: "bar"},
-				{Name: "asdf", Value: "zxcv"},
+			ChunkedSeries: prompb.ChunkedSeries{
+				Labels: []prompb.Label{
+					{Name: "foo", Value: "bar"},
+					{Name: "asdf", Value: "zxcv"},
+				},
+				Chunks: chks,
 			},
-			chunks: chks,
 		}
 
 		require.Equal(t, labels.FromStrings("asdf", "zxcv", "foo", "bar"), s.Labels())