use tags instead of logs

This commit is contained in:
bergquist
2017-09-18 11:08:58 +02:00
parent 89c86c7a22
commit e128310045
3 changed files with 10 additions and 18 deletions
+3 -6
View File
@@ -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(
+3 -6
View File
@@ -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)