From 2642718d50569931b71cfc0c9288318ab775ca41 Mon Sep 17 00:00:00 2001 From: Sven Grossmann Date: Wed, 24 Jul 2024 14:55:50 +0200 Subject: [PATCH] fix: remove limit middleware for `detected_labels` (#13643) --- pkg/querier/queryrange/roundtrip.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkg/querier/queryrange/roundtrip.go b/pkg/querier/queryrange/roundtrip.go index 5eab6a7d74bd..6d71bf587d5e 100644 --- a/pkg/querier/queryrange/roundtrip.go +++ b/pkg/querier/queryrange/roundtrip.go @@ -253,12 +253,10 @@ func NewMiddleware( detectedLabelsTripperware, err := NewDetectedLabelsTripperware( cfg, - engineOpts, log, limits, schema, metrics, - indexStatsTripperware, metricsNamespace, codec, limits, iqo) if err != nil { @@ -282,25 +280,17 @@ func NewMiddleware( }), StopperWrapper{resultsCache, statsCache, volumeCache}, nil } -func NewDetectedLabelsTripperware(cfg Config, opts logql.EngineOpts, logger log.Logger, l Limits, schema config.SchemaConfig, metrics *Metrics, mw base.Middleware, namespace string, merger base.Merger, limits Limits, iqo util.IngesterQueryOptions) (base.Middleware, error) { +func NewDetectedLabelsTripperware(cfg Config, logger log.Logger, l Limits, schema config.SchemaConfig, metrics *Metrics, namespace string, merger base.Merger, limits Limits, iqo util.IngesterQueryOptions) (base.Middleware, error) { return base.MiddlewareFunc(func(next base.Handler) base.Handler { - statsHandler := mw.Wrap(next) splitter := newDefaultSplitter(limits, iqo) queryRangeMiddleware := []base.Middleware{ StatsCollectorMiddleware(), NewLimitsMiddleware(l), - NewQuerySizeLimiterMiddleware(schema.Configs, opts, logger, l, statsHandler), base.InstrumentMiddleware("split_by_interval", metrics.InstrumentMiddlewareMetrics), SplitByIntervalMiddleware(schema.Configs, limits, merger, splitter, metrics.SplitByMetrics), } - // The sharding middleware takes care of enforcing this limit for both shardable and non-shardable queries. - // If we are not using sharding, we enforce the limit by adding this middleware after time splitting. - queryRangeMiddleware = append(queryRangeMiddleware, - NewQuerierSizeLimiterMiddleware(schema.Configs, opts, logger, l, statsHandler), - ) - if cfg.MaxRetries > 0 { queryRangeMiddleware = append( queryRangeMiddleware, base.InstrumentMiddleware("retry", metrics.InstrumentMiddlewareMetrics),