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: fix issue extracting B3 tracing ID of 128 bits #780

Merged
merged 4 commits into from
Nov 19, 2020
Merged

ddtrace/tracer: fix issue extracting B3 tracing ID of 128 bits #780

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2928aa8
Fix when parsing b3 trace ID, make sure it works with 128 bytes id
Nov 18, 2020
c831e95
Removed empty line and added happy test case
Nov 18, 2020
94300cd
Refactor test case and added one for 64 bits
Nov 18, 2020
494bb1a
Removed test labels
Nov 19, 2020
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
4 changes: 4 additions & 0 deletions ddtrace/tracer/textmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,10 @@ func (*propagatorB3) extractTextMap(reader TextMapReader) (ddtrace.SpanContext,
key := strings.ToLower(k)
switch key {
case b3TraceIDHeader:
if len(v) > 16 {
v = v[len(v)-16:]
}

stroem marked this conversation as resolved.
Show resolved Hide resolved
ctx.traceID, err = strconv.ParseUint(v, 16, 64)
if err != nil {
return ErrSpanContextCorrupted
Expand Down