Skip to content

Use xray context span id when it exists #401

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
merged 2 commits into from
Nov 30, 2023
Merged

Use xray context span id when it exists #401

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
f8d6173
Extract xray context span id when it exists
danielebra Nov 29, 2023
354a61b
Add test for no Parent in _X_AMZN_TRACE_ID.
purple4reina Nov 29, 2023
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
2 changes: 1 addition & 1 deletion datadog_lambda/tracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ def set_dd_trace_py_root(trace_context_source, merge_xray_traces):
)
if merge_xray_traces:
xray_context = _get_xray_trace_context()
if xray_context.span_id:
if xray_context and xray_context.span_id:
context.span_id = xray_context.span_id

tracer.context_provider.activate(context)
Expand Down
25 changes: 25 additions & 0 deletions tests/test_tracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from datadog_lambda.constants import (
SamplingPriority,
TraceHeader,
TraceContextSource,
XraySubsegment,
)
from datadog_lambda.tracing import (
Expand Down Expand Up @@ -854,6 +855,30 @@ def test_mixed_parent_context_when_merging(self):
self.mock_activate.assert_called()
self.mock_activate.assert_has_calls([call(expected_context)])

def test_set_dd_trace_py_root_no_span_id(self):
os.environ["_X_AMZN_TRACE_ID"] = "Root=1-5e272390-8c398be037738dc042009320"

lambda_ctx = get_mock_context()
ctx, source, event_type = extract_dd_trace_context(
{
"headers": {
TraceHeader.TRACE_ID: "123",
TraceHeader.PARENT_ID: "321",
TraceHeader.SAMPLING_PRIORITY: "1",
}
},
lambda_ctx,
)
set_dd_trace_py_root(TraceContextSource.EVENT, True)

expected_context = Context(
trace_id=123, # Trace Id from incomming context
span_id=321, # Span Id from incoming context
sampling_priority=1, # Sampling priority from incomming context
)
self.mock_activate.assert_called()
self.mock_activate.assert_has_calls([call(expected_context)])


class TestAuthorizerInferredSpans(unittest.TestCase):
def setUp(self):
Expand Down