Merge pull request #60 from DataDog/darcy.rayner/fix-tracing-edge-case

Fix parent source as being set as Xray, when trace merging disabled
DataDog · May 14, 2020 · 9999a37 · 9999a37
2 parents 510f1d0 + 6018352
commit 9999a37
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/datadog_lambda/tracing.py b/datadog_lambda/tracing.py
@@ -234,7 +234,7 @@ def set_dd_trace_py_root(trace_context, merge_xray_traces):
 
 
 def create_function_execution_span(
-    context, function_name, is_cold_start, trace_context
+    context, function_name, is_cold_start, trace_context, merge_xray_traces
 ):
     tags = {}
     if context:
@@ -246,7 +246,7 @@ def create_function_execution_span(
             "resource_names": context.function_name,
         }
     source = trace_context["source"]
-    if source != TraceContextSource.DDTRACE:
+    if source == TraceContextSource.XRAY and merge_xray_traces:
         tags["_dd.parent_source"] = source
 
     args = {

diff --git a/datadog_lambda/wrapper.py b/datadog_lambda/wrapper.py
@@ -122,7 +122,11 @@ def _before(self, event, context):
             if dd_tracing_enabled:
                 set_dd_trace_py_root(dd_context, self.merge_xray_traces)
                 self.span = create_function_execution_span(
-                    context, self.function_name, is_cold_start(), dd_context
+                    context,
+                    self.function_name,
+                    is_cold_start(),
+                    dd_context,
+                    self.merge_xray_traces,
                 )
             else:
                 set_correlation_ids()