fix

Author: yulong-db

pkg/query/aggregation_label_rewriter.go

@@ -61,6 +61,12 @@ func newAggregationLabelRewriterMetrics(reg prometheus.Registerer, desiredLabelV
 	return m
 }
 
+func NewNopAggregationLabelRewriter() *AggregationLabelRewriter {
+	return &AggregationLabelRewriter{
+		enabled: false,
+	}
+}
+
 func NewAggregationLabelRewriter(logger log.Logger, reg prometheus.Registerer, desiredLabelValue string) *AggregationLabelRewriter {
 	if logger == nil {
 		logger = log.NewNopLogger()

pkg/query/querier.go

@@ -91,7 +91,11 @@ func NewQueryableCreatorWithOptions(
 	opts Options,
 ) QueryableCreator {
 	gf := gate.NewGateFactory(extprom.WrapRegistererWithPrefix("concurrent_selects_", reg), maxConcurrentSelects, gate.Selects)
-
+	aggregationLabelRewriter := NewAggregationLabelRewriter(
+		logger,
+		extprom.WrapRegistererWithPrefix("aggregation_label_rewriter_", reg),
+		opts.RewriteAggregationLabelTo,
+	)
 	return func(
 		deduplicate bool,
 		replicaLabels []string,
@@ -104,7 +108,6 @@ func NewQueryableCreatorWithOptions(
 	) storage.Queryable {
 		return &queryable{
 			logger:              logger,
-			reg:                 reg,
 			replicaLabels:       replicaLabels,
 			storeDebugMatchers:  storeDebugMatchers,
 			proxy:               proxy,
@@ -120,13 +123,14 @@ func NewQueryableCreatorWithOptions(
 			shardInfo:            shardInfo,
 			seriesStatsReporter:  seriesStatsReporter,
 			opts:                 opts,
+
+			aggregationLabelRewriter: aggregationLabelRewriter,
 		}
 	}
 }
 
 type queryable struct {
 	logger               log.Logger
-	reg                  prometheus.Registerer
 	replicaLabels        []string
 	storeDebugMatchers   [][]*labels.Matcher
 	proxy                storepb.StoreServer
@@ -140,16 +144,17 @@ type queryable struct {
 	shardInfo            *storepb.ShardInfo
 	seriesStatsReporter  seriesStatsReporter
 	opts                 Options
+
+	aggregationLabelRewriter *AggregationLabelRewriter
 }
 
 // Querier returns a new storage querier against the underlying proxy store API.
 func (q *queryable) Querier(mint, maxt int64) (storage.Querier, error) {
-	return newQuerierWithOpts(q.logger, q.reg, mint, maxt, q.replicaLabels, q.storeDebugMatchers, q.proxy, q.deduplicate, q.maxResolutionMillis, q.partialResponse, q.skipChunks, q.gateProviderFn(), q.selectTimeout, q.shardInfo, q.seriesStatsReporter, q.opts), nil
+	return newQuerierWithOpts(q.logger, mint, maxt, q.replicaLabels, q.storeDebugMatchers, q.proxy, q.deduplicate, q.maxResolutionMillis, q.partialResponse, q.skipChunks, q.gateProviderFn(), q.selectTimeout, q.shardInfo, q.seriesStatsReporter, q.aggregationLabelRewriter, q.opts), nil
 }
 
 type querier struct {
 	logger                  log.Logger
-	reg                     prometheus.Registerer
 	mint, maxt              int64
 	deduplicationFunc       string
 	replicaLabels           []string
@@ -172,7 +177,6 @@ type querier struct {
 // nolint:unparam
 func newQuerier(
 	logger log.Logger,
-	reg prometheus.Registerer,
 	mint,
 	maxt int64,
 	replicaLabels []string,
@@ -186,13 +190,13 @@ func newQuerier(
 	selectTimeout time.Duration,
 	shardInfo *storepb.ShardInfo,
 	seriesStatsReporter seriesStatsReporter,
+	aggregationLabelRewriter *AggregationLabelRewriter,
 ) *querier {
-	return newQuerierWithOpts(logger, reg, mint, maxt, replicaLabels, storeDebugMatchers, proxy, deduplicate, maxResolutionMillis, partialResponse, skipChunks, selectGate, selectTimeout, shardInfo, seriesStatsReporter, Options{})
+	return newQuerierWithOpts(logger, mint, maxt, replicaLabels, storeDebugMatchers, proxy, deduplicate, maxResolutionMillis, partialResponse, skipChunks, selectGate, selectTimeout, shardInfo, seriesStatsReporter, aggregationLabelRewriter, Options{})
 }
 
 func newQuerierWithOpts(
 	logger log.Logger,
-	reg prometheus.Registerer,
 	mint,
 	maxt int64,
 	replicaLabels []string,
@@ -206,11 +210,15 @@ func newQuerierWithOpts(
 	selectTimeout time.Duration,
 	shardInfo *storepb.ShardInfo,
 	seriesStatsReporter seriesStatsReporter,
+	aggregationLabelRewriter *AggregationLabelRewriter,
 	opts Options,
 ) *querier {
 	if logger == nil {
 		logger = log.NewNopLogger()
 	}
+	if aggregationLabelRewriter == nil {
+		aggregationLabelRewriter = NewNopAggregationLabelRewriter()
+	}
 	rl := make(map[string]struct{})
 	for _, replicaLabel := range replicaLabels {
 		rl[replicaLabel] = struct{}{}
@@ -225,7 +233,6 @@ func newQuerierWithOpts(
 	}
 	return &querier{
 		logger:        logger,
-		reg:           reg,
 		selectGate:    selectGate,
 		selectTimeout: selectTimeout,
 
@@ -242,11 +249,7 @@ func newQuerierWithOpts(
 		shardInfo:               shardInfo,
 		seriesStatsReporter:     seriesStatsReporter,
 
-		aggregationLabelRewriter: NewAggregationLabelRewriter(
-			logger,
-			extprom.WrapRegistererWithPrefix("aggregation_label_rewriter_", reg),
-			opts.RewriteAggregationLabelTo,
-		),
+		aggregationLabelRewriter: aggregationLabelRewriter,
 	}
 }
 

pkg/query/querier_test.go

@@ -399,7 +399,7 @@ func TestQuerier_Select_AfterPromQL(t *testing.T) {
 						g := gate.New(2)
 						mq := &mockedQueryable{
 							Creator: func(mint, maxt int64) storage.Querier {
-								return newQuerier(nil, nil, mint, maxt, tcase.replicaLabels, nil, tcase.storeAPI, sc.dedup, 0, true, false, g, timeout, nil, NoopSeriesStatsReporter)
+								return newQuerier(nil, mint, maxt, tcase.replicaLabels, nil, tcase.storeAPI, sc.dedup, 0, true, false, g, timeout, nil, NoopSeriesStatsReporter, nil)
 							},
 						}
 						t.Cleanup(func() {
@@ -780,7 +780,6 @@ func TestQuerier_Select(t *testing.T) {
 			} {
 				g := gate.New(2)
 				q := newQuerier(
-					nil,
 					nil,
 					tcase.mint,
 					tcase.maxt,
@@ -795,6 +794,7 @@ func TestQuerier_Select(t *testing.T) {
 					timeout,
 					nil,
 					NoopSeriesStatsReporter,
+					nil,
 				)
 				t.Cleanup(func() { testutil.Ok(t, q.Close()) })
 
@@ -1086,7 +1086,7 @@ func TestQuerierWithDedupUnderstoodByPromQL_Rate(t *testing.T) {
 
 		timeout := 100 * time.Second
 		g := gate.New(2)
-		q := newQuerier(logger, nil, realSeriesWithStaleMarkerMint, realSeriesWithStaleMarkerMaxt, []string{"replica"}, nil, newProxyStore(s), false, 0, true, false, g, timeout, nil, NoopSeriesStatsReporter)
+		q := newQuerier(logger, realSeriesWithStaleMarkerMint, realSeriesWithStaleMarkerMaxt, []string{"replica"}, nil, newProxyStore(s), false, 0, true, false, g, timeout, nil, NoopSeriesStatsReporter, nil)
 		t.Cleanup(func() {
 			testutil.Ok(t, q.Close())
 		})
@@ -1156,7 +1156,7 @@ func TestQuerierWithDedupUnderstoodByPromQL_Rate(t *testing.T) {
 
 		timeout := 5 * time.Second
 		g := gate.New(2)
-		q := newQuerier(logger, nil, realSeriesWithStaleMarkerMint, realSeriesWithStaleMarkerMaxt, []string{"replica"}, nil, newProxyStore(s), true, 0, true, false, g, timeout, nil, NoopSeriesStatsReporter)
+		q := newQuerier(logger, realSeriesWithStaleMarkerMint, realSeriesWithStaleMarkerMaxt, []string{"replica"}, nil, newProxyStore(s), true, 0, true, false, g, timeout, nil, NoopSeriesStatsReporter, nil)
 		t.Cleanup(func() {
 			testutil.Ok(t, q.Close())
 		})

pkg/query/query_bench_test.go

@@ -87,7 +87,6 @@ func benchQuerySelect(t testutil.TB, totalSamples, totalSeries int, dedup bool)
 	logger := log.NewNopLogger()
 	q := newQuerier(
 		logger,
-		nil,
 		math.MinInt64,
 		math.MaxInt64,
 		[]string{"a_replica"},
@@ -101,6 +100,7 @@ func benchQuerySelect(t testutil.TB, totalSamples, totalSeries int, dedup bool)
 		10*time.Second,
 		nil,
 		NoopSeriesStatsReporter,
+		nil,
 	)
 	testSelect(t, q, expectedSeries)
 }