Merge pull request grafana-cold-storage#904 from grafana/extra-jaeger-tags

Dieterbe · web-flow · commit 82dfea5dd955 · 2018-05-03T19:27:03.000+02:00
support adding arbitrary extra tags in jaeger traces
diff --git a/cmd/mt-store-cat/main.go b/cmd/mt-store-cat/main.go
@@ -167,7 +167,7 @@ func main() {
 	if err != nil {
 		log.Fatal(4, "failed to initialize cassandra. %s", err)
 	}
-	tracer, traceCloser, err := conf.GetTracer(false, "")
+	tracer, traceCloser, err := conf.GetTracer(false, "", nil)
 	if err != nil {
 		log.Fatal(4, "Could not initialize jaeger tracer: %s", err.Error())
 	}
diff --git a/conf/tracing.go b/conf/tracing.go
@@ -9,7 +9,9 @@ import (
 	jaegerlog "github.com/uber/jaeger-client-go/log"
 )
 
-func GetTracer(enabled bool, addr string) (opentracing.Tracer, io.Closer, error) {
+// GetTracer returns a jaeger tracer
+// any tags specified will be added as process/tracer-level tags
+func GetTracer(enabled bool, addr string, tags map[string]string) (opentracing.Tracer, io.Closer, error) {
 	// Sample configuration for testing. Use constant sampling to sample every trace
 	// and enable LogSpan to log every span via configured Logger.
 	cfg := jaegercfg.Configuration{
@@ -26,9 +28,16 @@ func GetTracer(enabled bool, addr string) (opentracing.Tracer, io.Closer, error)
 
 	jLogger := jaegerlog.StdLogger
 
+	options := []jaegercfg.Option{
+		jaegercfg.Logger(jLogger),
+	}
+	for k, v := range tags {
+		options = append(options, jaegercfg.Tag(k, v))
+	}
+
 	tracer, closer, err := cfg.New(
 		"metrictank",
-		jaegercfg.Logger(jLogger),
+		options...,
 	)
 	if err != nil {
 		return nil, nil, err
diff --git a/docker/docker-chaos/metrictank.ini b/docker/docker-chaos/metrictank.ini
@@ -97,6 +97,8 @@ log-level = 2
 tracing-enabled = true
 # address of the jaeger agent to send data to
 tracing-addr = jaeger:6831
+# tracer/process-level tags to include, specified as comma-separated key:value pairs
+tracing-add-tags =
 
 ## Retention settings ##
 [retention]
diff --git a/docker/docker-cluster/metrictank.ini b/docker/docker-cluster/metrictank.ini
@@ -97,6 +97,8 @@ log-level = 2
 tracing-enabled = true
 # address of the jaeger agent to send data to
 tracing-addr = jaeger:6831
+# tracer/process-level tags to include, specified as comma-separated key:value pairs
+tracing-add-tags =
 
 ## Retention settings ##
 [retention]
diff --git a/docker/docker-dev-custom-cfg-kafka/metrictank.ini b/docker/docker-dev-custom-cfg-kafka/metrictank.ini
@@ -97,6 +97,8 @@ log-level = 2
 tracing-enabled = false
 # address of the jaeger agent to send data to
 tracing-addr = localhost:6831
+# tracer/process-level tags to include, specified as comma-separated key:value pairs
+tracing-add-tags =
 
 ## Retention settings ##
 [retention]
diff --git a/docs/config.md b/docs/config.md
@@ -126,6 +126,8 @@ log-level = 2
 tracing-enabled = false
 # address of the jaeger agent to send data to
 tracing-addr = localhost:6831
+# tracer/process-level tags to include, specified as comma-separated key:value pairs
+tracing-add-tags =
 ```
 
 ## Retention settings ##
diff --git a/metrictank-sample.ini b/metrictank-sample.ini
@@ -100,6 +100,8 @@ log-level = 2
 tracing-enabled = false
 # address of the jaeger agent to send data to
 tracing-addr = localhost:6831
+# tracer/process-level tags to include, specified as comma-separated key:value pairs
+tracing-add-tags =
 
 ## Retention settings ##
 [retention]
diff --git a/metrictank.go b/metrictank.go
@@ -101,6 +101,7 @@ var (
 
 	tracingEnabled = flag.Bool("tracing-enabled", false, "enable/disable distributed opentracing via jaeger")
 	tracingAddr    = flag.String("tracing-addr", "localhost:6831", "address of the jaeger agent to send data to")
+	tracingAddTags = flag.String("tracing-add-tags", "", "tracer/process-level tags to include, specified as comma-separated key:value pairs")
 )
 
 func init() {
@@ -270,7 +271,20 @@ func main() {
 	/***********************************
 		Initialize tracer
 	***********************************/
-	tracer, traceCloser, err := conf.GetTracer(*tracingEnabled, *tracingAddr)
+	*tracingAddTags = strings.TrimSpace(*tracingAddTags)
+	var tags map[string]string
+	if len(*tracingAddTags) > 0 {
+		tagSpecs := strings.Split(*tracingAddTags, ",")
+		tags = make(map[string]string)
+		for _, tagSpec := range tagSpecs {
+			split := strings.Split(tagSpec, ":")
+			if len(split) != 2 {
+				log.Fatal(4, "cannot parse tracing-add-tags value %q", tagSpec)
+			}
+			tags[split[0]] = split[1]
+		}
+	}
+	tracer, traceCloser, err := conf.GetTracer(*tracingEnabled, *tracingAddr, tags)
 	if err != nil {
 		log.Fatal(4, "Could not initialize jaeger tracer: %s", err.Error())
 	}
diff --git a/scripts/config/metrictank-docker.ini b/scripts/config/metrictank-docker.ini
@@ -97,6 +97,8 @@ log-level = 2
 tracing-enabled = false
 # address of the jaeger agent to send data to
 tracing-addr = localhost:6831
+# tracer/process-level tags to include, specified as comma-separated key:value pairs
+tracing-add-tags =
 
 ## Retention settings ##
 [retention]
diff --git a/scripts/config/metrictank-package.ini b/scripts/config/metrictank-package.ini
@@ -97,6 +97,8 @@ log-level = 2
 tracing-enabled = false
 # address of the jaeger agent to send data to
 tracing-addr = localhost:6831
+# tracer/process-level tags to include, specified as comma-separated key:value pairs
+tracing-add-tags =
 
 ## Retention settings ##
 [retention]

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ func main() {`
`167`	`167`	`if err != nil {`
`168`	`168`	`log.Fatal(4, "failed to initialize cassandra. %s", err)`
`169`	`169`	`}`
`170`		`- tracer, traceCloser, err := conf.GetTracer(false, "")`
	`170`	`+ tracer, traceCloser, err := conf.GetTracer(false, "", nil)`
`171`	`171`	`if err != nil {`
`172`	`172`	`log.Fatal(4, "Could not initialize jaeger tracer: %s", err.Error())`
`173`	`173`	`}`