Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove limit middleware for detected_labels #13643

Merged
merged 1 commit into from
Jul 24, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix: remove limit middleware for detected_labels
svennergr committed Jul 24, 2024

Verified

This commit was signed with the committer’s verified signature.
svennergr Sven Grossmann
commit 8afc4ebbece8d7e03426f9ca0c2bb878662b37e9
12 changes: 1 addition & 11 deletions pkg/querier/queryrange/roundtrip.go
Original file line number Diff line number Diff line change
@@ -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),