datadog_lambda 8.120.0__py3-none-any.whl → 8.121.0__py3-none-any.whl

datadog_lambda/asm.py

@@ -223,7 +223,9 @@ def get_asm_blocked_response(
         content = ""
     else:
         content_type = blocked.get("content-type", "application/json")
-        content = http_utils._get_blocked_template(content_type)
+        content = http_utils._get_blocked_template(
+            content_type, blocked.get("block_id", "default")
+        )
 
     response = {
         "statusCode": blocked.get("status_code", 403),

datadog_lambda/tracing.py

@@ -927,6 +927,7 @@ def create_inferred_span_from_lambda_function_url_event(event, context):
     InferredSpanInfo.set_tags(tags, tag_source="self", synchronicity="sync")
     if span:
         span.set_tags(tags)
+        span.set_metric(InferredSpanInfo.METRIC, 1.0)
         span.start_ns = int(request_time_epoch * 1e6)
     return span
 
@@ -1047,6 +1048,7 @@ def create_inferred_span_from_api_gateway_websocket_event(
     span = tracer.trace("aws.apigateway.websocket", **args)
     if span:
         span.set_tags(tags)
+        span.set_metric(InferredSpanInfo.METRIC, 1.0)
         span.start_ns = int(
             finish_time_ns
             if finish_time_ns is not None
@@ -1061,6 +1063,8 @@ def create_inferred_span_from_api_gateway_event(
     event, context, decode_authorizer_context: bool = True
 ):
     request_context = event.get("requestContext")
+    identity = request_context.get("identity")
+
     domain = request_context.get("domainName", "")
     api_id = request_context.get("apiId")
     service_name = determine_service_name(
@@ -1072,11 +1076,11 @@ def create_inferred_span_from_api_gateway_event(
     resource_path = _get_resource_path(event, request_context)
     resource = f"{method} {resource_path}"
     tags = {
-        "operation_name": "aws.apigateway.rest",
         "http.url": http_url,
         "endpoint": path,
         "http.method": method,
         "resource_names": resource,
+        "http.useragent": identity.get("userAgent"),
         "span.kind": "server",
         "apiid": api_id,
         "apiname": api_id,
@@ -1091,7 +1095,7 @@ def create_inferred_span_from_api_gateway_event(
     args = {
         "service": service_name,
         "resource": resource,
-        "span_type": "http",
+        "span_type": "web",
     }
     tracer.set_tags(_dd_origin)
     upstream_authorizer_span = None
@@ -1103,6 +1107,7 @@ def create_inferred_span_from_api_gateway_event(
     span = tracer.trace("aws.apigateway", **args)
     if span:
         span.set_tags(tags)
+        span.set_metric(InferredSpanInfo.METRIC, 1.0)
         # start time pushed by the inserted authorizer span
         span.start_ns = int(
             finish_time_ns
@@ -1140,13 +1145,12 @@ def create_inferred_span_from_http_api_event(
     resource_path = _get_resource_path(event, request_context)
     resource = f"{method} {resource_path}"
     tags = {
-        "operation_name": "aws.httpapi",
         "endpoint": path,
         "http.url": http_url,
         "http.method": http.get("method"),
         "http.protocol": http.get("protocol"),
         "http.source_ip": http.get("sourceIp"),
-        "http.user_agent": http.get("userAgent"),
+        "http.useragent": http.get("userAgent"),
         "resource_names": resource,
         "request_id": context.aws_request_id,
         "apiid": api_id,
@@ -1167,10 +1171,11 @@ def create_inferred_span_from_http_api_event(
                 Headers.Parent_Span_Finish_Time
             )
     span = tracer.trace(
-        "aws.httpapi", service=service_name, resource=resource, span_type="http"
+        "aws.httpapi", service=service_name, resource=resource, span_type="web"
     )
     if span:
         span.set_tags(tags)
+        span.set_metric(InferredSpanInfo.METRIC, 1.0)
         span.start_ns = int(inferred_span_start_ns)
     return span
 
@@ -1237,6 +1242,7 @@ def create_inferred_span_from_sqs_event(event, context):
     )
     if span:
         span.set_tags(tags)
+        span.set_metric(InferredSpanInfo.METRIC, 1.0)
     span.start = start_time
     if upstream_span:
         span.parent_id = upstream_span.span_id
@@ -1278,6 +1284,7 @@ def create_inferred_span_from_sns_event(event, context):
     )
     if span:
         span.set_tags(tags)
+        span.set_metric(InferredSpanInfo.METRIC, 1.0)
     span.start = dt.replace(tzinfo=timezone.utc).timestamp()
     return span
 
@@ -1313,6 +1320,7 @@ def create_inferred_span_from_kinesis_event(event, context):
     )
     if span:
         span.set_tags(tags)
+        span.set_metric(InferredSpanInfo.METRIC, 1.0)
     span.start = request_time_epoch
     return span
 
@@ -1345,6 +1353,7 @@ def create_inferred_span_from_dynamodb_event(event, context):
     )
     if span:
         span.set_tags(tags)
+        span.set_metric(InferredSpanInfo.METRIC, 1.0)
 
     span.start = int(request_time_epoch)
     return span
@@ -1381,6 +1390,7 @@ def create_inferred_span_from_s3_event(event, context):
     )
     if span:
         span.set_tags(tags)
+        span.set_metric(InferredSpanInfo.METRIC, 1.0)
     span.start = dt.replace(tzinfo=timezone.utc).timestamp()
     return span
 
@@ -1421,10 +1431,11 @@ def create_inferred_span_from_eventbridge_event(event, context):
     )
     if span:
         span.set_tags(tags)
+        span.set_metric(InferredSpanInfo.METRIC, 1.0)
     span.start = dt.replace(tzinfo=timezone.utc).timestamp()
 
     # Since inferred span will later parent Lambda, preserve Lambda's current parent
-    if dd_trace_context.span_id:
+    if dd_trace_context and getattr(dd_trace_context, "span_id", None):
         span.parent_id = dd_trace_context.span_id
 
     return span
@@ -1512,6 +1523,7 @@ class InferredSpanInfo(object):
     BASE_NAME = "_inferred_span"
     SYNCHRONICITY = f"{BASE_NAME}.synchronicity"
     TAG_SOURCE = f"{BASE_NAME}.tag_source"
+    METRIC = f"_dd.{BASE_NAME}"
 
     @staticmethod
     def set_tags(

datadog_lambda/version.py

@@ -1 +1 @@
-__version__ = "8.120.0"
+__version__ = "8.121.0"

datadog_lambda/wrapper.py

@@ -346,8 +346,16 @@ class _LambdaDecorator(object):
                 if status_code:
                     self.inferred_span.set_tag("http.status_code", status_code)
 
-                if self.trigger_tags and (route := self.trigger_tags.get("http.route")):
-                    self.inferred_span.set_tag("http.route", route)
+                if self.trigger_tags:
+                    route = self.trigger_tags.get("http.route")
+                    if route:
+                        self.inferred_span.set_tag("http.route", route)
+
+                    event_source_arn = self.trigger_tags.get(
+                        "function_trigger.event_source_arn"
+                    )
+                    if event_source_arn:
+                        self.inferred_span.set_tag("dd_resource_key", event_source_arn)
 
                 if config.service:
                     self.inferred_span.set_tag("peer.service", config.service)

datadog_lambda-8.121.0.dist-info/METADATA

@@ -0,0 +1,24 @@
+Metadata-Version: 2.1
+Name: datadog_lambda
+Version: 8.121.0
+Summary: The Datadog AWS Lambda Library
+Author: Datadog, Inc.
+Author-email: dev@datadoghq.com
+Requires-Python: >=3.8.0,<4
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+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: botocore (>=1.34.0,<2.0.0) ; extra == "dev"
+Requires-Dist: datadog (>=0.51.0,<1.0.0)
+Requires-Dist: ddtrace (>=3.19.1,<4)
+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"
+Requires-Dist: requests (>=2.22.0,<3.0.0) ; extra == "dev"
+Requires-Dist: ujson (>=5.9.0)
+Requires-Dist: wrapt (>=1.11.2,<2.0.0)

{datadog_lambda-8.120.0.dist-info → datadog_lambda-8.121.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 datadog_lambda/__init__.py,sha256=9xx1R86jNFqIMYKqjkbu0RdA940zAu0L9rGJzPJm1vs,633
 datadog_lambda/api.py,sha256=aavYiMQ5z9NSUwyjBy4aDtfbfPCpoAXuA-xlMEPAy1o,5836
-datadog_lambda/asm.py,sha256=ZOX_rElpGF5uX-r-SoPnjFAv0vSd1y7YYfwz5m38xpc,8167
+datadog_lambda/asm.py,sha256=aWxs3gf0Xz7ZCM3WGdK-OocSjlD7fCS_jJZu5sOeH4s,8225
 datadog_lambda/cold_start.py,sha256=NfE4EtRUHuc2ub26U8sAwMVEDNINbw1OTh2MAklQGyk,8032
 datadog_lambda/config.py,sha256=pvr5nrqLUErLMblB1vSAUWMIauju7kMsbZx7akO7AQM,5376
 datadog_lambda/constants.py,sha256=0y6O9s_8RLflYR507SDMQjKmYY16tr1yi2KQuuF1GaY,1696
@@ -17,14 +17,14 @@ datadog_lambda/statsd_writer.py,sha256=wUNG8phIreNOGCc5VjYZV-FNogvKfiz9kN33QldqZ
 datadog_lambda/tag_object.py,sha256=IwKXf9QNsxqP9Slt44SJPqbWQ-L6AuFptlN9Jtbh4Kg,2097
 datadog_lambda/tags.py,sha256=wy6uH8eAGMn7cfZEdHpL9uEGoM85bVyyXhYwSQtfHHc,2532
 datadog_lambda/thread_stats_writer.py,sha256=VfD6G65zNHDA0nABhGOO0it7yqvn-p6ereQ329DA7r8,2894
-datadog_lambda/tracing.py,sha256=auPyokQ2wTcyYCpB7t00j5keGBN_7gbM4s78yqeURSY,57888
+datadog_lambda/tracing.py,sha256=jAhhGBlDZTJb-jiwvwTeVQAEH0wENWakDlIfre3_cCo,58507
 datadog_lambda/trigger.py,sha256=bkNe77eOVuYc8kyH7KKYlsvHZfC-NXyl9GLqJ8Qaky8,14628
-datadog_lambda/version.py,sha256=29ZXnWNzuBuuqF7msNJiwoBnUKM_gQqQEcsRKwlERdM,24
-datadog_lambda/wrapper.py,sha256=dQ9y2fWbiQjIqzZHfpKxwpCgcLmPufypQWFC1D9gJR8,15328
+datadog_lambda/version.py,sha256=B_xVOhS32bp0A9fxp8_vn516Yjhj3K3lYaC2MKtyVnQ,24
+datadog_lambda/wrapper.py,sha256=RO-Fk9izWTuP7H9QCXeHs9B0weDkPy1kvSZ5YsMLV-Y,15649
 datadog_lambda/xray.py,sha256=jvA4Fk76PLMgsjUoUZ7gp2otv53hFt39Nvso1ZNaivg,3749
-datadog_lambda-8.120.0.dist-info/LICENSE,sha256=4yQmjpKp1MKL7DdRDPVHkKYc2W0aezm5SIDske8oAdM,11379
-datadog_lambda-8.120.0.dist-info/LICENSE-3rdparty.csv,sha256=9CDAR1GKawwTbZkqt1RP0uwEcaRM3RhOeTB5tWXr8Ts,1381
-datadog_lambda-8.120.0.dist-info/METADATA,sha256=Y_mHVqpOunpxFOWdY63PojrcF6p7rSqyKb9LggP_6kw,7789
-datadog_lambda-8.120.0.dist-info/NOTICE,sha256=Jue-d8mQ1ENIHDZdYc2-X8mVYtScXb8pzF1pTLN-kRc,141
-datadog_lambda-8.120.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-datadog_lambda-8.120.0.dist-info/RECORD,,
+datadog_lambda-8.121.0.dist-info/LICENSE,sha256=4yQmjpKp1MKL7DdRDPVHkKYc2W0aezm5SIDske8oAdM,11379
+datadog_lambda-8.121.0.dist-info/LICENSE-3rdparty.csv,sha256=9CDAR1GKawwTbZkqt1RP0uwEcaRM3RhOeTB5tWXr8Ts,1381
+datadog_lambda-8.121.0.dist-info/METADATA,sha256=eicMuG6GQ4FbSUWAvgKV3YRlqtpwTraRUrq1xS4CLnc,994
+datadog_lambda-8.121.0.dist-info/NOTICE,sha256=Jue-d8mQ1ENIHDZdYc2-X8mVYtScXb8pzF1pTLN-kRc,141
+datadog_lambda-8.121.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+datadog_lambda-8.121.0.dist-info/RECORD,,

datadog_lambda-8.120.0.dist-info/METADATA

@@ -1,110 +0,0 @@
-Metadata-Version: 2.1
-Name: datadog_lambda
-Version: 8.120.0
-Summary: The Datadog AWS Lambda Library
-Home-page: https://github.com/DataDog/datadog-lambda-python
-License: Apache-2.0
-Keywords: datadog,aws,lambda,layer
-Author: Datadog, Inc.
-Author-email: dev@datadoghq.com
-Requires-Python: >=3.8.0,<4
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-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
-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.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"
-Requires-Dist: requests (>=2.22.0,<3.0.0) ; extra == "dev"
-Requires-Dist: ujson (>=5.9.0)
-Requires-Dist: wrapt (>=1.11.2,<2.0.0)
-Project-URL: Repository, https://github.com/DataDog/datadog-lambda-python
-Description-Content-Type: text/markdown
-
-# datadog-lambda-python
-
-![build](https://github.com/DataDog/datadog-lambda-python/workflows/build/badge.svg)
-[![PyPI](https://img.shields.io/pypi/v/datadog-lambda)](https://pypi.org/project/datadog-lambda/)
-![PyPI - Python Version](https://img.shields.io/pypi/pyversions/datadog-lambda)
-[![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, 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
-
-Follow the [installation instructions](https://docs.datadoghq.com/serverless/installation/python/), and view your function's enhanced metrics, traces and logs in Datadog.
-
-## Configuration
-
-Follow the [configuration instructions](https://docs.datadoghq.com/serverless/configuration) to tag your telemetry, capture request/response payloads, filter or scrub sensitive information from logs or traces, and more.
-
-For additional tracing configuration options, check out the [official documentation for Datadog trace client](https://ddtrace.readthedocs.io/en/stable/configuration.html).
-
-Besides the environment variables supported by dd-trace-py, the datadog-lambda-python library added following environment variables.
-
-| Environment Variables | Description | Default Value |
-| -------------------- | ------------ | ------------- |
-| DD_ENCODE_AUTHORIZER_CONTEXT      | When set to `true` for Lambda authorizers, the tracing context will be encoded into the response for propagation. Supported for NodeJS and Python. | `true` |
-| DD_DECODE_AUTHORIZER_CONTEXT      | When set to `true` for Lambdas that are authorized via Lambda authorizers, it will parse and use the encoded tracing context (if found). Supported for NodeJS and Python. | `true` |
-| DD_COLD_START_TRACING | When true (default), tracing occurs during cold start which creates many child spans. When false, only one cold start span is created. Used in NodeJS and Python. | `true` |
-| DD_MIN_COLD_START_DURATION |  Sets the minimum duration (in milliseconds) for a module load event to be traced via Cold Start Tracing. Number. | `3` |
-| DD_COLD_START_TRACE_SKIP_LIB | optionally skip creating Cold Start Spans for a comma-separated list of libraries. Useful to limit depth or skip known libraries. | `ddtrace.internal.compat,ddtrace.filters` |
-| DD_CAPTURE_LAMBDA_PAYLOAD | [Captures incoming and outgoing AWS Lambda payloads][1] in the Datadog APM spans for Lambda invocations. | `false` |
-| DD_CAPTURE_LAMBDA_PAYLOAD_MAX_DEPTH | Determines the level of detail captured from AWS Lambda payloads, which are then assigned as tags for the `aws.lambda` span. It specifies the nesting depth of the JSON payload structure to process. Once the specified maximum depth is reached, the tag's value is set to the stringified value of any nested elements beyond this level.  <br> For example, given the input payload: <pre>{<br>  "lv1" : {<br>    "lv2": {<br>      "lv3": "val"<br>    }<br>  }<br>}</pre> If the depth is set to `2`, the resulting tag's key is set to `function.request.lv1.lv2` and the value is `{\"lv3\": \"val\"}`. <br> If the depth is set to `0`, the resulting tag's key is set to `function.request` and value is `{\"lv1\":{\"lv2\":{\"lv3\": \"val\"}}}` | `10` |
-| DD_EXCEPTION_REPLAY_ENABLED | When set to `true`, the Lambda will run with Error Tracking Exception Replay enabled, capturing local variables. | `false` |
-
-
-## Opening Issues
-
-If you encounter a bug with this package, we want to hear about it. Before opening a new issue, search the existing issues to avoid duplicates.
-
-When opening an issue, include the Datadog Lambda Library version, Python version, and stack trace if available. In addition, include the steps to reproduce when appropriate.
-
-You can also open an issue for a feature request.
-
-## Lambda Profiling Beta
-
-Datadog's [Continuous Profiler](https://www.datadoghq.com/product/code-profiling/) is now available in beta for Python in version 4.62.0 and layer version 62 and above. This optional feature is enabled by setting the `DD_PROFILING_ENABLED` environment variable to `true`. During the beta period, profiling is available at no additional cost.
-
-The Continuous Profiler works by spawning a thread which periodically wakes up and takes a snapshot of the CPU and Heap of all running python code. This can include the profiler itself. If you want the Profiler to ignore itself, set `DD_PROFILING_IGNORE_PROFILER` to `true`.
-
-## Major Version Notes
-
-### 6.x / Layer version 95+
-- The release changed how Lambda's traceID is hashed if the incoming payload contains Step Functions context object. This change only affects those who uses inject Step Functions context object into Lambda payload.
-
-### 5.x / Layer version 86+
-- Python3.7 support has been [deprecated](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html) by AWS, and support removed from this library.
-
-### 4.x / Layer version 61+
-
-- Python3.6 support has been [deprecated](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html) by AWS, and support removed from this library.
-- `dd-trace` upgraded from 0.61 to 1.4, full release notes are available [here](https://ddtrace.readthedocs.io/en/stable/release_notes.html#v1-0-0)
-  - `get_correlation_ids()` has been changed to `get_log_correlation_context()`, which now returns a dictionary containing the active `span_id`, `trace_id`, as well as `service` and `env`.
-
-## Contributing
-
-If you find an issue with this package and have a fix, please feel free to open a pull request following the [procedures](CONTRIBUTING.md).
-
-## Community
-
-For product feedback and questions, join the `#serverless` channel in the [Datadog community on Slack](https://chat.datadoghq.com/).
-
-## License
-
-Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
-
-This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2019 Datadog, Inc.
-
-[1]: https://www.datadoghq.com/blog/troubleshoot-lambda-function-request-response-payloads/
-