From e12831004502a4ce5c2f9d2cec89f075a9720ee6 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 11 Sep 2017 18:48:20 +0200
Subject: [PATCH] use tags instead of logs

---
 pkg/services/alerting/engine.go   | 10 ++++------
 pkg/tsdb/graphite/graphite.go     |  9 +++------
 pkg/tsdb/prometheus/prometheus.go |  9 +++------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/pkg/services/alerting/engine.go b/pkg/services/alerting/engine.go
index 20e7b7821ed..d7e9867db0a 100644
--- a/pkg/services/alerting/engine.go
+++ b/pkg/services/alerting/engine.go
@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/opentracing/opentracing-go"
-	tlog "github.com/opentracing/opentracing-go/log"
 
 	"github.com/benbjohnson/clock"
 	"github.com/grafana/grafana/pkg/log"
@@ -122,11 +121,10 @@ func (e *Engine) processJob(grafanaCtx context.Context, job *Job) error {
 
 		e.evalHandler.Eval(evalContext)
 		e.resultHandler.Handle(evalContext)
-		span.LogFields(
-			tlog.Int64("alertId", evalContext.Rule.Id),
-			tlog.Int64("dashboardId", evalContext.Rule.DashboardId),
-			tlog.Bool("firing", evalContext.Firing),
-		)
+
+		span.SetTag("alertId", evalContext.Rule.Id)
+		span.SetTag("dashboardId", evalContext.Rule.DashboardId)
+		span.SetTag("firing", evalContext.Firing)
 
 		close(done)
 		span.Finish()
diff --git a/pkg/tsdb/graphite/graphite.go b/pkg/tsdb/graphite/graphite.go
index 495d1d024a9..7e7a25910d6 100644
--- a/pkg/tsdb/graphite/graphite.go
+++ b/pkg/tsdb/graphite/graphite.go
@@ -18,7 +18,6 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb"
 	opentracing "github.com/opentracing/opentracing-go"
-	tlog "github.com/opentracing/opentracing-go/log"
 )
 
 type GraphiteExecutor struct {
@@ -83,11 +82,9 @@ func (e *GraphiteExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice,
 	}
 
 	span, ctx := opentracing.StartSpanFromContext(ctx, "alerting.graphite")
-	span.LogFields(
-		tlog.String("target", target),
-		tlog.String("from", from),
-		tlog.String("until", until),
-	)
+	span.SetTag("target", target)
+	span.SetTag("from", from)
+	span.SetTag("until", until)
 	defer span.Finish()
 
 	opentracing.GlobalTracer().Inject(
diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go
index 80d7976372d..a9361c65664 100644
--- a/pkg/tsdb/prometheus/prometheus.go
+++ b/pkg/tsdb/prometheus/prometheus.go
@@ -20,7 +20,6 @@ import (
 	"github.com/prometheus/common/model"
 	//api "github.com/prometheus/client_golang/api"
 	//apiv1 "github.com/prometheus/client_golang/api/prometheus/v1"
-	tlog "github.com/opentracing/opentracing-go/log"
 )
 
 type PrometheusExecutor struct {
@@ -105,11 +104,9 @@ func (e *PrometheusExecutor) Execute(ctx context.Context, queries tsdb.QuerySlic
 	}
 
 	span, ctx := opentracing.StartSpanFromContext(ctx, "alerting.prometheus")
-	span.LogFields(
-		tlog.String("expr", query.Expr),
-		tlog.Int64("start_unixnano", int64(query.Start.UnixNano())),
-		tlog.Int64("stop_unixnano", int64(query.End.UnixNano())),
-	)
+	span.SetTag("expr", query.Expr)
+	span.SetTag("start_unixnano", int64(query.Start.UnixNano()))
+	span.SetTag("stop_unixnano", int64(query.End.UnixNano()))
 	defer span.Finish()
 
 	value, err := client.QueryRange(ctx, query.Expr, timeRange)