Update Thanos (#6490)

Signed-off-by: alanprot <[email protected]>

Author: alanprot

go.mod

@@ -52,7 +52,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/thanos-io/objstore v0.0.0-20241111205755-d1dd89d41f97
 	github.com/thanos-io/promql-engine v0.0.0-20241217103156-9dbff30059cf
-	github.com/thanos-io/thanos v0.37.3-0.20250106173420-0e95c464dd42
+	github.com/thanos-io/thanos v0.37.3-0.20250107220537-0d426361672a
 	github.com/uber/jaeger-client-go v2.30.0+incompatible
 	github.com/weaveworks/common v0.0.0-20230728070032-dd9e68f319d5
 	go.etcd.io/etcd/api/v3 v3.5.17

go.sum

@@ -1657,8 +1657,8 @@ github.com/thanos-io/objstore v0.0.0-20241111205755-d1dd89d41f97 h1:VjG0mwhN1Dkn
 github.com/thanos-io/objstore v0.0.0-20241111205755-d1dd89d41f97/go.mod h1:vyzFrBXgP+fGNG2FopEGWOO/zrIuoy7zt3LpLeezRsw=
 github.com/thanos-io/promql-engine v0.0.0-20241217103156-9dbff30059cf h1:JFh4PjC9yQidiFi4qMWbPddIgsLWPIsSEbXs75+tLxs=
 github.com/thanos-io/promql-engine v0.0.0-20241217103156-9dbff30059cf/go.mod h1:wx0JlRZtsB2S10JYUgeg5GqLfMxw31SzArP+28yyE00=
-github.com/thanos-io/thanos v0.37.3-0.20250106173420-0e95c464dd42 h1:UagJirP9rmR/m5ne4DyPZvAa+Yvkc5qiiPGl+jVVK9M=
-github.com/thanos-io/thanos v0.37.3-0.20250106173420-0e95c464dd42/go.mod h1:VOu1neDpx4n/2OCQmfT/0RMU85UzhO35ce0S3Ew+NSk=
+github.com/thanos-io/thanos v0.37.3-0.20250107220537-0d426361672a h1:VdOsK6zhseRVfpkOxCJ3b2MKhuP1sBjTnC7Bib7DLws=
+github.com/thanos-io/thanos v0.37.3-0.20250107220537-0d426361672a/go.mod h1:VOu1neDpx4n/2OCQmfT/0RMU85UzhO35ce0S3Ew+NSk=
 github.com/tjhop/slog-gokit v0.1.2 h1:pmQI4SvU9h4gA0vIQsdhJQSqQg4mOmsPykG2/PM3j1I=
 github.com/tjhop/slog-gokit v0.1.2/go.mod h1:8fhlcp8C8ELbg3GCyKv06tgt4B5sDq2P1r2DQAu1HuM=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=

pkg/distributor/distributor_test.go

@@ -3375,7 +3375,7 @@ func (i *mockIngester) Query(ctx context.Context, req *client.QueryRequest, opts
 		return nil, errFail
 	}
 
-	_, _, matchers, err := client.FromQueryRequest(storecache.NewNoopMatcherCache(), req)
+	_, _, matchers, err := client.FromQueryRequest(storecache.NoopMatchersCache, req)
 	if err != nil {
 		return nil, err
 	}
@@ -3401,7 +3401,7 @@ func (i *mockIngester) QueryStream(ctx context.Context, req *client.QueryRequest
 		return nil, errFail
 	}
 
-	_, _, matchers, err := client.FromQueryRequest(storecache.NewNoopMatcherCache(), req)
+	_, _, matchers, err := client.FromQueryRequest(storecache.NoopMatchersCache, req)
 	if err != nil {
 		return nil, err
 	}
@@ -3460,7 +3460,7 @@ func (i *mockIngester) MetricsForLabelMatchersStream(ctx context.Context, req *c
 		return nil, errFail
 	}
 
-	_, _, _, multiMatchers, err := client.FromMetricsForLabelMatchersRequest(storecache.NewNoopMatcherCache(), req)
+	_, _, _, multiMatchers, err := client.FromMetricsForLabelMatchersRequest(storecache.NoopMatchersCache, req)
 	if err != nil {
 		return nil, err
 	}
@@ -3492,7 +3492,7 @@ func (i *mockIngester) MetricsForLabelMatchers(ctx context.Context, req *client.
 		return nil, errFail
 	}
 
-	_, _, _, multiMatchers, err := client.FromMetricsForLabelMatchersRequest(storecache.NewNoopMatcherCache(), req)
+	_, _, _, multiMatchers, err := client.FromMetricsForLabelMatchersRequest(storecache.NoopMatchersCache, req)
 	if err != nil {
 		return nil, err
 	}

pkg/ingester/client/compat.go

@@ -95,25 +95,6 @@ func MatrixFromSeriesSet(set storage.SeriesSet) (model.Matrix, error) {
 	return m, set.Err()
 }
 
-// ToQueryResponse builds a QueryResponse proto.
-func ToQueryResponse(matrix model.Matrix) *QueryResponse {
-	resp := &QueryResponse{}
-	for _, ss := range matrix {
-		ts := cortexpb.TimeSeries{
-			Labels:  cortexpb.FromMetricsToLabelAdapters(ss.Metric),
-			Samples: make([]cortexpb.Sample, 0, len(ss.Values)),
-		}
-		for _, s := range ss.Values {
-			ts.Samples = append(ts.Samples, cortexpb.Sample{
-				Value:       float64(s.Value),
-				TimestampMs: int64(s.Timestamp),
-			})
-		}
-		resp.Timeseries = append(resp.Timeseries, ts)
-	}
-	return resp
-}
-
 // ToMetricsForLabelMatchersRequest builds a MetricsForLabelMatchersRequest proto
 func ToMetricsForLabelMatchersRequest(from, to model.Time, limit int, matchers []*labels.Matcher) (*MetricsForLabelMatchersRequest, error) {
 	ms, err := toLabelMatchers(matchers)
@@ -279,7 +260,7 @@ func toLabelMatchers(matchers []*labels.Matcher) ([]*LabelMatcher, error) {
 func FromLabelMatchers(cache storecache.MatchersCache, matchers []*LabelMatcher) ([]*labels.Matcher, error) {
 	result := make([]*labels.Matcher, 0, len(matchers))
 	for _, matcher := range matchers {
-		m, err := cache.GetOrSet(matcher.String(), func() (*labels.Matcher, error) {
+		m, err := cache.GetOrSet(matcher, func() (*labels.Matcher, error) {
 			var mtype labels.MatchType
 			switch matcher.Type {
 			case EQUAL:

pkg/ingester/client/compat_test.go

@@ -42,7 +42,7 @@ func TestQueryRequest(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	haveFrom, haveTo, haveMatchers, err := FromQueryRequest(storecache.NewNoopMatcherCache(), req)
+	haveFrom, haveTo, haveMatchers, err := FromQueryRequest(storecache.NoopMatchersCache, req)
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/ingester/client/custom.go

@@ -3,6 +3,9 @@ package client
 import (
 	"encoding/binary"
 
+	"github.com/pkg/errors"
+	"github.com/prometheus/prometheus/model/labels"
+
 	"github.com/cortexproject/cortex/pkg/chunk/encoding"
 )
 
@@ -45,3 +48,20 @@ func (m *QueryStreamResponse) SamplesCount() (count int) {
 	}
 	return
 }
+
+func (m *LabelMatcher) MatcherType() (labels.MatchType, error) {
+	var t labels.MatchType
+	switch m.Type {
+	case EQUAL:
+		t = labels.MatchEqual
+	case NOT_EQUAL:
+		t = labels.MatchNotEqual
+	case REGEX_MATCH:
+		t = labels.MatchRegexp
+	case REGEX_NO_MATCH:
+		t = labels.MatchNotRegexp
+	default:
+		return 0, errors.Errorf("unrecognized label matcher type %d", m.Type)
+	}
+	return t, nil
+}

pkg/ingester/ingester.go

@@ -714,7 +714,7 @@ func New(cfg Config, limits *validation.Overrides, registerer prometheus.Registe
 		logger:                       logger,
 		ingestionRate:                util_math.NewEWMARate(0.2, instanceIngestionRateTickInterval),
 		expandedPostingsCacheFactory: cortex_tsdb.NewExpandedPostingsCacheFactory(cfg.BlocksStorageConfig.TSDB.PostingsCache),
-		matchersCache:                storecache.NewNoopMatcherCache(),
+		matchersCache:                storecache.NoopMatchersCache,
 	}
 
 	if cfg.MatchersCacheMaxItems > 0 {

pkg/ingester/ingester_test.go

@@ -152,7 +152,7 @@ func TestMatcherCache(t *testing.T) {
 			err = ing.QueryStream(&client.QueryRequest{
 				StartTimestampMs: math.MinInt64,
 				EndTimestampMs:   math.MaxInt64,
-				Matchers:         []*client.LabelMatcher{{Type: client.EQUAL, Name: labels.MetricName, Value: fmt.Sprintf("%d", j)}},
+				Matchers:         []*client.LabelMatcher{{Type: client.REGEX_MATCH, Name: labels.MetricName, Value: fmt.Sprintf("%d", j)}},
 			}, s)
 			require.NoError(t, err)
 		}
@@ -170,7 +170,7 @@ func TestMatcherCache(t *testing.T) {
 				ingester_matchers_cache_items %v
 				# HELP ingester_matchers_cache_max_items Maximum number of items that can be cached
 				# TYPE ingester_matchers_cache_max_items gauge
-				ingester_matchers_cache_max_items 0
+				ingester_matchers_cache_max_items 50
 				# HELP ingester_matchers_cache_requests_total Total number of cache requests for series matchers
 				# TYPE ingester_matchers_cache_requests_total counter
 				ingester_matchers_cache_requests_total %v

pkg/querier/remote_read.go

@@ -35,7 +35,7 @@ func RemoteReadHandler(q storage.Queryable, logger log.Logger) http.Handler {
 		errors := make(chan error)
 		for i, qr := range req.Queries {
 			go func(i int, qr *client.QueryRequest) {
-				from, to, matchers, err := client.FromQueryRequest(storecache.NewNoopMatcherCache(), qr)
+				from, to, matchers, err := client.FromQueryRequest(storecache.NoopMatchersCache, qr)
 				if err != nil {
 					errors <- err
 					return