datadog_lambda 6.98.0__tar.gz → 6.100.0__tar.gz

{datadog_lambda-6.98.0 → datadog_lambda-6.100.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datadog_lambda
-Version: 6.98.0
+Version: 6.100.0
 Summary: The Datadog AWS Lambda Library
 Home-page: https://github.com/DataDog/datadog-lambda-python
 License: Apache-2.0
@@ -15,10 +15,11 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: dev
 Requires-Dist: boto3 (>=1.34.0,<2.0.0) ; extra == "dev"
 Requires-Dist: datadog (>=0.41.0,<1.0.0)
-Requires-Dist: ddtrace (>=2.10.0)
+Requires-Dist: ddtrace (>=2.15.0)
 Requires-Dist: flake8 (>=5.0.4,<6.0.0) ; extra == "dev"
 Requires-Dist: pytest (>=8.0.0,<9.0.0) ; extra == "dev"
 Requires-Dist: pytest-benchmark (>=4.0,<5.0) ; extra == "dev"

{datadog_lambda-6.98.0 → datadog_lambda-6.100.0}/datadog_lambda/metric.py

@@ -125,6 +125,7 @@ def flush_stats(lambda_context=None):
     lambda_stats.flush()
 
     if extension_thread_stats is not None:
+        tags = None
         if lambda_context is not None:
             tags = get_enhanced_metrics_tags(lambda_context)
             split_arn = lambda_context.invoked_function_arn.split(":")

datadog_lambda-6.100.0/datadog_lambda/span_pointers.py

@@ -0,0 +1,158 @@
+from itertools import chain
+import logging
+from typing import List
+
+from ddtrace._trace.utils_botocore.span_pointers.dynamodb import (
+    _aws_dynamodb_item_span_pointer_description,
+)
+from ddtrace._trace.utils_botocore.span_pointers.s3 import (
+    _aws_s3_object_span_pointer_description,
+)
+from ddtrace._trace._span_pointer import _SpanPointerDirection
+from ddtrace._trace._span_pointer import _SpanPointerDescription
+from datadog_lambda.trigger import EventTypes
+
+
+logger = logging.getLogger(__name__)
+
+
+def calculate_span_pointers(
+    event_source,
+    event,
+) -> List[_SpanPointerDescription]:
+    try:
+        if event_source.equals(EventTypes.S3):
+            return _calculate_s3_span_pointers_for_event(event)
+
+        elif event_source.equals(EventTypes.DYNAMODB):
+            return _calculate_dynamodb_span_pointers_for_event(event)
+
+    except Exception as e:
+        logger.warning(
+            "failed to calculate span pointers for event: %s",
+            e,
+        )
+
+    return []
+
+
+def _calculate_s3_span_pointers_for_event(event) -> List[_SpanPointerDescription]:
+    # Example event:
+    # https://docs.aws.amazon.com/lambda/latest/dg/with-s3.html
+
+    return list(
+        chain.from_iterable(
+            _calculate_s3_span_pointers_for_event_record(record)
+            for record in event.get("Records", [])
+        )
+    )
+
+
+def _calculate_s3_span_pointers_for_event_record(
+    record,
+) -> List[_SpanPointerDescription]:
+    # Event types:
+    # https://docs.aws.amazon.com/AmazonS3/latest/userguide/notification-how-to-event-types-and-destinations.html
+
+    if record.get("eventName").startswith("ObjectCreated:"):
+        s3_information = record.get("s3", None)
+        if s3_information is not None:
+            return _calculate_s3_span_pointers_for_object_created_s3_information(
+                s3_information
+            )
+
+    return []
+
+
+def _calculate_s3_span_pointers_for_object_created_s3_information(
+    s3_information,
+) -> List[_SpanPointerDescription]:
+    try:
+        bucket = s3_information["bucket"]["name"]
+        key = s3_information["object"]["key"]
+        etag = s3_information["object"]["eTag"]
+
+    except KeyError as e:
+        logger.warning(
+            "missing s3 information required to make a span pointer: %s",
+            e,
+        )
+        return []
+
+    try:
+        return [
+            _aws_s3_object_span_pointer_description(
+                pointer_direction=_SpanPointerDirection.UPSTREAM,
+                bucket=bucket,
+                key=key,
+                etag=etag,
+            )
+        ]
+
+    except Exception as e:
+        logger.warning(
+            "failed to generate S3 span pointer: %s",
+            e,
+        )
+        return []
+
+
+def _calculate_dynamodb_span_pointers_for_event(event) -> List[_SpanPointerDescription]:
+    # Example event:
+    # https://docs.aws.amazon.com/lambda/latest/dg/with-ddb.html
+
+    return list(
+        chain.from_iterable(
+            _calculate_dynamodb_span_pointers_for_event_record(record)
+            for record in event.get("Records", [])
+        )
+    )
+
+
+def _calculate_dynamodb_span_pointers_for_event_record(
+    record,
+) -> List[_SpanPointerDescription]:
+    try:
+        table_name = _extract_table_name_from_dynamodb_stream_record(record)
+        primary_key = record["dynamodb"]["Keys"]
+
+    except Exception as e:
+        logger.warning(
+            "missing DynamoDB information required to make a span pointer: %s",
+            e,
+        )
+        return []
+
+    try:
+        return [
+            _aws_dynamodb_item_span_pointer_description(
+                pointer_direction=_SpanPointerDirection.UPSTREAM,
+                table_name=table_name,
+                primary_key=primary_key,
+            )
+        ]
+
+    except Exception as e:
+        logger.warning(
+            "failed to generate DynamoDB span pointer: %s",
+            e,
+        )
+        return []
+
+
+def _extract_table_name_from_dynamodb_stream_record(record) -> str:
+    # Example eventSourceARN:
+    # arn:aws:dynamodb:us-east-2:123456789012:table/my-table/stream/2024-06-10T19:26:16.525
+    event_source_arn = record["eventSourceARN"]
+
+    [_arn, _aws, _dynamodb, _region, _account, dynamodb_info] = event_source_arn.split(
+        ":", maxsplit=5
+    )
+    if _arn != "arn" or _aws != "aws" or _dynamodb != "dynamodb":
+        raise ValueError(f"unexpected eventSourceARN format: {event_source_arn}")
+
+    [_table, table_name, _stream, _timestamp] = dynamodb_info.split("/")
+    if _table != "table" or _stream != "stream":
+        raise ValueError(f"unexpected eventSourceARN format: {event_source_arn}")
+
+    return table_name

{datadog_lambda-6.98.0 → datadog_lambda-6.100.0}/datadog_lambda/thread_stats_writer.py

@@ -27,8 +27,11 @@ class ThreadStatsWriter(StatsWriter):
         Modified based on `datadog.threadstats.base.ThreadStats.flush()`,
         to gain better control over exception handling.
         """
+        original_constant_tags = self.thread_stats.constant_tags.copy()
         if tags:
-            self.thread_stats.constant_tags = self.thread_stats.constant_tags + tags
+            # Temporarily add tags for this flush
+            self.thread_stats.constant_tags = original_constant_tags + tags
+
         _, dists = self.thread_stats._get_aggregate_metrics_and_dists(float("inf"))
         count_dists = len(dists)
         if not count_dists:
@@ -62,6 +65,9 @@ class ThreadStatsWriter(StatsWriter):
                 logger.debug(
                     "Flush #%s failed", self.thread_stats.flush_count, exc_info=True
                 )
+        finally:
+            # Reset constant_tags to its original state
+            self.thread_stats.constant_tags = original_constant_tags
 
     def stop(self):
         self.thread_stats.stop()

{datadog_lambda-6.98.0 → datadog_lambda-6.100.0}/datadog_lambda/tracing.py

@@ -407,6 +407,14 @@ def extract_context_from_step_functions(event, lambda_context):
         return extract_context_from_lambda_context(lambda_context)
 
 
+def is_legacy_lambda_step_function(event):
+    """
+    Check if the event is a step function that called a legacy lambda
+    """
+    event = event.get("Payload", {})
+    return "Execution" in event and "StateMachine" in event and "State" in event
+
+
 def extract_context_custom_extractor(extractor, event, lambda_context):
     """
     Extract Datadog trace context using a custom trace extractor function
@@ -1251,6 +1259,7 @@ def create_function_execution_span(
     merge_xray_traces,
     trigger_tags,
     parent_span=None,
+    span_pointers=None,
 ):
     tags = None
     if context:
@@ -1288,6 +1297,14 @@ def create_function_execution_span(
         span.set_tags(tags)
     if parent_span:
         span.parent_id = parent_span.span_id
+    if span_pointers:
+        for span_pointer_description in span_pointers:
+            span._add_span_pointer(
+                pointer_kind=span_pointer_description.pointer_kind,
+                pointer_direction=span_pointer_description.pointer_direction,
+                pointer_hash=span_pointer_description.pointer_hash,
+                extra_attributes=span_pointer_description.extra_attributes,
+            )
     return span
 
 

{datadog_lambda-6.98.0 → datadog_lambda-6.100.0}/datadog_lambda/trigger.py

@@ -299,6 +299,12 @@ def extract_http_tags(event):
     if headers and headers.get("Referer"):
         http_tags["http.referer"] = headers.get("Referer")
 
+    # Try to get `routeKey` from API GW v2; otherwise try to get `resource` from API GW v1
+    route = event.get("routeKey") or event.get("resource")
+    if route:
+        # "GET /my/endpoint" = > "/my/endpoint"
+        http_tags["http.route"] = route.split(" ")[-1]
+
     return http_tags
 
 

datadog_lambda-6.100.0/datadog_lambda/version.py

@@ -0,0 +1 @@
+__version__ = "6.100.0"

{datadog_lambda-6.98.0 → datadog_lambda-6.100.0}/datadog_lambda/wrapper.py

@@ -30,6 +30,7 @@ from datadog_lambda.metric import (
 )
 from datadog_lambda.module_name import modify_module_name
 from datadog_lambda.patch import patch_all
+from datadog_lambda.span_pointers import calculate_span_pointers
 from datadog_lambda.tracing import (
     extract_dd_trace_context,
     create_dd_dummy_metadata_subsegment,
@@ -44,6 +45,7 @@ from datadog_lambda.tracing import (
     is_authorizer_response,
     tracer,
     propagator,
+    is_legacy_lambda_step_function,
 )
 from datadog_lambda.trigger import (
     extract_trigger_tags,
@@ -277,6 +279,8 @@ class _LambdaDecorator(object):
             self.response = None
             set_cold_start(init_timestamp_ns)
             submit_invocations_metric(context)
+            if is_legacy_lambda_step_function(event):
+                event = event["Payload"]
             self.trigger_tags = extract_trigger_tags(event, context)
             # Extract Datadog trace context and source from incoming requests
             dd_context, trace_context_source, event_source = extract_dd_trace_context(
@@ -304,14 +308,15 @@ class _LambdaDecorator(object):
                         event, context, event_source, self.decode_authorizer_context
                     )
                 self.span = create_function_execution_span(
-                    context,
-                    self.function_name,
-                    is_cold_start(),
-                    is_proactive_init(),
-                    trace_context_source,
-                    self.merge_xray_traces,
-                    self.trigger_tags,
+                    context=context,
+                    function_name=self.function_name,
+                    is_cold_start=is_cold_start(),
+                    is_proactive_init=is_proactive_init(),
+                    trace_context_source=trace_context_source,
+                    merge_xray_traces=self.merge_xray_traces,
+                    trigger_tags=self.trigger_tags,
                     parent_span=self.inferred_span,
+                    span_pointers=calculate_span_pointers(event_source, event),
                 )
             else:
                 set_correlation_ids()

{datadog_lambda-6.98.0 → datadog_lambda-6.100.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datadog_lambda"
-version = "6.98.0"
+version = "6.100.0"
 description = "The Datadog AWS Lambda Library"
 authors = ["Datadog, Inc. <dev@datadoghq.com>"]
 license = "Apache-2.0"
@@ -27,7 +27,7 @@ classifiers = [
 python = ">=3.8.0,<4"
 datadog = ">=0.41.0,<1.0.0"
 wrapt = "^1.11.2"
-ddtrace = ">=2.10.0"
+ddtrace = ">=2.15.0"
 ujson = ">=5.9.0"
 boto3 = { version = "^1.34.0", optional = true }
 requests = { version ="^2.22.0", optional = true }

datadog_lambda-6.98.0/datadog_lambda/version.py

@@ -1 +0,0 @@
-__version__ = "6.98.0"