From bc178bda66945aeea91b207f29195b279793fe29 Mon Sep 17 00:00:00 2001 From: Georgi Date: Wed, 7 Jan 2026 18:30:58 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"[AWSX]=20fix(logs=20forwarder):=20Bum?= =?UTF-8?q?p=20datadog-lambda=20and=20ddtrace=20packages=20=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c6e7b2aae4fee4ce8aaefc751b7f1c2f2f0f0a03. --- aws/logs_monitoring/requirements.txt | 4 +-- aws/logs_monitoring/telemetry.py | 10 ++++--- ..._log_group_lambda_invocation.json~snapshot | 18 +++++-------- .../snapshots/cloudwatch_log.json~snapshot | 18 +++++-------- .../cloudwatch_log_cloudtrail.json~snapshot | 18 +++++-------- .../cloudwatch_log_coldstart.json~snapshot | 21 +++++---------- .../cloudwatch_log_custom_tags.json~snapshot | 12 +++------ ...dwatch_log_lambda_invocation.json~snapshot | 27 +++++++------------ .../cloudwatch_log_service_tag.json~snapshot | 12 +++------ .../cloudwatch_log_timeout.json~snapshot | 12 +++------ .../step_functions_log.json~snapshot | 18 +++++-------- 11 files changed, 60 insertions(+), 110 deletions(-) diff --git a/aws/logs_monitoring/requirements.txt b/aws/logs_monitoring/requirements.txt index 9f26cc795..2999e2700 100644 --- a/aws/logs_monitoring/requirements.txt +++ b/aws/logs_monitoring/requirements.txt @@ -3,10 +3,10 @@ bytecode cattrs certifi charset-normalizer -datadog-lambda==8.120.0 +datadog-lambda==6.107.0 datadog==0.52.0 ddsketch==3.0.1 -ddtrace==3.16.2 +ddtrace==3.10.2 deprecated envier exceptiongroup diff --git a/aws/logs_monitoring/telemetry.py b/aws/logs_monitoring/telemetry.py index 862eba89a..7506a46ba 100644 --- a/aws/logs_monitoring/telemetry.py +++ b/aws/logs_monitoring/telemetry.py @@ -4,7 +4,7 @@ # Copyright 2021 Datadog, Inc. try: - from datadog_lambda.metric import lambda_metric + from datadog_lambda.metric import lambda_stats DD_SUBMIT_ENHANCED_METRICS = True except ImportError: @@ -34,7 +34,7 @@ def send_forwarder_internal_metrics(name, additional_tags=[]): return """Send forwarder's internal metrics to DD""" - lambda_metric( + lambda_stats.distribution( "{}.{}".format(DD_FORWARDER_TELEMETRY_NAMESPACE_PREFIX, name), 1, tags=DD_FORWARDER_TELEMETRY_TAGS + additional_tags, @@ -45,7 +45,7 @@ def send_event_metric(metric_name, metric_value): if not DD_SUBMIT_ENHANCED_METRICS: return - lambda_metric( + lambda_stats.distribution( "{}.{}".format(DD_FORWARDER_TELEMETRY_NAMESPACE_PREFIX, metric_name), metric_value, tags=DD_FORWARDER_TELEMETRY_TAGS, @@ -56,4 +56,6 @@ def send_log_metric(metric): if not DD_SUBMIT_ENHANCED_METRICS: return - lambda_metric(metric["m"], metric["v"], timestamp=metric["e"], tags=metric["t"]) + lambda_stats.distribution( + metric["m"], metric["v"], timestamp=metric["e"], tags=metric["t"] + ) diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_customized_log_group_lambda_invocation.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_customized_log_group_lambda_invocation.json~snapshot index b6e42af23..fd481ba52 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_customized_log_group_lambda_invocation.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_customized_log_group_lambda_invocation.json~snapshot @@ -101,8 +101,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -116,8 +115,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -131,8 +129,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -146,8 +143,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -161,8 +157,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -176,8 +171,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" } diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log.json~snapshot index cebea35d6..3ea06e7e9 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log.json~snapshot @@ -74,8 +74,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -89,8 +88,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -104,8 +102,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -119,8 +116,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -134,8 +130,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -149,8 +144,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" } diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_cloudtrail.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_cloudtrail.json~snapshot index 161c808a6..3fc79dadd 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_cloudtrail.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_cloudtrail.json~snapshot @@ -110,8 +110,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -125,8 +124,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -140,8 +138,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -155,8 +152,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -170,8 +166,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -185,8 +180,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" } diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_coldstart.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_coldstart.json~snapshot index 7b3430f4a..006fa5866 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_coldstart.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_coldstart.json~snapshot @@ -13,8 +13,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -28,8 +27,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -43,8 +41,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -58,8 +55,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -73,8 +69,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -88,8 +83,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -103,8 +97,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" } diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_custom_tags.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_custom_tags.json~snapshot index cd04b92e4..0fa74be37 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_custom_tags.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_custom_tags.json~snapshot @@ -56,8 +56,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -71,8 +70,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -86,8 +84,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -101,8 +98,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" } diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot index 5c831c8b7..85a2beba8 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot @@ -728,8 +728,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -743,8 +742,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -758,8 +756,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -773,8 +770,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -788,8 +784,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -803,8 +798,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -818,8 +812,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -843,8 +836,7 @@ "aws_account:012345678912", "functionname:hello-dog-node-dev-hello12x", "region:us-east-1", - "service:hello-dog-node-dev-hello12x", - "dd_lambda_layer:datadog-python313_8.120.0" + "service:hello-dog-node-dev-hello12x" ], "type": "distribution" }, @@ -863,8 +855,7 @@ "aws_account:012345678912", "functionname:hello-dog-node-dev-hello12x", "region:us-east-1", - "service:hello-dog-node-dev-hello12x", - "dd_lambda_layer:datadog-python313_8.120.0" + "service:hello-dog-node-dev-hello12x" ], "type": "distribution" }, diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_service_tag.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_service_tag.json~snapshot index 674f47ef0..d94a7f450 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_service_tag.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_service_tag.json~snapshot @@ -56,8 +56,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -71,8 +70,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -86,8 +84,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -101,8 +98,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" } diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_timeout.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_timeout.json~snapshot index 5af19a91f..cc54f2a3b 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_timeout.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_timeout.json~snapshot @@ -122,8 +122,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -137,8 +136,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -152,8 +150,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -167,8 +164,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/step_functions_log.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/step_functions_log.json~snapshot index bc154d8b5..09a539383 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/step_functions_log.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/step_functions_log.json~snapshot @@ -56,8 +56,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -71,8 +70,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -86,8 +84,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -101,8 +98,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -116,8 +112,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }, @@ -131,8 +126,7 @@ "forwardername:test_function", "forwarder_memorysize:3008", "forwarder_version:", - "event_type:awslogs", - "dd_lambda_layer:datadog-python313_8.120.0" + "event_type:awslogs" ], "type": "distribution" }