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

w3c(phase 3): ensure last datadog parent id is always recorded #3631

Merged
merged 12 commits into from
Jun 7, 2024
Merged

w3c(phase 3): ensure last datadog parent id is always recorded #3631

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8b9be7f
w3c(phase 3): ensure last datadog parent id is always recorded
mabdinur May 7, 2024
4a807ac
define constant and lint
mabdinur May 8, 2024
5c0f0f8
fix
mabdinur May 8, 2024
3fd0ff8
add back comment
mabdinur May 9, 2024
0e6ba92
s
mabdinur May 9, 2024
93c11c8
add back new line
mabdinur May 9, 2024
0e3a0f1
propagate lpid if spans are not equal
mabdinur May 9, 2024
fc8c409
use new w3c phase 3 spec
mabdinur May 13, 2024
09ca82f
remove useless case and add a basic test
mabdinur May 15, 2024
12fdfef
fix comment
mabdinur May 17, 2024
3227a29
lint and add more test coverage
mabdinur May 23, 2024
8ec243d
Merge remote-tracking branch 'origin/master' into munir/w3c-phase-3
mabdinur Jun 7, 2024
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
8 changes: 7 additions & 1 deletion lib/datadog/tracing/distributed/propagation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,13 @@ def extract(data)
if (tracecontext_digest = propagator.extract(data))
# Only parse if it represent the same trace as the successfully extracted one
next unless tracecontext_digest.trace_id == extracted_trace_digest.trace_id

tracecontext_digest.trace_distributed_tags |= {}
mabdinur marked this conversation as resolved.
Show resolved Hide resolved
extracted_trace_digest.trace_distributed_tags[Tracing::Metadata::Ext::Distributed::TAG_DD_PARENT_ID] = if tracecontext_digest.span_id == extracted_trace_digest.span_id
"%.16x" % tracecontext_digest.span_id
else
# Preserve the last datadog parent id in `trace_distributed_tags`
tracecontext_digest.trace_distributed_tags.fetch(Tracing::Metadata::Ext::Distributed::TAG_DD_PARENT_ID, Tracing::Metadata::Ext::Distributed::DD_PARENT_ID_DEFAULT)
end
# Preserve the `tracestate`
extracted_trace_digest = extracted_trace_digest.merge(
mabdinur marked this conversation as resolved.
Show resolved Hide resolved
trace_state: tracecontext_digest.trace_state,
Expand Down
2 changes: 1 addition & 1 deletion lib/datadog/tracing/distributed/trace_context.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def extract(data)
end

tags ||= {}
tags[Tracing::Metadata::Ext::Distributed::TAG_DD_PARENT_ID] = ts_parent_id || '0000000000000000'
tags[Tracing::Metadata::Ext::Distributed::TAG_DD_PARENT_ID] = ts_parent_id || Tracing::Metadata::Ext::Distributed::DD_PARENT_ID_DEFAULT

TraceDigest.new(
span_id: parent_id,
Expand Down
1 change: 1 addition & 0 deletions lib/datadog/tracing/metadata/ext.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ module Distributed
TAG_SAMPLING_PRIORITY = '_sampling_priority_v1'

TAG_DD_PARENT_ID = '_dd.parent_id'
DD_PARENT_ID_DEFAULT = '0000000000000000'

# Trace tags with this prefix will propagate from a trace through distributed tracing.
# Distributed headers tags with this prefix will be injected into the active trace.
Expand Down
Loading