Skip to content

Use SingleHeader format for unspecified B3 inject encoding #614

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

Merged
Aneurysm9 merged 3 commits into from
Mar 18, 2021
Merged

Use SingleHeader format for unspecified B3 inject encoding #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8855972
Use SingleHeader format for unspecified B3 encoding
gunturaf Mar 13, 2021
9f30d34
Apply suggestions from code review
gunturaf Mar 17, 2021
d2ddc0f
Merge branch 'main' into default-b3-encoding
gunturaf Mar 17, 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
34 changes: 19 additions & 15 deletions propagators/b3/b3_data_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,12 +541,13 @@ var injectHeader = []injectTest{
TraceFlags: trace.FlagsSampled,
},
wantHeaders: map[string]string{
b3TraceID: traceIDStr,
b3SpanID: spanIDStr,
b3Sampled: "1",
b3Context: fmt.Sprintf("%s-%s-%s", traceIDStr, spanIDStr, "1"),
},
doNotWantHeaders: []string{
b3ParentSpanID,
Comment thread
gunturaf marked this conversation as resolved.
b3TraceID,
b3SpanID,
b3Sampled,
b3Flags,
b3Context,
},
Expand All @@ -558,12 +559,13 @@ var injectHeader = []injectTest{
SpanID: spanID,
},
wantHeaders: map[string]string{
b3TraceID: traceIDStr,
b3SpanID: spanIDStr,
b3Sampled: "0",
b3Context: fmt.Sprintf("%s-%s-%s", traceIDStr, spanIDStr, "0"),
},
doNotWantHeaders: []string{
b3ParentSpanID,
Comment thread
gunturaf marked this conversation as resolved.
b3TraceID,
b3SpanID,
b3Sampled,
b3Flags,
b3Context,
},
Expand All @@ -576,11 +578,12 @@ var injectHeader = []injectTest{
TraceFlags: trace.FlagsDeferred,
},
wantHeaders: map[string]string{
b3TraceID: traceIDStr,
b3SpanID: spanIDStr,
b3Context: fmt.Sprintf("%s-%s", traceIDStr, spanIDStr),
},
doNotWantHeaders: []string{
b3Sampled,
Comment thread
gunturaf marked this conversation as resolved.
b3TraceID,
b3SpanID,
b3ParentSpanID,
b3Flags,
b3Context,
Expand All @@ -592,7 +595,7 @@ var injectHeader = []injectTest{
TraceFlags: trace.FlagsSampled,
},
wantHeaders: map[string]string{
b3Sampled: "1",
b3Context: "1",
},
doNotWantHeaders: []string{
b3TraceID,
Expand All @@ -610,12 +613,12 @@ var injectHeader = []injectTest{
TraceFlags: trace.FlagsDebug,
},
wantHeaders: map[string]string{
b3TraceID: traceIDStr,
b3SpanID: spanIDStr,
b3Flags: "1",
b3Context: fmt.Sprintf("%s-%s-%s", traceIDStr, spanIDStr, "d"),
},
doNotWantHeaders: []string{
b3Sampled,
Comment thread
gunturaf marked this conversation as resolved.
traceIDStr,
spanIDStr,
b3ParentSpanID,
b3Context,
},
Expand All @@ -628,12 +631,13 @@ var injectHeader = []injectTest{
TraceFlags: trace.FlagsSampled | trace.FlagsDebug,
},
wantHeaders: map[string]string{
b3TraceID: traceIDStr,
b3SpanID: spanIDStr,
b3Flags: "1",
b3Context: fmt.Sprintf("%s-%s-%s", traceIDStr, spanIDStr, "d"),
},
doNotWantHeaders: []string{
b3Sampled,
Comment thread
gunturaf marked this conversation as resolved.
traceIDStr,
spanIDStr,
b3Flags,
b3ParentSpanID,
b3Context,
},
Expand Down
4 changes: 2 additions & 2 deletions propagators/b3/b3_propagator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ var _ propagation.TextMapPropagator = B3{}
func (b3 B3) Inject(ctx context.Context, carrier propagation.TextMapCarrier) {
sc := trace.SpanFromContext(ctx).SpanContext()

if b3.InjectEncoding.supports(B3SingleHeader) {
if b3.InjectEncoding.supports(B3SingleHeader) || b3.InjectEncoding == B3Unspecified {
header := []string{}
if sc.TraceID.IsValid() && sc.SpanID.IsValid() {
header = append(header, sc.TraceID.String(), sc.SpanID.String())
Expand All @@ -123,7 +123,7 @@ func (b3 B3) Inject(ctx context.Context, carrier propagation.TextMapCarrier) {
carrier.Set(b3ContextHeader, strings.Join(header, "-"))
}

if b3.InjectEncoding.supports(B3MultipleHeader) || b3.InjectEncoding == B3Unspecified {
if b3.InjectEncoding.supports(B3MultipleHeader) {
if sc.TraceID.IsValid() && sc.SpanID.IsValid() {
carrier.Set(b3TraceIDHeader, sc.TraceID.String())
carrier.Set(b3SpanIDHeader, sc.SpanID.String())
Expand Down