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

Jump to bottom

fix: Propagate query stats from quantile & topk queries #13831

Merged
merged 4 commits into from
Sep 17, 2024
Merged

fix: Propagate query stats from quantile & topk queries #13831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd3b2d7
fix: Propagate query stats from quantile & topk queries
benclive Aug 9, 2024
610820c
remove debug func
benclive Aug 9, 2024
de68680
fix generated proto post-rebase
cstyan Sep 16, 2024
9a38261
add back start/end logging to span
cstyan Sep 16, 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
1 change: 1 addition & 0 deletions pkg/logql/accumulator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ func (a *QuantileSketchAccumulator) Accumulate(_ context.Context, res logqlmodel

var err error
a.matrix, err = a.matrix.Merge(data)
a.stats.Merge(res.Statistics)
return err
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/querier/queryrange/downstreamer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func (in instance) Downstream(ctx context.Context, queries []logql.DownstreamQue
}
sp, ctx := opentracing.StartSpanFromContext(ctx, "DownstreamHandler.instance")
defer sp.Finish()
sp.LogKV("shards", fmt.Sprintf("%+v", qry.Params.Shards()), "query", req.GetQuery(), "step", req.GetStep(), "handler", reflect.TypeOf(in.handler), "engine", "downstream")
sp.LogKV("shards", fmt.Sprintf("%+v", qry.Params.Shards()), "query", req.GetQuery(), "start", req.GetStart(), "end", req.GetEnd(), "step", req.GetStep(), "handler", reflect.TypeOf(in.handler), "engine", "downstream")

res, err := in.handler.Do(ctx, req)
if err != nil {
Expand Down
24 changes: 14 additions & 10 deletions pkg/querier/queryrange/marshal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,17 @@ func ResultToResponse(result logqlmodel.Result, params logql.Params) (queryrange
case sketch.TopKMatrix:
sk, err := data.ToProto()
return &TopKSketchesResponse{
Response: sk,
Warnings: result.Warnings,
Response: sk,
Warnings: result.Warnings,
Statistics: result.Statistics,
}, err
case logql.ProbabilisticQuantileMatrix:
r := data.ToProto()
data.Release()
return &QuantileSketchResponse{
Response: r,
Warnings: result.Warnings,
Response: r,
Warnings: result.Warnings,
Statistics: result.Statistics,
}, nil
}

Expand Down Expand Up @@ -184,19 +186,21 @@ func ResponseToResult(resp queryrangebase.Response) (logqlmodel.Result, error) {
}

return logqlmodel.Result{
Data: matrix,
Headers: resp.GetHeaders(),
Warnings: r.Warnings,
Data: matrix,
Headers: resp.GetHeaders(),
Warnings: r.Warnings,
Statistics: r.Statistics,
}, nil
case *QuantileSketchResponse:
matrix, err := logql.ProbabilisticQuantileMatrixFromProto(r.Response)
if err != nil {
return logqlmodel.Result{}, fmt.Errorf("cannot decode quantile sketch: %w", err)
}
return logqlmodel.Result{
Data: matrix,
Headers: resp.GetHeaders(),
Warnings: r.Warnings,
Data: matrix,
Headers: resp.GetHeaders(),
Warnings: r.Warnings,
Statistics: r.Statistics,
}, nil
default:
return logqlmodel.Result{}, fmt.Errorf("cannot decode (%T)", resp)
Expand Down
Loading
Loading