From 9a476c8457023b67ceb32dfd62f439ad91590f13 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 6 Jan 2021 13:52:32 +0000 Subject: [PATCH] Put trace span from QueryStream under Select By passing in the context created for distributorQuerier.Select. This makes traces easier to follow. Signed-off-by: Bryan Boreham --- pkg/querier/distributor_queryable.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/querier/distributor_queryable.go b/pkg/querier/distributor_queryable.go index 2c4800e68cf..c5c22227134 100644 --- a/pkg/querier/distributor_queryable.go +++ b/pkg/querier/distributor_queryable.go @@ -116,7 +116,7 @@ func (q *distributorQuerier) Select(_ bool, sp *storage.SelectHints, matchers .. } if q.streaming { - return q.streamingSelect(minT, maxT, matchers) + return q.streamingSelect(ctx, minT, maxT, matchers) } matrix, err := q.distributor.Query(ctx, model.Time(minT), model.Time(maxT), matchers...) @@ -128,13 +128,13 @@ func (q *distributorQuerier) Select(_ bool, sp *storage.SelectHints, matchers .. return series.MatrixToSeriesSet(matrix) } -func (q *distributorQuerier) streamingSelect(minT, maxT int64, matchers []*labels.Matcher) storage.SeriesSet { - userID, err := tenant.TenantID(q.ctx) +func (q *distributorQuerier) streamingSelect(ctx context.Context, minT, maxT int64, matchers []*labels.Matcher) storage.SeriesSet { + userID, err := tenant.TenantID(ctx) if err != nil { return storage.ErrSeriesSet(err) } - results, err := q.distributor.QueryStream(q.ctx, model.Time(minT), model.Time(maxT), matchers...) + results, err := q.distributor.QueryStream(ctx, model.Time(minT), model.Time(maxT), matchers...) if err != nil { return storage.ErrSeriesSet(err) }