Updates for jaeger tracing client.

middlewares/tracing/jaeger/jaeger.go

@@ -1,11 +1,13 @@
 package jaeger
 
 import (
+	"fmt"
 	"io"
 
 	"github.com/containous/traefik/log"
 	"github.com/opentracing/opentracing-go"
 	jaegercfg "github.com/uber/jaeger-client-go/config"
+	"github.com/uber/jaeger-client-go/zipkin"
 	jaegermet "github.com/uber/jaeger-lib/metrics"
 )
 
@@ -18,6 +20,8 @@ type Config struct {
 	SamplingType       string  `description:"set the sampling type." export:"true"`
 	SamplingParam      float64 `description:"set the sampling parameter." export:"true"`
 	LocalAgentHostPort string  `description:"set jaeger-agent's host:port that the reporter will used." export:"false"`
+	Gen128Bit          bool    `description:"generate 128 bit span IDs." export:"true"`
+	Propagation        string  `description:"which propgation format to use (jaeger/b3)." export:"true"`
 }
 
 // Setup sets up the tracer
@@ -36,11 +40,28 @@ func (c *Config) Setup(componentName string) (opentracing.Tracer, io.Closer, err
 
 	jMetricsFactory := jaegermet.NullFactory
 
+	opts := []jaegercfg.Option{
+		jaegercfg.Logger(&jaegerLogger{}),
+		jaegercfg.Metrics(jMetricsFactory),
+		jaegercfg.Gen128Bit(c.Gen128Bit),
+	}
+
+	switch c.Propagation {
+	case "b3":
+		p := zipkin.NewZipkinB3HTTPHeaderPropagator()
+		opts = append(opts,
+			jaegercfg.Injector(opentracing.HTTPHeaders, p),
+			jaegercfg.Extractor(opentracing.HTTPHeaders, p),
+		)
+	case "jaeger", "":
+	default:
+		return nil, nil, fmt.Errorf("unknown propagation format: %s", c.Propagation)
+	}
+
 	// Initialize tracer with a logger and a metrics factory
 	closer, err := jcfg.InitGlobalTracer(
 		componentName,
-		jaegercfg.Logger(&jaegerLogger{}),
-		jaegercfg.Metrics(jMetricsFactory),
+		opts...,
 	)
 	if err != nil {
 		log.Warnf("Could not initialize jaeger tracer: %s", err.Error())