Skip to content

add ruler requestId to context before createing logger for query stat… #7112

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −1
Open

add ruler requestId to context before createing logger for query stat… #7112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion pkg/ruler/compat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,9 @@ func EngineQueryFunc(engine promql.QueryEngine, frontendClient *frontendClient,
}

// Add request ID to the context so that it can be used in logs and metrics for split queries.
ctx = requestmeta.ContextWithRequestId(ctx, uuid.NewString())
if requestmeta.RequestIdFromContext(ctx) == "" {
ctx = requestmeta.ContextWithRequestId(ctx, uuid.NewString())
}
ctx = requestmeta.ContextWithRequestSource(ctx, requestmeta.SourceRuler)

if frontendClient != nil {
Expand Down Expand Up @@ -266,6 +268,9 @@ func RecordAndReportRuleQueryMetrics(qf rules.QueryFunc, userID string, evalMetr
// If we've been passed a counter we want to record the wall time spent executing this request.
timer := prometheus.NewTimer(nil)

// Add request ID before logging so that it can be used in query stats logs.
ctx = requestmeta.ContextWithRequestId(ctx, uuid.NewString())

defer func() {
querySeconds := timer.ObserveDuration().Seconds()
queryTime.Add(querySeconds)
Expand Down
Loading