Adjust logic for context propagation for the inferred spans to avoid …

…creating multiple aws apigateway spans for one request and adjust the test.

ddtrace/_trace/trace_handlers.py

@@ -203,6 +203,10 @@ def _on_inferred_proxy_start(ctx, tracer, span_kwargs, call_trace, distributed_h
     if not config._inferred_proxy_services_enabled:
         return
 
+    # Skip creating another inferred span if one has already been created for this request
+    if ctx.get_item("inferred_proxy_span"):
+        return
+
     # Inferred Proxy Spans
     if distributed_headers_config and ctx.get_item("distributed_headers", None):
         # Extract distributed tracing headers if they exist
@@ -225,7 +229,7 @@ def _on_inferred_proxy_start(ctx, tracer, span_kwargs, call_trace, distributed_h
         inferred_proxy_span = ctx.get_item("inferred_proxy_span")
 
         # use the inferred proxy span as the new parent span
-        if inferred_proxy_span and not call_trace:
+        if inferred_proxy_span:
             span_kwargs["child_of"] = inferred_proxy_span
             ctx.set_item("span_kwargs", span_kwargs)
 

tests/contrib/django/test_django.py

@@ -1856,7 +1856,7 @@ def test_inferred_spans_api_gateway_distributed_tracing(client, test_spans):
         trace_id=1,
         parent_id=2,
         metrics={
-            SAMPLING_PRIORITY_KEY: USER_KEEP,
+            _SAMPLING_PRIORITY_KEY: USER_KEEP,
         },
         sampled=True,
     )
@@ -1876,6 +1876,7 @@ def test_inferred_spans_api_gateway_distributed_tracing(client, test_spans):
             trace_id=1,
             sampled=True,
         )
+        assert len(test_spans.spans) == 27
         assert aws_gateway_span.trace_id == 1
         assert aws_gateway_span.parent_id == 2
         assert aws_gateway_span.sampled is True