Merge remote-tracking branch 'origin/main' into onzia/bump-pytest

Author: ojproductions

datadog_lambda/config.py

@@ -141,6 +141,11 @@ def _reset(self):
         "enabled" if config.fips_mode_enabled else "not enabled",
     )
 
+# Remote configuration relies on /dev/shm which is unavailable in Lambda.
+# Disable it before ddtrace loads to avoid the shared-memory warning.
+if "DD_REMOTE_CONFIGURATION_ENABLED" not in os.environ:
+    os.environ["DD_REMOTE_CONFIGURATION_ENABLED"] = "false"
+
 # disable css to prevent double counting in lambda
 os.environ["DD_TRACE_STATS_COMPUTATION_ENABLED"] = "false"
 

datadog_lambda/durable.py

@@ -55,7 +55,7 @@ def extract_durable_function_tags(event):
     }
 
 
-VALID_DURABLE_STATUSES = {"SUCCEEDED", "FAILED", "STOPPED", "TIMED_OUT"}
+VALID_DURABLE_STATUSES = {"SUCCEEDED", "FAILED", "PENDING"}
 
 
 def extract_durable_execution_status(response, event):

tests/test_durable.py

@@ -131,19 +131,12 @@ def test_returns_failed(self):
         response = {"Status": "FAILED", "Error": "some-error"}
         self.assertEqual(extract_durable_execution_status(response, event), "FAILED")
 
-    def test_returns_stopped(self):
+    def test_returns_pending(self):
         event = {
             "DurableExecutionArn": "arn:aws:lambda:us-east-1:123:function:f:1/durable-execution/n/id"
         }
-        response = {"Status": "STOPPED"}
-        self.assertEqual(extract_durable_execution_status(response, event), "STOPPED")
-
-    def test_returns_timed_out(self):
-        event = {
-            "DurableExecutionArn": "arn:aws:lambda:us-east-1:123:function:f:1/durable-execution/n/id"
-        }
-        response = {"Status": "TIMED_OUT"}
-        self.assertEqual(extract_durable_execution_status(response, event), "TIMED_OUT")
+        response = {"Status": "PENDING"}
+        self.assertEqual(extract_durable_execution_status(response, event), "PENDING")
 
     def test_returns_none_for_non_durable_event(self):
         event = {"key": "value"}