fix: remove limit middleware for `detected_labels` (#13643)

pull/13640/head^2
Sven Grossmann 10 months ago committed by GitHub
parent 3a99b69ae5
commit 2642718d50
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 12
      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),

Loading…
Cancel
Save