Better error reporting from lambdas (#624)

* feat: report if function times out * chore: include lambda requestId in event
gettakaro · Sep 17, 2023 · 8762435 · 8762435
1 parent d71de54
commit 8762435
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/packages/app-api/src/executors/executeFunction.ts b/packages/app-api/src/executors/executeFunction.ts
@@ -30,6 +30,7 @@ export interface ILog {
 interface IFunctionResult {
   success: boolean;
   logs: ILog[];
+  requestId?: string;
 }
 
 export type FunctionExecutor = (code: string, data: Record<string, unknown>, token: string) => Promise<IFunctionResult>;

diff --git a/packages/lib-aws/src/executeLambda.ts b/packages/lib-aws/src/executeLambda.ts
@@ -10,6 +10,12 @@ interface executeLambdaOpts {
   token: string;
 }
 
+interface IFunctionResult {
+  success: boolean;
+  logs: any[];
+  requestId?: string;
+}
+
 const lambda = new Lambda({
   region: config.get('aws.region'),
   credentials: {
@@ -45,10 +51,26 @@ export async function executeLambda({ data, fn, token, domainId }: executeLambda
 
 async function tryExecuteLambda({ data, fn, token, domainId }: executeLambdaOpts) {
   const result = await lambda.invoke({ FunctionName: domainId, Payload: JSON.stringify({ data, token, fn }) });
+  let returnVal: IFunctionResult = {
+    requestId: result.$metadata.requestId,
+    logs: [],
+    success: false,
+  };
+
   if (result.Payload) {
     const tmpResult = Buffer.from(result.Payload).toString();
     const parsedRes = JSON.parse(tmpResult);
-    const parsedBody = JSON.parse(parsedRes.body);
-    return parsedBody;
+
+    if (parsedRes.errorMessage && parsedRes.errorMessage.includes('Task timed out')) {
+      returnVal['success'] = false;
+      returnVal['logs'] = [
+        {
+          msg: 'Task timed out',
+        },
+      ];
+    } else {
+      returnVal = JSON.parse(parsedRes.body);
+    }
   }
+  return returnVal;
 }