Fix binary propagation

Author: tonyredondo

tracer/api_test.go

@@ -1,6 +1,7 @@
 package tracer
 
 import (
+	"github.com/google/uuid"
 	"testing"
 
 	ot "github.com/opentracing/opentracing-go"
@@ -11,7 +12,7 @@ import (
 func newTracer() (tracer ot.Tracer, closer func()) {
 	tracer = NewWithOptions(Options{
 		Recorder:     NewInMemoryRecorder(),
-		ShouldSample: func(traceID uint64) bool { return true }, // always sample
+		ShouldSample: func(traceID uuid.UUID) bool { return true }, // always sample
 	})
 	return tracer, nil
 }

tracer/bench_test.go

@@ -3,6 +3,7 @@ package tracer
 import (
 	"bytes"
 	"fmt"
+	"github.com/google/uuid"
 	"net/http"
 	"testing"
 
@@ -80,7 +81,7 @@ func BenchmarkTrimmedSpan_100Events_100Tags_100BaggageItems(b *testing.B) {
 	var r CountingRecorder
 	opts := DefaultOptions()
 	opts.TrimUnsampledSpans = true
-	opts.ShouldSample = func(_ uint64) bool { return false }
+	opts.ShouldSample = func(_ uuid.UUID) bool { return false }
 	opts.Recorder = &r
 	t := NewWithOptions(opts)
 	benchmarkWithOpsAndCB(b, func() opentracing.Span {

tracer/propagation_ot.go

@@ -180,7 +180,8 @@ func (p *binaryPropagator) Inject(
 
 	state := wire.TracerState{}
 	bytes, _ := sc.TraceID.MarshalBinary()
-	state.TraceId = binary.LittleEndian.Uint64(bytes[8:])
+	state.TraceIdHi = binary.LittleEndian.Uint64(bytes[:8])
+	state.TraceIdLo = binary.LittleEndian.Uint64(bytes[8:])
 	state.SpanId = sc.SpanID
 	state.Sampled = sc.Sampled
 	state.BaggageItems = sc.Baggage
@@ -230,7 +231,8 @@ func (p *binaryPropagator) Extract(
 	}
 
 	traceIdBytes := make([]byte, 16)
-	binary.LittleEndian.PutUint64(traceIdBytes, ctx.TraceId)
+	binary.LittleEndian.PutUint64(traceIdBytes[:8], ctx.TraceIdHi)
+	binary.LittleEndian.PutUint64(traceIdBytes[8:], ctx.TraceIdLo)
 	traceID, _ := uuid.FromBytes(traceIdBytes)
 	return SpanContext{
 		TraceID: traceID,

tracer/propagation_test.go

@@ -2,6 +2,7 @@ package tracer_test
 
 import (
 	"bytes"
+	"github.com/google/uuid"
 	"net/http"
 	"reflect"
 	"testing"
@@ -29,11 +30,11 @@ func (vc *verbatimCarrier) GetBaggage(f func(string, string)) {
 	}
 }
 
-func (vc *verbatimCarrier) SetState(tID, sID uint64, sampled bool) {
+func (vc *verbatimCarrier) SetState(tID uuid.UUID, sID uint64, sampled bool) {
 	vc.SpanContext = tracer.SpanContext{TraceID: tID, SpanID: sID, Sampled: sampled}
 }
 
-func (vc *verbatimCarrier) State() (traceID, spanID uint64, sampled bool) {
+func (vc *verbatimCarrier) State() (traceID uuid.UUID, spanID uint64, sampled bool) {
 	return vc.SpanContext.TraceID, vc.SpanContext.SpanID, vc.SpanContext.Sampled
 }
 

tracer/span_test.go

@@ -1,6 +1,7 @@
 package tracer
 
 import (
+	"github.com/google/uuid"
 	"reflect"
 	"strconv"
 	"testing"
@@ -15,7 +16,7 @@ func TestSpan_Baggage(t *testing.T) {
 	recorder := NewInMemoryRecorder()
 	tracer := NewWithOptions(Options{
 		Recorder:     recorder,
-		ShouldSample: func(traceID uint64) bool { return true }, // always sample
+		ShouldSample: func(traceID uuid.UUID) bool { return true }, // always sample
 	})
 	span := tracer.StartSpan("x")
 	span.SetBaggageItem("x", "y")
@@ -52,7 +53,7 @@ func TestSpan_Sampling(t *testing.T) {
 	recorder := NewInMemoryRecorder()
 	tracer := NewWithOptions(Options{
 		Recorder:     recorder,
-		ShouldSample: func(traceID uint64) bool { return true },
+		ShouldSample: func(traceID uuid.UUID) bool { return true },
 	})
 	span := tracer.StartSpan("x")
 	span.Finish()
@@ -66,7 +67,7 @@ func TestSpan_Sampling(t *testing.T) {
 
 	tracer = NewWithOptions(Options{
 		Recorder:     recorder,
-		ShouldSample: func(traceID uint64) bool { return false },
+		ShouldSample: func(traceID uuid.UUID) bool { return false },
 	})
 
 	recorder.Reset()
@@ -85,7 +86,7 @@ func TestSpan_SingleLoggedTaggedSpan(t *testing.T) {
 	recorder := NewInMemoryRecorder()
 	tracer := NewWithOptions(Options{
 		Recorder:     recorder,
-		ShouldSample: func(traceID uint64) bool { return true }, // always sample
+		ShouldSample: func(traceID uuid.UUID) bool { return true }, // always sample
 	})
 	span := tracer.StartSpan("x")
 	span.LogEventWithPayload("event", "payload")
@@ -112,7 +113,7 @@ func TestSpan_TrimUnsampledSpans(t *testing.T) {
 	// Tracer that trims only unsampled but always samples
 	tracer := NewWithOptions(Options{
 		Recorder:           recorder,
-		ShouldSample:       func(traceID uint64) bool { return true }, // always sample
+		ShouldSample:       func(traceID uuid.UUID) bool { return true }, // always sample
 		TrimUnsampledSpans: true,
 	})
 
@@ -133,7 +134,7 @@ func TestSpan_TrimUnsampledSpans(t *testing.T) {
 	// Tracer that trims only unsampled and never samples
 	tracer = NewWithOptions(Options{
 		Recorder:           recorder,
-		ShouldSample:       func(traceID uint64) bool { return false }, // never sample
+		ShouldSample:       func(traceID uuid.UUID) bool { return false }, // never sample
 		TrimUnsampledSpans: true,
 	})
 
@@ -152,7 +153,7 @@ func TestSpan_DropAllLogs(t *testing.T) {
 	// Tracer that drops logs
 	tracer := NewWithOptions(Options{
 		Recorder:     recorder,
-		ShouldSample: func(traceID uint64) bool { return true }, // always sample
+		ShouldSample: func(traceID uuid.UUID) bool { return true }, // always sample
 		DropAllLogs:  true,
 	})
 
@@ -175,7 +176,7 @@ func TestSpan_MaxLogSperSpan(t *testing.T) {
 			// Tracer that only retains the last <limit> logs.
 			tracer := NewWithOptions(Options{
 				Recorder:       recorder,
-				ShouldSample:   func(traceID uint64) bool { return true }, // always sample
+				ShouldSample:   func(traceID uuid.UUID) bool { return true }, // always sample
 				MaxLogsPerSpan: limit,
 			})
 

tracer/wire/carrier.go

@@ -1,21 +1,32 @@
 package wire
 
+import (
+	"encoding/binary"
+	"github.com/google/uuid"
+)
+
 // ProtobufCarrier is a DelegatingCarrier that uses protocol buffers as the
 // the underlying datastructure. The reason for implementing DelagatingCarrier
 // is to allow for end users to serialize the underlying protocol buffers using
 // jsonpb or any other serialization forms they want.
 type ProtobufCarrier TracerState
 
 // SetState set's the tracer state.
-func (p *ProtobufCarrier) SetState(traceID, spanID uint64, sampled bool) {
-	p.TraceId = traceID
+func (p *ProtobufCarrier) SetState(traceID uuid.UUID, spanID uint64, sampled bool) {
+	bytes, _ := traceID.MarshalBinary()
+	p.TraceIdHi = binary.LittleEndian.Uint64(bytes[:8])
+	p.TraceIdLo = binary.LittleEndian.Uint64(bytes[8:])
 	p.SpanId = spanID
 	p.Sampled = sampled
 }
 
 // State returns the tracer state.
-func (p *ProtobufCarrier) State() (traceID, spanID uint64, sampled bool) {
-	traceID = p.TraceId
+func (p *ProtobufCarrier) State() (traceID uuid.UUID, spanID uint64, sampled bool) {
+	traceIdBytes := make([]byte, 16)
+	binary.LittleEndian.PutUint64(traceIdBytes[:8], p.TraceIdHi)
+	binary.LittleEndian.PutUint64(traceIdBytes[8:], p.TraceIdLo)
+	tId, _ := uuid.FromBytes(traceIdBytes)
+	traceID = tId
 	spanID = p.SpanId
 	sampled = p.Sampled
 	return traceID, spanID, sampled