datadog_lambda 8.114.0__tar.gz → 8.118.0__tar.gz

{datadog_lambda-8.114.0 → datadog_lambda-8.118.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datadog_lambda
-Version: 8.114.0
+Version: 8.118.0
 Summary: The Datadog AWS Lambda Library
 Home-page: https://github.com/DataDog/datadog-lambda-python
 License: Apache-2.0
@@ -16,10 +16,11 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Provides-Extra: dev
 Requires-Dist: botocore (>=1.34.0,<2.0.0) ; extra == "dev"
 Requires-Dist: datadog (>=0.51.0,<1.0.0)
-Requires-Dist: ddtrace (>=3.11.0,<4)
+Requires-Dist: ddtrace (>=3.16.2,<3.19.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"
@@ -37,7 +38,7 @@ Description-Content-Type: text/markdown
 [![Slack](https://chat.datadoghq.com/badge.svg?bg=632CA6)](https://chat.datadoghq.com/)
 [![License](https://img.shields.io/badge/license-Apache--2.0-blue)](https://github.com/DataDog/datadog-lambda-python/blob/main/LICENSE)
 
-Datadog Lambda Library for Python (3.8, 3.9, 3.10, 3.11, 3.12, and 3.13) enables [enhanced Lambda metrics](https://docs.datadoghq.com/serverless/enhanced_lambda_metrics), [distributed tracing](https://docs.datadoghq.com/serverless/distributed_tracing), and [custom metric submission](https://docs.datadoghq.com/serverless/custom_metrics) from AWS Lambda functions.
+Datadog Lambda Library for Python (3.8, 3.9, 3.10, 3.11, 3.12, 3.13, and 3.14) enables [enhanced Lambda metrics](https://docs.datadoghq.com/serverless/enhanced_lambda_metrics), [distributed tracing](https://docs.datadoghq.com/serverless/distributed_tracing), and [custom metric submission](https://docs.datadoghq.com/serverless/custom_metrics) from AWS Lambda functions.
 
 ## Installation
 

{datadog_lambda-8.114.0 → datadog_lambda-8.118.0}/README.md

@@ -6,7 +6,7 @@
 [![Slack](https://chat.datadoghq.com/badge.svg?bg=632CA6)](https://chat.datadoghq.com/)
 [![License](https://img.shields.io/badge/license-Apache--2.0-blue)](https://github.com/DataDog/datadog-lambda-python/blob/main/LICENSE)
 
-Datadog Lambda Library for Python (3.8, 3.9, 3.10, 3.11, 3.12, and 3.13) enables [enhanced Lambda metrics](https://docs.datadoghq.com/serverless/enhanced_lambda_metrics), [distributed tracing](https://docs.datadoghq.com/serverless/distributed_tracing), and [custom metric submission](https://docs.datadoghq.com/serverless/custom_metrics) from AWS Lambda functions.
+Datadog Lambda Library for Python (3.8, 3.9, 3.10, 3.11, 3.12, 3.13, and 3.14) enables [enhanced Lambda metrics](https://docs.datadoghq.com/serverless/enhanced_lambda_metrics), [distributed tracing](https://docs.datadoghq.com/serverless/distributed_tracing), and [custom metric submission](https://docs.datadoghq.com/serverless/custom_metrics) from AWS Lambda functions.
 
 ## Installation
 

{datadog_lambda-8.114.0 → datadog_lambda-8.118.0}/datadog_lambda/__init__.py

@@ -1,12 +1,5 @@
+import datadog_lambda.config  # noqa: F401 needs to be imported before `ddtrace`
 from datadog_lambda.cold_start import initialize_cold_start_tracing
-import os
-
-
-if os.environ.get("DD_INSTRUMENTATION_TELEMETRY_ENABLED") is None:
-    # Telemetry is required for Appsec Software Composition Analysis
-    os.environ["DD_INSTRUMENTATION_TELEMETRY_ENABLED"] = os.environ.get(
-        "DD_APPSEC_ENABLED", "false"
-    )
 
 
 initialize_cold_start_tracing()

{datadog_lambda-8.114.0 → datadog_lambda-8.118.0}/datadog_lambda/asm.py

@@ -126,8 +126,8 @@ def asm_start_request(
 
     request_ip = _get_request_header_client_ip(request_headers, peer_ip, True)
     if request_ip is not None:
-        span.set_tag_str("http.client_ip", request_ip)
-        span.set_tag_str("network.client.ip", request_ip)
+        span.set_tag("http.client_ip", request_ip)
+        span.set_tag("network.client.ip", request_ip)
 
     # Encode the parsed query and append it to reconstruct the original raw URI expected by AppSec.
     if parsed_query:

{datadog_lambda-8.114.0 → datadog_lambda-8.118.0}/datadog_lambda/config.py

@@ -82,12 +82,6 @@ class Config:
     logs_injection = _get_env("DD_LOGS_INJECTION", "true", as_bool)
     merge_xray_traces = _get_env("DD_MERGE_XRAY_TRACES", "false", as_bool)
 
-    telemetry_enabled = _get_env(
-        "DD_INSTRUMENTATION_TELEMETRY_ENABLED",
-        "false",
-        as_bool,
-        depends_on_tracing=True,
-    )
     otel_enabled = _get_env("DD_TRACE_OTEL_ENABLED", "false", as_bool)
     profiling_enabled = _get_env("DD_PROFILING_ENABLED", "false", as_bool)
     llmobs_enabled = _get_env("DD_LLMOBS_ENABLED", "false", as_bool)
@@ -96,6 +90,7 @@ class Config:
         "DD_DATA_STREAMS_ENABLED", "false", as_bool, depends_on_tracing=True
     )
     appsec_enabled = _get_env("DD_APPSEC_ENABLED", "false", as_bool)
+    sca_enabled = _get_env("DD_APPSEC_SCA_ENABLED", "false", as_bool)
 
     is_gov_region = _get_env("AWS_REGION", "", lambda x: x.startswith("us-gov-"))
 
@@ -144,3 +139,11 @@ if config.is_gov_region or config.fips_mode_enabled:
         "Python Lambda Layer FIPS mode is %s.",
         "enabled" if config.fips_mode_enabled else "not enabled",
     )
+
+
+if (
+    "DD_INSTRUMENTATION_TELEMETRY_ENABLED" not in os.environ
+    and not config.sca_enabled
+    and not config.appsec_enabled
+):
+    os.environ["DD_INSTRUMENTATION_TELEMETRY_ENABLED"] = "false"

{datadog_lambda-8.114.0 → datadog_lambda-8.118.0}/datadog_lambda/metric.py

@@ -214,6 +214,33 @@ def submit_errors_metric(lambda_context):
     submit_enhanced_metric("errors", lambda_context)
 
 
+def submit_batch_item_failures_metric(response, lambda_context):
+    """Submit aws.lambda.enhanced.batch_item_failures metric with the count of batch item failures
+
+    Args:
+        response (dict): Lambda function response object
+        lambda_context (object): Lambda context dict passed to the function by AWS
+    """
+    if not config.enhanced_metrics_enabled:
+        logger.debug(
+            "Not submitting batch_item_failures metric because enhanced metrics are disabled"
+        )
+        return
+
+    if not isinstance(response, dict):
+        return
+
+    batch_item_failures = response.get("batchItemFailures")
+    if batch_item_failures is not None and isinstance(batch_item_failures, list):
+        lambda_metric(
+            "aws.lambda.enhanced.batch_item_failures",
+            len(batch_item_failures),
+            timestamp=None,
+            tags=get_enhanced_metrics_tags(lambda_context),
+            force_async=True,
+        )
+
+
 def submit_dynamodb_stream_type_metric(event):
     stream_view_type = (
         event.get("Records", [{}])[0].get("dynamodb", {}).get("StreamViewType")

{datadog_lambda-8.114.0 → datadog_lambda-8.118.0}/datadog_lambda/tag_object.py

@@ -62,6 +62,6 @@ def _should_try_string(obj):
 
 def _redact_val(k, v):
     split_key = k.split(".").pop() or k
-    if split_key in redactable_keys:
+    if split_key.lower() in redactable_keys:
         return "redacted"
     return v

{datadog_lambda-8.114.0 → datadog_lambda-8.118.0}/datadog_lambda/tracing.py

@@ -55,11 +55,6 @@ if config.otel_enabled:
 logger = logging.getLogger(__name__)
 
 dd_trace_context = None
-if config.telemetry_enabled:
-    # Enable the telemetry client if the user has opted in
-    from ddtrace.internal.telemetry import telemetry_writer
-
-    telemetry_writer.enable()
 
 propagator = HTTPPropagator()
 
@@ -209,6 +204,20 @@ def extract_context_from_http_event_or_context(
     return context
 
 
+def extract_context_from_request_header_or_context(event, lambda_context, event_source):
+    request = event.get("request")
+    if isinstance(request, (set, dict)) and "headers" in request:
+        context = extract_context_from_http_event_or_context(
+            request,
+            lambda_context,
+            event_source,
+            decode_authorizer_context=False,
+        )
+    else:
+        context = extract_context_from_lambda_context(lambda_context)
+    return context
+
+
 def create_sns_event(message):
     return {
         "Records": [
@@ -627,6 +636,10 @@ def extract_dd_trace_context(
 
     if extractor is not None:
         context = extract_context_custom_extractor(extractor, event, lambda_context)
+    elif isinstance(event, (set, dict)) and "request" in event:
+        context = extract_context_from_request_header_or_context(
+            event, lambda_context, event_source
+        )
     elif isinstance(event, (set, dict)) and "headers" in event:
         context = extract_context_from_http_event_or_context(
             event, lambda_context, event_source, decode_authorizer_context

{datadog_lambda-8.114.0 → datadog_lambda-8.118.0}/datadog_lambda/trigger.py

@@ -325,7 +325,8 @@ def extract_http_tags(event):
             method = apigateway_v2_http.get("method")
 
     if path:
-        http_tags["http.url_details.path"] = path
+        if http_tags.get("http.url"):
+            http_tags["http.url"] += path
     if method:
         http_tags["http.method"] = method
 

datadog_lambda-8.118.0/datadog_lambda/version.py

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

{datadog_lambda-8.114.0 → datadog_lambda-8.118.0}/datadog_lambda/wrapper.py

@@ -46,6 +46,10 @@ from datadog_lambda.trigger import (
     extract_http_status_code_tag,
 )
 
+# ddtrace imports are also tested in
+# dd-trace-py/tests/internal/test_serverless.py please update those tests when
+# making changes to any ddtrace import.
+
 if config.appsec_enabled:
     from datadog_lambda.asm import (
         asm_set_context,
@@ -65,7 +69,11 @@ if config.llmobs_enabled:
 
 if config.exception_replay_enabled:
     from ddtrace.debugging._exception.replay import SpanExceptionHandler
-    from ddtrace.debugging._uploader import LogsIntakeUploaderV1
+
+    try:
+        from ddtrace.debugging._uploader import SignalUploader
+    except ImportError:
+        from ddtrace.debugging._uploader import LogsIntakeUploaderV1 as SignalUploader
 
 logger = logging.getLogger(__name__)
 
@@ -283,6 +291,10 @@ class _LambdaDecorator(object):
 
     def _after(self, event, context):
         try:
+            from datadog_lambda.metric import submit_batch_item_failures_metric
+
+            submit_batch_item_failures_metric(self.response, context)
+
             status_code = extract_http_status_code_tag(self.trigger_tags, self.response)
 
             if self.span:
@@ -370,7 +382,7 @@ class _LambdaDecorator(object):
 
             # Flush exception replay
             if config.exception_replay_enabled:
-                LogsIntakeUploaderV1._instance.periodic()
+                SignalUploader._instance.periodic()
 
             if config.encode_authorizer_context and is_authorizer_response(
                 self.response

{datadog_lambda-8.114.0 → datadog_lambda-8.118.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datadog_lambda"
-version = "8.114.0"
+version = "8.118.0"
 description = "The Datadog AWS Lambda Library"
 authors = ["Datadog, Inc. <dev@datadoghq.com>"]
 license = "Apache-2.0"
@@ -22,13 +22,14 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 
 [tool.poetry.dependencies]
 python = ">=3.8.0,<4"
 datadog = ">=0.51.0,<1.0.0"
 wrapt = "^1.11.2"
-ddtrace = ">=3.11.0,<4"
+ddtrace = ">=3.16.2,<3.19.0"
 ujson = ">=5.9.0"
 botocore = { version = "^1.34.0", optional = true }
 requests = { version ="^2.22.0", optional = true }

datadog_lambda-8.114.0/datadog_lambda/version.py

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