mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

ref: make query logger more efficient by building list of attrs

Browse source 
Addresses PR feedback to make query logger more efficient.

Signed-off-by: TJ Hoplock <t.hoplock@gmail.com>
This commit is contained in:
TJ Hoplock 2024-12-02 00:57:33 -05:00
parent e0104a6b7e
commit 4d54c304f8
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
promql/engine.go
View file

@ -629,7 +629,7 @@ func (ng *Engine) exec(ctx context.Context, q *query) (v parser.Value, ws annota
ng.queryLoggerLock.RLock() ng.queryLoggerLock.RLock()
if l := ng.queryLogger; l != nil { if l := ng.queryLogger; l != nil {
logger := slog.New(l) logger := slog.New(l)
f := make([]any, 0, 16) // Probably enough up front to not need to reallocate on append. f := make([]slog.Attr, 0, 16) // Probably enough up front to not need to reallocate on append.
params := make(map[string]interface{}, 4) params := make(map[string]interface{}, 4)
params["query"] = q.q params["query"] = q.q
@ -639,20 +639,20 @@ func (ng *Engine) exec(ctx context.Context, q *query) (v parser.Value, ws annota
// The step provided by the user is in seconds. // The step provided by the user is in seconds.
params["step"] = int64(eq.Interval / (time.Second / time.Nanosecond)) params["step"] = int64(eq.Interval / (time.Second / time.Nanosecond))
} }
f = append(f, "params", params) f = append(f, slog.Any("params", params))
if err != nil { if err != nil {
f = append(f, "error", err) f = append(f, slog.Any("error", err))
} }
f = append(f, "stats", stats.NewQueryStats(q.Stats())) f = append(f, slog.Any("stats", stats.NewQueryStats(q.Stats())))
if span := trace.SpanFromContext(ctx); span != nil { if span := trace.SpanFromContext(ctx); span != nil {
f = append(f, "spanID", span.SpanContext().SpanID()) f = append(f, slog.Any("spanID", span.SpanContext().SpanID()))
} }
if origin := ctx.Value(QueryOrigin{}); origin != nil { if origin := ctx.Value(QueryOrigin{}); origin != nil {
for k, v := range origin.(map[string]interface{}) { for k, v := range origin.(map[string]interface{}) {
f = append(f, k, v) f = append(f, slog.Any(k, v))
} }
} }
logger.Info("promql query logged", f...) logger.LogAttrs(context.Background(), slog.LevelInfo, "promql query logged", f...)
// TODO: @tjhop -- do we still need this metric/error log if logger doesn't return errors? // TODO: @tjhop -- do we still need this metric/error log if logger doesn't return errors?
// ng.metrics.queryLogFailures.Inc() // ng.metrics.queryLogFailures.Inc()
// ng.logger.Error("can't log query", "err", err) // ng.logger.Error("can't log query", "err", err)