Alerting: Handful of small adjustments to log levels and parameters (#64572)

Calculate duration earlier in scheduler
This commit is contained in:
Alexander Weaver 2023-03-17 07:15:49 -05:00 committed by GitHub
parent ae38501675
commit 9bcf8819d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -391,15 +391,16 @@ func (sch *schedule) ruleRoutine(grafanaCtx context.Context, key ngmodels.AlertR
ruleEval, err := sch.evaluatorFactory.Create(evalCtx, e.rule.GetEvalCondition())
var results eval.Results
var dur time.Duration
if err == nil {
if err != nil {
dur = sch.clock.Now().Sub(start)
logger.Error("Failed to build rule evaluator", "error", err)
} else {
results, err = ruleEval.Evaluate(ctx, e.scheduledAt)
dur = sch.clock.Now().Sub(start)
if err != nil {
logger.Error("Failed to evaluate rule", "error", err, "duration", dur)
}
} else {
logger.Error("Failed to build rule evaluator", "error", err)
}
dur = sch.clock.Now().Sub(start)
evalTotal.Inc()
evalDuration.Observe(dur.Seconds())