Add error handling if lambda logs are not received from the environment (#12521)

dfangl · web-flow · commit 3ea87fea3497 · 2025-04-17T13:52:17.000+02:00
diff --git a/localstack-core/localstack/services/lambda_/invocation/version_manager.py b/localstack-core/localstack/services/lambda_/invocation/version_manager.py
@@ -238,13 +238,20 @@ def invoke(self, *, invocation: Invocation) -> InvocationResult:
             )
         # TODO: consider using the same prefix logging as in error case for execution environment.
         #   possibly as separate named logger.
-        LOG.debug("Got logs for invocation '%s'", invocation.request_id)
-        for log_line in invocation_result.logs.splitlines():
-            LOG.debug(
-                "[%s-%s] %s",
-                function_id.function_name,
+        if invocation_result.logs is not None:
+            LOG.debug("Got logs for invocation '%s'", invocation.request_id)
+            for log_line in invocation_result.logs.splitlines():
+                LOG.debug(
+                    "[%s-%s] %s",
+                    function_id.function_name,
+                    invocation.request_id,
+                    truncate(log_line, config.LAMBDA_TRUNCATE_STDOUT),
+                )
+        else:
+            LOG.warning(
+                "[%s] Error while printing logs for function '%s': Received no logs from environment.",
                 invocation.request_id,
-                truncate(log_line, config.LAMBDA_TRUNCATE_STDOUT),
+                function_id.function_name,
             )
         return invocation_result
 
@@ -260,7 +267,8 @@ def store_logs(
             self.log_handler.add_logs(log_item)
         else:
             LOG.warning(
-                "Received no logs from invocation with id %s for lambda %s",
+                "Received no logs from invocation with id %s for lambda %s. Execution environment logs: \n%s",
                 invocation_result.request_id,
                 self.function_arn,
+                execution_env.get_prefixed_logs(),
             )
