datadog_lambda 6.100.0__py3-none-any.whl → 6.102.0__py3-none-any.whl

datadog_lambda/span_pointers.py

@@ -1,13 +1,9 @@
 from itertools import chain
 import logging
+import os
 from typing import List
+from typing import Optional
 
-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
@@ -16,19 +12,26 @@ 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)
+            elif event_source.equals(EventTypes.DYNAMODB):
+                return _calculate_dynamodb_span_pointers_for_event(event)
 
     except Exception as e:
-        logger.warning(
+        logger.debug(
             "failed to calculate span pointers for event: %s",
             e,
         )
@@ -73,24 +76,42 @@ def _calculate_s3_span_pointers_for_object_created_s3_information(
         etag = s3_information["object"]["eTag"]
 
     except KeyError as e:
-        logger.warning(
+        logger.debug(
             "missing s3 information required to make a span pointer: %s",
             e,
         )
         return []
 
     try:
-        return [
-            _aws_s3_object_span_pointer_description(
+        from ddtrace._trace.utils_botocore.span_pointers.s3 import (
+            _aws_s3_object_span_pointer_description,
+        )
+
+        try:
+            span_pointer_description = _aws_s3_object_span_pointer_description(
+                operation="S3.LambdaEvent",
+                pointer_direction=_SpanPointerDirection.UPSTREAM,
+                bucket=bucket,
+                key=key,
+                etag=etag,
+            )
+        except TypeError:
+            # The older version of this function did not have an operation
+            # parameter.
+            span_pointer_description = _aws_s3_object_span_pointer_description(
                 pointer_direction=_SpanPointerDirection.UPSTREAM,
                 bucket=bucket,
                 key=key,
                 etag=etag,
             )
-        ]
+
+        if span_pointer_description is None:
+            return []
+
+        return [span_pointer_description]
 
     except Exception as e:
-        logger.warning(
+        logger.debug(
             "failed to generate S3 span pointer: %s",
             e,
         )
@@ -114,33 +135,53 @@ def _calculate_dynamodb_span_pointers_for_event_record(
 ) -> List[_SpanPointerDescription]:
     try:
         table_name = _extract_table_name_from_dynamodb_stream_record(record)
+        if table_name is None:
+            return []
+
         primary_key = record["dynamodb"]["Keys"]
 
     except Exception as e:
-        logger.warning(
+        logger.debug(
             "missing DynamoDB information required to make a span pointer: %s",
             e,
         )
         return []
 
     try:
-        return [
-            _aws_dynamodb_item_span_pointer_description(
+        from ddtrace._trace.utils_botocore.span_pointers.dynamodb import (
+            _aws_dynamodb_item_span_pointer_description,
+        )
+
+        try:
+            span_pointer_description = _aws_dynamodb_item_span_pointer_description(
+                operation="DynamoDB.LambdaEvent",
+                pointer_direction=_SpanPointerDirection.UPSTREAM,
+                table_name=table_name,
+                primary_key=primary_key,
+            )
+        except TypeError:
+            # The older version of this function did not have an operation
+            # parameter.
+            span_pointer_description = _aws_dynamodb_item_span_pointer_description(
                 pointer_direction=_SpanPointerDirection.UPSTREAM,
                 table_name=table_name,
                 primary_key=primary_key,
             )
-        ]
+
+        if span_pointer_description is None:
+            return []
+
+        return [span_pointer_description]
 
     except Exception as e:
-        logger.warning(
+        logger.debug(
             "failed to generate DynamoDB span pointer: %s",
             e,
         )
         return []
 
 
-def _extract_table_name_from_dynamodb_stream_record(record) -> str:
+def _extract_table_name_from_dynamodb_stream_record(record) -> Optional[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"]
@@ -149,10 +190,12 @@ def _extract_table_name_from_dynamodb_stream_record(record) -> str:
         ":", maxsplit=5
     )
     if _arn != "arn" or _aws != "aws" or _dynamodb != "dynamodb":
-        raise ValueError(f"unexpected eventSourceARN format: {event_source_arn}")
+        logger.debug("unexpected eventSourceARN format: %s", event_source_arn)
+        return None
 
     [_table, table_name, _stream, _timestamp] = dynamodb_info.split("/")
     if _table != "table" or _stream != "stream":
-        raise ValueError(f"unexpected eventSourceARN format: {event_source_arn}")
+        logger.debug("unexpected eventSourceARN format: %s", event_source_arn)
+        return None
 
     return table_name

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

@@ -1 +1 @@
-__version__ = "6.100.0"
+__version__ = "6.102.0"

{datadog_lambda-6.100.0.dist-info → datadog_lambda-6.102.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datadog_lambda
-Version: 6.100.0
+Version: 6.102.0
 Summary: The Datadog AWS Lambda Library
 Home-page: https://github.com/DataDog/datadog-lambda-python
 License: Apache-2.0
@@ -19,7 +19,7 @@ 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.15.0)
+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.100.0.dist-info → datadog_lambda-6.102.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=zGD3QVIM8X2qx0nzVRoZPlWPKvUdG6ubIdcb3m9Dx54,4647
+datadog_lambda/span_pointers.py,sha256=P0SBWcKnc6GNWHZ5VPuUgGojFC_pIkOkKt6SfEXRpUw,6142
 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=zOHdzdkQFCHnLU09CSYWsGq1optbTKzHVLcDXDjtiHU,2891
-datadog_lambda/tracing.py,sha256=RfaOVnCAkAXTo6AgIRnk8l_m2BNUic7H7GYrrDSz7RE,50341
+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=ou4_yqeEM8ttPZPEwnBoJQIKcx2ElpmxTWI-dGHwd7A,24
+datadog_lambda/version.py,sha256=aiWn9nRTzBwTEQp9ElhvklO999AVnZiiuMG8X9ynB48,24
 datadog_lambda/wrapper.py,sha256=xTOO-NhrndReagcPJ0Ab9Xd8NRMCqsgZH4bJ7mpQXnI,15972
 datadog_lambda/xray.py,sha256=jvA4Fk76PLMgsjUoUZ7gp2otv53hFt39Nvso1ZNaivg,3749
-datadog_lambda-6.100.0.dist-info/LICENSE,sha256=4yQmjpKp1MKL7DdRDPVHkKYc2W0aezm5SIDske8oAdM,11379
-datadog_lambda-6.100.0.dist-info/LICENSE-3rdparty.csv,sha256=9CDAR1GKawwTbZkqt1RP0uwEcaRM3RhOeTB5tWXr8Ts,1381
-datadog_lambda-6.100.0.dist-info/METADATA,sha256=eHjxub7su5CIyqRlKXcXV2fSwA9NMTjqNlN2-KwXDno,7469
-datadog_lambda-6.100.0.dist-info/NOTICE,sha256=Jue-d8mQ1ENIHDZdYc2-X8mVYtScXb8pzF1pTLN-kRc,141
-datadog_lambda-6.100.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-datadog_lambda-6.100.0.dist-info/RECORD,,
+datadog_lambda-6.102.0.dist-info/LICENSE,sha256=4yQmjpKp1MKL7DdRDPVHkKYc2W0aezm5SIDske8oAdM,11379
+datadog_lambda-6.102.0.dist-info/LICENSE-3rdparty.csv,sha256=9CDAR1GKawwTbZkqt1RP0uwEcaRM3RhOeTB5tWXr8Ts,1381
+datadog_lambda-6.102.0.dist-info/METADATA,sha256=L9v2c8sUDizBM3PsVXJ3zmcKq9uH_0GugpdcRasEDFY,7469
+datadog_lambda-6.102.0.dist-info/NOTICE,sha256=Jue-d8mQ1ENIHDZdYc2-X8mVYtScXb8pzF1pTLN-kRc,141
+datadog_lambda-6.102.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+datadog_lambda-6.102.0.dist-info/RECORD,,