datadog_lambda 6.96.0__tar.gz → 6.98.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datadog_lambda
-Version: 6.96.0
+Version: 6.98.0
 Summary: The Datadog AWS Lambda Library
 Home-page: https://github.com/DataDog/datadog-lambda-python
 License: Apache-2.0
@@ -16,16 +16,14 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: dev
-Requires-Dist: boto3 (>=1.28.0,<2.0.0) ; 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.9.0)
+Requires-Dist: ddtrace (>=2.10.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: urllib3 (<2.0.0) ; python_version < "3.11"
-Requires-Dist: urllib3 (<2.1.0) ; python_version >= "3.11"
 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-6.96.0 → datadog_lambda-6.98.0}/datadog_lambda/metric.py

@@ -7,6 +7,7 @@ import os
 import time
 import logging
 import ujson as json
+from datetime import datetime, timedelta
 
 from datadog_lambda.extension import should_use_extension
 from datadog_lambda.tags import get_enhanced_metrics_tags, dd_lambda_layer_tag
@@ -61,6 +62,18 @@ def lambda_metric(metric_name, value, timestamp=None, tags=None, force_async=Fal
     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
+        timestamp_ceiling = int(
+            (datetime.now() - timedelta(hours=4)).timestamp()
+        )  # 4 hours ago
+        if isinstance(timestamp, datetime):
+            timestamp = int(timestamp.timestamp())
+        if timestamp_ceiling > timestamp:
+            logger.warning(
+                "Timestamp %s is older than 4 hours, not submitting metric %s",
+                timestamp,
+                metric_name,
+            )
+            return
         global extension_thread_stats
         if extension_thread_stats is None:
             from datadog_lambda.thread_stats_writer import ThreadStatsWriter
@@ -108,11 +121,19 @@ def write_metric_point_to_stdout(metric_name, value, timestamp=None, tags=[]):
     )
 
 
-def flush_stats():
+def flush_stats(lambda_context=None):
     lambda_stats.flush()
 
     if extension_thread_stats is not None:
-        extension_thread_stats.flush()
+        if lambda_context is not None:
+            tags = get_enhanced_metrics_tags(lambda_context)
+            split_arn = lambda_context.invoked_function_arn.split(":")
+            if len(split_arn) > 7:
+                # Get rid of the alias
+                split_arn.pop()
+            arn = ":".join(split_arn)
+            tags.append("function_arn:" + arn)
+        extension_thread_stats.flush(tags)
 
 
 def submit_enhanced_metric(metric_name, lambda_context):

{datadog_lambda-6.96.0 → datadog_lambda-6.98.0}/datadog_lambda/thread_stats_writer.py

@@ -22,11 +22,13 @@ class ThreadStatsWriter(StatsWriter):
             metric_name, value, tags=tags, timestamp=timestamp
         )
 
-    def flush(self):
+    def flush(self, tags=None):
         """ "Flush distributions from ThreadStats to Datadog.
         Modified based on `datadog.threadstats.base.ThreadStats.flush()`,
         to gain better control over exception handling.
         """
+        if tags:
+            self.thread_stats.constant_tags = self.thread_stats.constant_tags + tags
         _, dists = self.thread_stats._get_aggregate_metrics_and_dists(float("inf"))
         count_dists = len(dists)
         if not count_dists:

datadog_lambda-6.98.0/datadog_lambda/version.py

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

{datadog_lambda-6.96.0 → datadog_lambda-6.98.0}/datadog_lambda/wrapper.py

@@ -54,6 +54,10 @@ profiling_env_var = os.environ.get("DD_PROFILING_ENABLED", "false").lower() == "
 if profiling_env_var:
     from ddtrace.profiling import profiler
 
+llmobs_env_var = os.environ.get("DD_LLMOBS_ENABLED", "false").lower() in ("true", "1")
+if llmobs_env_var:
+    from ddtrace.llmobs import LLMObs
+
 logger = logging.getLogger(__name__)
 
 DD_FLUSH_TO_LOG = "DD_FLUSH_TO_LOG"
@@ -221,6 +225,10 @@ class _LambdaDecorator(object):
             # Patch third-party libraries for tracing
             patch_all()
 
+            # Enable LLM Observability
+            if llmobs_env_var:
+                LLMObs.enable()
+
             logger.debug("datadog_lambda_wrapper initialized")
         except Exception as e:
             logger.error(format_err_with_traceback(e))
@@ -366,13 +374,16 @@ class _LambdaDecorator(object):
                     logger.debug("Failed to create cold start spans. %s", e)
 
             if not self.flush_to_log or should_use_extension:
-                flush_stats()
+                flush_stats(context)
             if should_use_extension and self.local_testing_mode:
                 # when testing locally, the extension does not know when an
                 # invocation completes because it does not have access to the
                 # logs api
                 flush_extension()
 
+            if llmobs_env_var:
+                LLMObs.flush()
+
             if self.encode_authorizer_context and is_authorizer_response(self.response):
                 self._inject_authorizer_span_headers(
                     event.get("requestContext", {}).get("requestId")

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datadog_lambda"
-version = "6.96.0"
+version = "6.98.0"
 description = "The Datadog AWS Lambda Library"
 authors = ["Datadog, Inc. <dev@datadoghq.com>"]
 license = "Apache-2.0"
@@ -27,19 +27,14 @@ classifiers = [
 python = ">=3.8.0,<4"
 datadog = ">=0.41.0,<1.0.0"
 wrapt = "^1.11.2"
-ddtrace = ">=2.9.0"
+ddtrace = ">=2.10.0"
 ujson = ">=5.9.0"
-urllib3 = [
-    {version = "<2.0.0", python = "<3.11", optional = true},
-    {version = "<2.1.0", python = ">=3.11", optional = true},
-]
-boto3 = { version = "^1.28.0", optional = true }
+boto3 = { version = "^1.34.0", optional = true }
 requests = { version ="^2.22.0", optional = true }
 pytest = { version= "^8.0.0", optional = true }
 pytest-benchmark = { version = "^4.0", optional = true }
 flake8 = { version = "^5.0.4", optional = true }
 
-
 [tool.poetry.extras]
 dev = [
     "boto3",

datadog_lambda-6.96.0/datadog_lambda/version.py

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