datadog_lambda 6.99.0__py3-none-any.whl → 6.101.0__py3-none-any.whl

datadog_lambda/span_pointers.py

@@ -1,10 +1,8 @@
 from itertools import chain
 import logging
+import os
 from typing import List
 
-from ddtrace._trace.utils_botocore.span_pointers 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
@@ -13,18 +11,28 @@ from datadog_lambda.trigger import EventTypes
 logger = logging.getLogger(__name__)
 
 
+dd_botocore_add_span_pointers = os.environ.get(
+    "DD_BOTOCORE_ADD_SPAN_POINTERS", "true"
+).lower() in ("true", "1")
+
+
 def calculate_span_pointers(
     event_source,
     event,
+    botocore_add_span_pointers=dd_botocore_add_span_pointers,
 ) -> List[_SpanPointerDescription]:
     try:
-        if event_source.equals(EventTypes.S3):
-            return _calculate_s3_span_pointers_for_event(event)
+        if botocore_add_span_pointers:
+            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",
-            str(e),
+            e,
         )
 
     return []
@@ -69,11 +77,15 @@ def _calculate_s3_span_pointers_for_object_created_s3_information(
     except KeyError as e:
         logger.warning(
             "missing s3 information required to make a span pointer: %s",
-            str(e),
+            e,
         )
         return []
 
     try:
+        from ddtrace._trace.utils_botocore.span_pointers.s3 import (
+            _aws_s3_object_span_pointer_description,
+        )
+
         return [
             _aws_s3_object_span_pointer_description(
                 pointer_direction=_SpanPointerDirection.UPSTREAM,
@@ -86,6 +98,71 @@ def _calculate_s3_span_pointers_for_object_created_s3_information(
     except Exception as e:
         logger.warning(
             "failed to generate S3 span pointer: %s",
-            str(e),
+            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:
+        from ddtrace._trace.utils_botocore.span_pointers.dynamodb import (
+            _aws_dynamodb_item_span_pointer_description,
+        )
+
+        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/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/tracing.py

@@ -411,7 +411,10 @@ def is_legacy_lambda_step_function(event):
     """
     Check if the event is a step function that called a legacy lambda
     """
-    event = event.get("Payload", {})
+    if not isinstance(event, dict) or "Payload" not in event:
+        return False
+
+    event = event.get("Payload")
     return "Execution" in event and "StateMachine" in event and "State" in event
 
 

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/version.py

@@ -1 +1 @@
-__version__ = "6.99.0"
+__version__ = "6.101.0"

{datadog_lambda-6.99.0.dist-info → datadog_lambda-6.101.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datadog_lambda
-Version: 6.99.0
+Version: 6.101.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.14.1)
+Requires-Dist: ddtrace (>=2.16.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.99.0.dist-info → datadog_lambda-6.101.0.dist-info}/RECORD

@@ -9,20 +9,20 @@ datadog_lambda/logger.py,sha256=nGxNMouF7wcjmoPsgivzzjNLvSy3WbGtKElxOvITZDg,766
 datadog_lambda/metric.py,sha256=hxA5nmKkUKpoo13f0Z5Ug87F9A-fv1hP-l2fWYfq6ao,6276
 datadog_lambda/module_name.py,sha256=5FmOCjjgjq78b6a83QePZZFmqahAoy9XHdUNWdq2D1Q,139
 datadog_lambda/patch.py,sha256=6a-BqovSRKsU5hTQpzxgY-_bducT-UEVCLvd3fdxeWc,4710
-datadog_lambda/span_pointers.py,sha256=UYinmQtdSs2RWioXfW4WXlseBCwblozjs9andFDuWz8,2493
+datadog_lambda/span_pointers.py,sha256=fjugvYFLld641uHyq5WLV7FkmUW0lnQ4jUoQWs8ObTY,4945
 datadog_lambda/stats_writer.py,sha256=SIac96wu45AxDOZ4GraCbK3r1RKr4AFgXcEPHg1VX0A,243
 datadog_lambda/statsd_writer.py,sha256=F4SCJ6-J6YfvQNh0uQfAkP6QYiAtV3-MCsxz4QnaBBI,403
 datadog_lambda/tag_object.py,sha256=cZ7W9Ae5k3YxLOZzN5Hu8UqvOKtq5AWARele0L18Gjs,2091
 datadog_lambda/tags.py,sha256=wy6uH8eAGMn7cfZEdHpL9uEGoM85bVyyXhYwSQtfHHc,2532
-datadog_lambda/thread_stats_writer.py,sha256=I_jNCiUFYaZT25d6hOe_uoG2PTw7J-Fqa3xclbRAkAo,2635
-datadog_lambda/tracing.py,sha256=RfaOVnCAkAXTo6AgIRnk8l_m2BNUic7H7GYrrDSz7RE,50341
-datadog_lambda/trigger.py,sha256=JK5am_XmEvueuLKrrF7k08sWnZVDOD6QvQjrsUJx1dM,12177
-datadog_lambda/version.py,sha256=niA1rc2TPZrRsb-b8BW1ys31kryvUrrutr98vh-X7DY,23
+datadog_lambda/thread_stats_writer.py,sha256=zOHdzdkQFCHnLU09CSYWsGq1optbTKzHVLcDXDjtiHU,2891
+datadog_lambda/tracing.py,sha256=_H-nilG6bUmiDobO3A5V_8byjlTVaa8-KKJWMN6EmSU,50421
+datadog_lambda/trigger.py,sha256=3S7u-LBHxX-o2Ds8BAtXEQMNPXz-Av8OdWBQuozLl54,12445
+datadog_lambda/version.py,sha256=y1mDHBp0_G49g2v4-4tRNZoCtIQZtnbKTHBqCSQ7h28,24
 datadog_lambda/wrapper.py,sha256=xTOO-NhrndReagcPJ0Ab9Xd8NRMCqsgZH4bJ7mpQXnI,15972
 datadog_lambda/xray.py,sha256=jvA4Fk76PLMgsjUoUZ7gp2otv53hFt39Nvso1ZNaivg,3749
-datadog_lambda-6.99.0.dist-info/LICENSE,sha256=4yQmjpKp1MKL7DdRDPVHkKYc2W0aezm5SIDske8oAdM,11379
-datadog_lambda-6.99.0.dist-info/LICENSE-3rdparty.csv,sha256=9CDAR1GKawwTbZkqt1RP0uwEcaRM3RhOeTB5tWXr8Ts,1381
-datadog_lambda-6.99.0.dist-info/METADATA,sha256=Ykej7Lx-67imk_5Ly3esNgPfM1kHRWypNvd9UEGW3Os,7417
-datadog_lambda-6.99.0.dist-info/NOTICE,sha256=Jue-d8mQ1ENIHDZdYc2-X8mVYtScXb8pzF1pTLN-kRc,141
-datadog_lambda-6.99.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-datadog_lambda-6.99.0.dist-info/RECORD,,
+datadog_lambda-6.101.0.dist-info/LICENSE,sha256=4yQmjpKp1MKL7DdRDPVHkKYc2W0aezm5SIDske8oAdM,11379
+datadog_lambda-6.101.0.dist-info/LICENSE-3rdparty.csv,sha256=9CDAR1GKawwTbZkqt1RP0uwEcaRM3RhOeTB5tWXr8Ts,1381
+datadog_lambda-6.101.0.dist-info/METADATA,sha256=TB-BFsE4c23dMEXWHZXQUnuSz8haVDkeHWhr-cwSR9Y,7469
+datadog_lambda-6.101.0.dist-info/NOTICE,sha256=Jue-d8mQ1ENIHDZdYc2-X8mVYtScXb8pzF1pTLN-kRc,141
+datadog_lambda-6.101.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+datadog_lambda-6.101.0.dist-info/RECORD,,

{datadog_lambda-6.99.0.dist-info → datadog_lambda-6.101.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any