From bc1e8a7c9e1517651892b5c90342758fd9623ed7 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 12:11:47 +0300 Subject: [PATCH] [v10.0.x] Alerting: (Chore/Instrumentation) Add traceID to logs with contextual logger (#71333) Alerting: (Chore/Instrumentation) Add traceID to logs with contextual logger (#71289) Alerting: (Chore) Add traceID to logs with contextual logger (cherry picked from commit f6a28cadbc826ed7928794de1a7e25aca8720421) Co-authored-by: Kyle Brandt --- pkg/services/ngalert/schedule/schedule.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/ngalert/schedule/schedule.go b/pkg/services/ngalert/schedule/schedule.go index 16523eb8754..6fa284c950f 100644 --- a/pkg/services/ngalert/schedule/schedule.go +++ b/pkg/services/ngalert/schedule/schedule.go @@ -372,7 +372,7 @@ func (sch *schedule) ruleRoutine(grafanaCtx context.Context, key ngmodels.AlertR } evaluate := func(ctx context.Context, f fingerprint, attempt int64, e *evaluation, span tracing.Span) { - logger := logger.New("version", e.rule.Version, "fingerprint", f, "attempt", attempt, "now", e.scheduledAt) + logger := logger.New("version", e.rule.Version, "fingerprint", f, "attempt", attempt, "now", e.scheduledAt).FromContext(ctx) start := sch.clock.Now() evalCtx := eval.NewContext(ctx, SchedulerUserFor(e.rule.OrgID))