datadog_lambda 6.100.0__tar.gz → 6.102.0__tar.gz

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

@@ -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 → datadog_lambda-6.102.0}/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-6.100.0 → datadog_lambda-6.102.0}/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-6.102.0/datadog_lambda/version.py

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

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datadog_lambda"
-version = "6.100.0"
+version = "6.102.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.15.0"
+ddtrace = ">=2.16.0"
 ujson = ">=5.9.0"
 boto3 = { version = "^1.34.0", optional = true }
 requests = { version ="^2.22.0", optional = true }

datadog_lambda-6.100.0/datadog_lambda/version.py

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