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: handle parent-id header of 0 for synthetics #1285

Merged
merged 2 commits into from May 18, 2022
Merged

ddtrace/tracer: handle parent-id header of 0 for synthetics #1285

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
98c8014
handle synthetics origin parent id
mackjmr May 10, 2022
e8053a2
Merge branch 'v1' into mackjmr/synthetics-origin-parent-id
dianashevchenko May 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ddtrace/tracer/textmap.go
View file
Open in desktop
Expand Up @@ -310,7 +310,7 @@ func (p *propagator) extractTextMap(reader TextMapReader) (ddtrace.SpanContext,
if err != nil {
return nil, err
}
if ctx.traceID == 0 || ctx.spanID == 0 {
if ctx.traceID == 0 || (ctx.spanID == 0 && ctx.origin != "synthetics") {
return nil, ErrSpanContextNotFound
}
return &ctx, nil
Expand Down
26 changes: 26 additions & 0 deletions ddtrace/tracer/textmap_test.go
View file
Open in desktop
Expand Up @@ -117,6 +117,12 @@ func TestTextMapPropagatorErrors(t *testing.T) {
DefaultParentIDHeader: "0",
}))
assert.Equal(ErrSpanContextNotFound, err)

_, err = propagator.Extract(TextMapCarrier(map[string]string{
DefaultTraceIDHeader: "3",
DefaultParentIDHeader: "0",
}))
assert.Equal(ErrSpanContextNotFound, err)
}

func TestTextMapPropagatorInjectHeader(t *testing.T) {
Expand Down Expand Up @@ -175,6 +181,26 @@ func TestTextMapPropagatorOrigin(t *testing.T) {
}
}

func TestExtractOriginSynthetics(t *testing.T) {
src := TextMapCarrier(map[string]string{
originHeader: "synthetics",
DefaultTraceIDHeader: "3",
DefaultParentIDHeader: "0",
})
tracer := newTracer()
ctx, err := tracer.Extract(src)
if err != nil {
t.Fatal(err)
}
sctx, ok := ctx.(*spanContext)
if !ok {
t.Fatal("not a *spanContext")
}
assert.Equal(t, sctx.spanID, uint64(0))
assert.Equal(t, sctx.traceID, uint64(3))
assert.Equal(t, sctx.origin, "synthetics")
}

func TestTextMapPropagatorInvalidTraceTagsHeader(t *testing.T) {
src := TextMapCarrier(map[string]string{
DefaultTraceIDHeader: "1",
Expand Down