Skip to content

Commit 6b67412

Browse files
authored
Prevent error when attempting to use None context. (#541)
1 parent 67dda58 commit 6b67412

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

datadog_lambda/tracing.py

+2
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,8 @@ def inject_correlation_ids():
699699

700700

701701
def set_dd_trace_py_root(trace_context_source, merge_xray_traces):
702+
if not _is_context_complete(dd_trace_context):
703+
return
702704
if trace_context_source == TraceContextSource.EVENT or merge_xray_traces:
703705
context = Context(
704706
trace_id=dd_trace_context.trace_id,

tests/test_tracing.py

+7
Original file line numberDiff line numberDiff line change
@@ -934,6 +934,9 @@ def setUp(self):
934934
self.mock_activate = patcher.start()
935935
self.mock_activate.return_value = True
936936
self.addCleanup(patcher.stop)
937+
patcher = patch("datadog_lambda.tracing.dd_trace_context", None)
938+
self.mock_dd_trace_context = patcher.start()
939+
self.addCleanup(patcher.stop)
937940

938941
def tearDown(self):
939942
global dd_tracing_enabled
@@ -991,6 +994,10 @@ def test_set_dd_trace_py_root_no_span_id(self):
991994
self.mock_activate.assert_called()
992995
self.mock_activate.assert_has_calls([call(expected_context)])
993996

997+
def test_set_dd_trace_py_root_none_context(self):
998+
set_dd_trace_py_root(TraceContextSource.EVENT, True)
999+
self.mock_activate.assert_not_called()
1000+
9941001

9951002
class TestServiceMapping(unittest.TestCase):
9961003
def setUp(self):

0 commit comments

Comments
 (0)