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.

Sign up for GitHub

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

chore: [k203] fix(indexstats): do not collect stats from "IndexStats" lookups for other query types #13000

Merged
merged 2 commits into from
May 21, 2024
Merged

chore: [k203] fix(indexstats): do not collect stats from "IndexStats" lookups for other query types #13000

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e43003d
fix(indexstats): do not collect stats from "IndexStats" lookups for o…
ashwanthgoli May 21, 2024
0ee03bf
remove duplicate import
ashwanthgoli May 21, 2024
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
25 changes: 2 additions & 23 deletions pkg/querier/queryrange/roundtrip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ func NewMiddleware(
seriesRT = seriesTripperware.Wrap(next)
labelsRT = labelsTripperware.Wrap(next)
instantRT = instantMetricTripperware.Wrap(next)
statsRT = indexStatsTripperware.Wrap(next)
statsRT = base.MergeMiddlewares(StatsCollectorMiddleware(), indexStatsTripperware).Wrap(next)
seriesVolumeRT = seriesVolumeTripperware.Wrap(next)
detectedFieldsRT = detectedFieldsTripperware.Wrap(next)
detectedLabelsRT = detectedLabelsTripperware.Wrap(next)
Expand Down Expand Up @@ -1055,22 +1055,6 @@ func NewVolumeTripperware(cfg Config, log log.Logger, limits Limits, schema conf
), nil
}

func statsTripperware(nextTW base.Middleware) base.Middleware {
return base.MiddlewareFunc(func(next base.Handler) base.Handler {
return base.HandlerFunc(func(ctx context.Context, r base.Request) (base.Response, error) {
cacheMiddlewares := []base.Middleware{
StatsCollectorMiddleware(),
nextTW,
}

// wrap nextRT with our new middleware
return base.MergeMiddlewares(
cacheMiddlewares...,
).Wrap(next).Do(ctx, r)
})
})
}

func volumeRangeTripperware(nextTW base.Middleware) base.Middleware {
return base.MiddlewareFunc(func(next base.Handler) base.Handler {
return base.HandlerFunc(func(ctx context.Context, r base.Request) (base.Response, error) {
Expand Down Expand Up @@ -1141,7 +1125,7 @@ func NewIndexStatsTripperware(cfg Config, log log.Logger, limits Limits, schema
}
}

tw, err := sharedIndexTripperware(
return sharedIndexTripperware(
cacheMiddleware,
cfg,
merger,
Expand All @@ -1152,11 +1136,6 @@ func NewIndexStatsTripperware(cfg Config, log log.Logger, limits Limits, schema
schema,
metricsNamespace,
)
if err != nil {
return nil, err
}

return statsTripperware(tw), nil
}

func sharedIndexTripperware(
Expand Down
Loading