From bc678899f7ff944e3d48ec35848374847a57adbf Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 12 Sep 2017 10:31:57 +0200 Subject: [PATCH] better formating for error trace --- pkg/services/alerting/engine.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/services/alerting/engine.go b/pkg/services/alerting/engine.go index e01a01360b5..adaafd776ef 100644 --- a/pkg/services/alerting/engine.go +++ b/pkg/services/alerting/engine.go @@ -117,7 +117,10 @@ func (e *Engine) processJob(grafanaCtx context.Context, job *Job) error { if err := recover(); err != nil { e.log.Error("Alert Panic", "error", err, "stack", log.Stack(1)) ext.Error.Set(span, true) - span.LogFields(tlog.Error(fmt.Errorf("error: %v", err))) + span.LogFields( + tlog.Error(fmt.Errorf("%v", err)), + tlog.String("message", "failed to execute alert rule. panic was recovered."), + ) span.Finish() close(done) } @@ -129,7 +132,6 @@ func (e *Engine) processJob(grafanaCtx context.Context, job *Job) error { span.SetTag("alertId", evalContext.Rule.Id) span.SetTag("dashboardId", evalContext.Rule.DashboardId) span.SetTag("firing", evalContext.Firing) - span.Finish() close(done) }()