datadog_lambda 5.94.0__tar.gz → 6.96.0__tar.gz

{datadog_lambda-5.94.0 → datadog_lambda-6.96.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datadog_lambda
-Version: 5.94.0
+Version: 6.96.0
 Summary: The Datadog AWS Lambda Library
 Home-page: https://github.com/DataDog/datadog-lambda-python
 License: Apache-2.0
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: dev
 Requires-Dist: boto3 (>=1.28.0,<2.0.0) ; extra == "dev"
 Requires-Dist: datadog (>=0.41.0,<1.0.0)
-Requires-Dist: ddtrace (>=2.7.2)
+Requires-Dist: ddtrace (>=2.9.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"
@@ -79,6 +79,9 @@ The Continuous Profiler works by spawning a thread which periodically wakes up a
 
 ## 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.
 

{datadog_lambda-5.94.0 → datadog_lambda-6.96.0}/README.md

@@ -47,6 +47,9 @@ The Continuous Profiler works by spawning a thread which periodically wakes up a
 
 ## 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.
 

{datadog_lambda-5.94.0 → datadog_lambda-6.96.0}/datadog_lambda/api.py

@@ -1,7 +1,6 @@
 import os
 import logging
 import base64
-from datadog_lambda.extension import should_use_extension
 
 logger = logging.getLogger(__name__)
 KMS_ENCRYPTION_CONTEXT_KEY = "LambdaFunctionName"
@@ -48,13 +47,10 @@ def decrypt_kms_api_key(kms_client, ciphertext):
 
 
 def init_api():
-    if (
-        not should_use_extension
-        and not os.environ.get("DD_FLUSH_TO_LOG", "").lower() == "true"
-    ):
+    if not os.environ.get("DD_FLUSH_TO_LOG", "").lower() == "true":
         # Make sure that this package would always be lazy-loaded/outside from the critical path
         # since underlying packages are quite heavy to load
-        # and useless when the extension is present
+        # and useless with the extension unless sending metrics with timestamps
         from datadog import api
 
         if not api._api_key:

{datadog_lambda-5.94.0 → datadog_lambda-6.96.0}/datadog_lambda/cold_start.py

@@ -197,7 +197,8 @@ class ColdStartTracer(object):
 
     def trace_tree(self, import_node: ImportNode, parent_span):
         if (
-            import_node.end_time_ns - import_node.start_time_ns
+            not self.trace_ctx
+            or import_node.end_time_ns - import_node.start_time_ns
             < self.min_duration_ms * 1e6
             or import_node.module_name in self.ignored_libs
         ):

{datadog_lambda-5.94.0 → datadog_lambda-6.96.0}/datadog_lambda/metric.py

@@ -10,13 +10,13 @@ import ujson as json
 
 from datadog_lambda.extension import should_use_extension
 from datadog_lambda.tags import get_enhanced_metrics_tags, dd_lambda_layer_tag
-from datadog_lambda.api import init_api
 
 logger = logging.getLogger(__name__)
 
 lambda_stats = None
+extension_thread_stats = None
 
-init_api()
+flush_in_thread = os.environ.get("DD_FLUSH_IN_THREAD", "").lower() == "true"
 
 if should_use_extension:
     from datadog_lambda.statsd_writer import StatsDWriter
@@ -28,8 +28,9 @@ else:
     # end of invocation. To make metrics submitted from a long-running Lambda
     # function available sooner, consider using the Datadog Lambda extension.
     from datadog_lambda.thread_stats_writer import ThreadStatsWriter
+    from datadog_lambda.api import init_api
 
-    flush_in_thread = os.environ.get("DD_FLUSH_IN_THREAD", "").lower() == "true"
+    init_api()
     lambda_stats = ThreadStatsWriter(flush_in_thread)
 
 enhanced_metrics_enabled = (
@@ -57,6 +58,22 @@ def lambda_metric(metric_name, value, timestamp=None, tags=None, force_async=Fal
     tags = [] if tags is None else list(tags)
     tags.append(dd_lambda_layer_tag)
 
+    if should_use_extension and timestamp is not None:
+        # The extension does not support timestamps for distributions so we create a
+        # a thread stats writer to submit metrics with timestamps to the API
+        global extension_thread_stats
+        if extension_thread_stats is None:
+            from datadog_lambda.thread_stats_writer import ThreadStatsWriter
+            from datadog_lambda.api import init_api
+
+            init_api()
+            extension_thread_stats = ThreadStatsWriter(flush_in_thread)
+
+        extension_thread_stats.distribution(
+            metric_name, value, tags=tags, timestamp=timestamp
+        )
+        return
+
     if should_use_extension:
         logger.debug(
             "Sending metric %s value %s to Datadog via extension", metric_name, value
@@ -94,6 +111,9 @@ def write_metric_point_to_stdout(metric_name, value, timestamp=None, tags=[]):
 def flush_stats():
     lambda_stats.flush()
 
+    if extension_thread_stats is not None:
+        extension_thread_stats.flush()
+
 
 def submit_enhanced_metric(metric_name, lambda_context):
     """Submits the enhanced metric with the given name

{datadog_lambda-5.94.0 → datadog_lambda-6.96.0}/datadog_lambda/tracing.py

@@ -72,6 +72,8 @@ is_lambda_context = os.environ.get(XrayDaemon.FUNCTION_NAME_HEADER_NAME) != ""
 propagator = HTTPPropagator()
 
 DD_TRACE_JAVA_TRACE_ID_PADDING = "00000000"
+HIGHER_64_BITS = "HIGHER_64_BITS"
+LOWER_64_BITS = "LOWER_64_BITS"
 
 
 def _convert_xray_trace_id(xray_trace_id):
@@ -273,7 +275,7 @@ def extract_context_from_sqs_or_sns_event_or_context(event, lambda_context):
         else:
             # Handle case where trace context is injected into attributes.AWSTraceHeader
             # example: Root=1-654321ab-000000001234567890abcdef;Parent=0123456789abcdef;Sampled=1
-            attrs = first_record.get("attributes")
+            attrs = event.get("Records")[0].get("attributes")
             if attrs:
                 x_ray_header = attrs.get("AWSTraceHeader")
                 if x_ray_header:
@@ -354,14 +356,16 @@ def extract_context_from_kinesis_event(event, lambda_context):
     return extract_context_from_lambda_context(lambda_context)
 
 
-def _deterministic_md5_hash(s: str) -> int:
-    """MD5 here is to generate trace_id, not for any encryption."""
-    hex_number = hashlib.md5(s.encode("ascii")).hexdigest()
-    binary = bin(int(hex_number, 16))
-    binary_str = str(binary)
-    binary_str_remove_0b = binary_str[2:].rjust(128, "0")
-    most_significant_64_bits_without_leading_1 = "0" + binary_str_remove_0b[1:-64]
-    result = int(most_significant_64_bits_without_leading_1, 2)
+def _deterministic_sha256_hash(s: str, part: str) -> (int, int):
+    sha256_hash = hashlib.sha256(s.encode()).hexdigest()
+
+    # First two chars is '0b'. zfill to ensure 256 bits, but we only care about the first 128 bits
+    binary_hash = bin(int(sha256_hash, 16))[2:].zfill(256)
+    if part == HIGHER_64_BITS:
+        updated_binary_hash = "0" + binary_hash[1:64]
+    else:
+        updated_binary_hash = "0" + binary_hash[65:128]
+    result = int(updated_binary_hash, 2)
     if result == 0:
         return 1
     return result
@@ -376,13 +380,27 @@ def extract_context_from_step_functions(event, lambda_context):
         execution_id = event.get("Execution").get("Id")
         state_name = event.get("State").get("Name")
         state_entered_time = event.get("State").get("EnteredTime")
-        trace_id = _deterministic_md5_hash(execution_id)
-        parent_id = _deterministic_md5_hash(
-            f"{execution_id}#{state_name}#{state_entered_time}"
+        # returning 128 bits since 128bit traceId will be break up into
+        # traditional traceId and _dd.p.tid tag
+        # https://github.com/DataDog/dd-trace-py/blob/3e34d21cb9b5e1916e549047158cb119317b96ab/ddtrace/propagation/http.py#L232-L240
+        trace_id = _deterministic_sha256_hash(execution_id, LOWER_64_BITS)
+
+        parent_id = _deterministic_sha256_hash(
+            f"{execution_id}#{state_name}#{state_entered_time}", HIGHER_64_BITS
         )
+
         sampling_priority = SamplingPriority.AUTO_KEEP
         return Context(
-            trace_id=trace_id, span_id=parent_id, sampling_priority=sampling_priority
+            trace_id=trace_id,
+            span_id=parent_id,
+            sampling_priority=sampling_priority,
+            # take the higher 64 bits as _dd.p.tid tag and use hex to encode
+            # [2:] to remove '0x' in the hex str
+            meta={
+                "_dd.p.tid": hex(
+                    _deterministic_sha256_hash(execution_id, HIGHER_64_BITS)
+                )[2:]
+            },
         )
     except Exception as e:
         logger.debug("The Step Functions trace extractor returned with error %s", e)
@@ -1246,9 +1264,9 @@ def create_function_execution_span(
             "function_version": function_version,
             "request_id": context.aws_request_id,
             "resource_names": context.function_name,
-            "functionname": context.function_name.lower()
-            if context.function_name
-            else None,
+            "functionname": (
+                context.function_name.lower() if context.function_name else None
+            ),
             "datadog_lambda": datadog_lambda_version,
             "dd_trace": ddtrace_version,
             "span.name": "aws.lambda",

datadog_lambda-6.96.0/datadog_lambda/version.py

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

{datadog_lambda-5.94.0 → datadog_lambda-6.96.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datadog_lambda"
-version = "5.94.0"
+version = "6.96.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.7.2"
+ddtrace = ">=2.9.0"
 ujson = ">=5.9.0"
 urllib3 = [
     {version = "<2.0.0", python = "<3.11", optional = true},

datadog_lambda-5.94.0/datadog_lambda/version.py

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