Add option to enable gen128Bit for tracer (jaegertracing#193)

tttoad · Aug 25, 2017 · 7c8937d · 7c8937d
1 parent 1f15fec
commit 7c8937d
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 0 deletions.
diff --git a/config/config.go b/config/config.go
@@ -165,6 +165,7 @@ func (c Configuration) New(
 		jaeger.TracerOptions.Metrics(tracerMetrics),
 		jaeger.TracerOptions.Logger(opts.logger),
 		jaeger.TracerOptions.CustomHeaderKeys(c.Headers),
+		jaeger.TracerOptions.Gen128Bit(opts.gen128Bit),
 		jaeger.TracerOptions.ZipkinSharedRPCSpan(opts.zipkinSharedRPCSpan),
 	}
 

diff --git a/config/config_test.go b/config/config_test.go
@@ -244,3 +244,22 @@ func TestBaggageRestrictionsConfig(t *testing.T) {
 		},
 	)
 }
+
+func TestConfigWithGen128Bit(t *testing.T) {
+	c := Configuration{
+		Sampler: &SamplerConfig{
+			Type:  "const",
+			Param: 1,
+		},
+		RPCMetrics: true,
+	}
+	tracer, closer, err := c.New("test", Gen128Bit(true))
+	require.NoError(t, err)
+	defer closer.Close()
+
+	span := tracer.StartSpan("test")
+	defer span.Finish()
+	traceID := span.Context().(jaeger.SpanContext).TraceID()
+	require.True(t, traceID.High != 0)
+	require.True(t, traceID.Low != 0)
+}
diff --git a/config/options.go b/config/options.go
@@ -37,6 +37,7 @@ type Options struct {
 	reporter            jaeger.Reporter
 	contribObservers    []jaeger.ContribObserver
 	observers           []jaeger.Observer
+	gen128Bit           bool
 	zipkinSharedRPCSpan bool
 	tags                []opentracing.Tag
 }
@@ -80,6 +81,13 @@ func ContribObserver(observer jaeger.ContribObserver) Option {
 	}
 }
 
+// Gen128Bit specifies whether to generate 128bit trace IDs.
+func Gen128Bit(gen128Bit bool) Option {
+	return func(c *Options) {
+		c.gen128Bit = gen128Bit
+	}
+}
+
 // ZipkinSharedRPCSpan creates an option that enables sharing span ID between client
 // and server spans a la zipkin. If false, client and server spans will be assigned
 // different IDs.

diff --git a/config/options_test.go b/config/options_test.go
@@ -40,12 +40,14 @@ func TestApplyOptions(t *testing.T) {
 		Logger(jaeger.StdLogger),
 		Observer(observer),
 		ContribObserver(contribObserver),
+		Gen128Bit(true),
 		ZipkinSharedRPCSpan(true),
 	)
 	assert.Equal(t, jaeger.StdLogger, opts.logger)
 	assert.Equal(t, metricsFactory, opts.metrics)
 	assert.Equal(t, []jaeger.Observer{observer}, opts.observers)
 	assert.Equal(t, []jaeger.ContribObserver{contribObserver}, opts.contribObservers)
+	assert.True(t, opts.gen128Bit)
 	assert.True(t, opts.zipkinSharedRPCSpan)
 }
 

diff --git a/tracer_options.go b/tracer_options.go
@@ -121,6 +121,12 @@ func (tracerOptions) ContribObserver(observer ContribObserver) TracerOption {
 	}
 }
 
+func (tracerOptions) Gen128Bit(gen128Bit bool) TracerOption {
+	return func(tracer *Tracer) {
+		tracer.options.gen128Bit = gen128Bit
+	}
+}
+
 func (tracerOptions) ZipkinSharedRPCSpan(zipkinSharedRPCSpan bool) TracerOption {
 	return func(tracer *Tracer) {
 		tracer.options.zipkinSharedRPCSpan = zipkinSharedRPCSpan

diff --git a/tracer_test.go b/tracer_test.go
@@ -312,6 +312,17 @@ func TestEmptySpanContextAsParent(t *testing.T) {
 	assert.True(t, ctx.IsValid())
 }
 
+func TestGen128Bit(t *testing.T) {
+	tracer, tc := NewTracer("x", NewConstSampler(true), NewNullReporter(), TracerOptions.Gen128Bit(true))
+	defer tc.Close()
+
+	span := tracer.StartSpan("test", opentracing.ChildOf(emptyContext))
+	defer span.Finish()
+	traceID := span.Context().(SpanContext).TraceID()
+	assert.True(t, traceID.High != 0)
+	assert.True(t, traceID.Low != 0)
+}
+
 func TestZipkinSharedRPCSpan(t *testing.T) {
 	tracer, tc := NewTracer("x", NewConstSampler(true), NewNullReporter(), TracerOptions.ZipkinSharedRPCSpan(false))