Merge branch 'main' into feat/support-eb-dsm-extraction

Author: jeastham1993

datadog_lambda/cold_start.py

@@ -202,7 +202,11 @@ def trace(self, root_nodes: List[ImportNode] = root_nodes):
         cold_start_span = self.create_cold_start_span(cold_start_span_start_time_ns)
         while root_nodes:
             root_node = root_nodes.pop()
-            parent = root_node.context or cold_start_span
+            # Modules lazily imported during the invocation hang off the function
+            # span, not the span active at import time: nesting them under a
+            # client span (e.g. a DynamoDB call) makes the backend peer service
+            # pipeline map that client's host to the import span's service.
+            parent = self.trace_ctx if root_node.context else cold_start_span
             self.trace_tree(root_node, parent)
         self.finish_span(cold_start_span, cold_start_span_end_time_ns)
 

scripts/check_layer_size.sh

@@ -8,7 +8,7 @@
 # Compares layer size to threshold, and fails if below that threshold
 
 set -e
-MAX_LAYER_COMPRESSED_SIZE_KB=$(expr 9 \* 1024 + 128)      # 9344 KB
+MAX_LAYER_COMPRESSED_SIZE_KB=$(expr 10 \* 1024)     # 10240 KB
 MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(expr 25 \* 1024)   # 25600 KB
 
 

tests/test_cold_start.py

@@ -325,3 +325,45 @@ def handler(event, context):
     assert import_span.trace_id == function_span.trace_id
     assert load_span is not None
     assert load_span.trace_id == function_span.trace_id
+
+
+def test_lazy_loaded_package_imports_inside_client_span(monkeypatch):
+    spans = []
+
+    def finish(span):
+        spans.append(span)
+
+    monkeypatch.setattr(wrapper.tracer, "_on_span_finish", finish)
+    monkeypatch.setattr(wrapper, "is_new_sandbox", lambda: True)
+    monkeypatch.setattr("datadog_lambda.config.Config.trace_enabled", True)
+    monkeypatch.setenv(
+        "DD_COLD_START_TRACE_SKIP_LIB", "ddtrace.contrib.logging,datadog_lambda.wrapper"
+    )
+    monkeypatch.setenv("DD_MIN_COLD_START_DURATION", "0")
+    # ensure the import below is not served from the module cache
+    monkeypatch.delitem(modules, "colorsys", raising=False)
+
+    @wrapper.datadog_lambda_wrapper
+    def handler(event, context):
+        # e.g. botocore lazily importing modules on the first DynamoDB call
+        with wrapper.tracer.trace("dynamodb.command", service="aws.dynamodb") as span:
+            span.set_tag("span.kind", "client")
+            import colorsys  # noqa: F401
+
+    handler({}, get_mock_context())
+
+    function_span = client_span = import_span = None
+    for span in spans:
+        if span.resource == "colorsys":
+            import_span = span
+        elif span.name == "aws.lambda":
+            function_span = span
+        elif span.name == "dynamodb.command":
+            client_span = span
+
+    assert function_span is not None
+    assert client_span is not None
+    assert import_span is not None
+    assert import_span.parent_id == function_span.span_id
+    assert import_span.parent_id != client_span.span_id
+    assert import_span.trace_id == function_span.trace_id