Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ddtrace/tracer: format injected traceid header with leading zeros #817

Merged
merged 2 commits into from
Feb 2, 2021
Merged

ddtrace/tracer: format injected traceid header with leading zeros #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57b2e10
format injected traceid header with leading zeros
nicoledanuwidjaja Jan 13, 2021
c0420dd
add table test and remove FormatUint
nicoledanuwidjaja Jan 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ddtrace/tracer/textmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package tracer

import (
"fmt"
"net/http"
"os"
"strconv"
Expand Down Expand Up @@ -306,8 +307,8 @@ func (*propagatorB3) injectTextMap(spanCtx ddtrace.SpanContext, writer TextMapWr
if !ok || ctx.traceID == 0 || ctx.spanID == 0 {
return ErrInvalidSpanContext
}
writer.Set(b3TraceIDHeader, strconv.FormatUint(ctx.traceID, 16))
writer.Set(b3SpanIDHeader, strconv.FormatUint(ctx.spanID, 16))
writer.Set(b3TraceIDHeader, fmt.Sprintf("%016x", ctx.traceID))
writer.Set(b3SpanIDHeader, fmt.Sprintf("%016x", ctx.spanID))
if p, ok := ctx.samplingPriority(); ok {
if p >= ext.PriorityAutoKeep {
writer.Set(b3SampledHeader, "1")
Expand Down
56 changes: 44 additions & 12 deletions ddtrace/tracer/textmap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,20 +206,52 @@ func TestB3(t *testing.T) {
os.Setenv("DD_PROPAGATION_STYLE_INJECT", "B3")
defer os.Unsetenv("DD_PROPAGATION_STYLE_INJECT")

tracer := newTracer()
root := tracer.StartSpan("web.request").(*span)
root.SetTag(ext.SamplingPriority, -1)
root.SetBaggageItem("item", "x")
ctx := root.Context().(*spanContext)
headers := TextMapCarrier(map[string]string{})
err := tracer.Inject(ctx, headers)
var tests = []struct {
in []uint64
out map[string]string
}{
{
[]uint64{1412508178991881, 1842642739201064},
map[string]string{
b3TraceIDHeader: "000504ab30404b09",
b3SpanIDHeader: "00068bdfb1eb0428",
},
},
{
[]uint64{9530669991610245, 9455715668862222},
map[string]string{
b3TraceIDHeader: "0021dc1807524785",
b3SpanIDHeader: "002197ec5d8a250e",
},
},
{
[]uint64{1, 1},
map[string]string{
b3TraceIDHeader: "0000000000000001",
b3SpanIDHeader: "0000000000000001",
},
},
}

assert := assert.New(t)
assert.Nil(err)
for _, test := range tests {
t.Run("", func(t *testing.T) {
tracer := newTracer()
root := tracer.StartSpan("web.request").(*span)
root.SetTag(ext.SamplingPriority, -1)
root.SetBaggageItem("item", "x")
ctx, ok := root.Context().(*spanContext)
ctx.traceID = test.in[0]
ctx.spanID = test.in[1]
headers := TextMapCarrier(map[string]string{})
err := tracer.Inject(ctx, headers)

assert.Equal(headers[b3TraceIDHeader], strconv.FormatUint(root.TraceID, 16))
assert.Equal(headers[b3SpanIDHeader], strconv.FormatUint(root.SpanID, 16))
assert.Equal(headers[b3SampledHeader], "0")
assert := assert.New(t)
assert.True(ok)
assert.Nil(err)
assert.Equal(test.out[b3TraceIDHeader], headers[b3TraceIDHeader])
assert.Equal(test.out[b3SpanIDHeader], headers[b3SpanIDHeader])
})
}
})

t.Run("extract", func(t *testing.T) {
Expand Down