ENG-53423 add handling for empty responses

hypertrace · Nov 21, 2024 · 4b3df64 · 4b3df64
1 parent 1c615f5
commit 4b3df64
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 7 deletions.
diff --git a/src/instrumentation/ExtendedAwsLambdaInstrumentation.ts b/src/instrumentation/ExtendedAwsLambdaInstrumentation.ts
@@ -24,8 +24,14 @@ export class ExtendedAwsLambdaInstrumentation extends AwsLambdaInstrumentation {
 
             // @ts-ignore
             if (config.requestHook) {
-                // @ts-ignore
-                config.requestHook(span, {event, context: lambdaContext});
+                try{
+                    // @ts-ignore
+                    config.requestHook(span, {event, context: lambdaContext});
+                }catch(e){
+                    logger.debug("Error processing request hook")
+                    logger.debug(e)
+                }
+
             }
 
             return otelContext.with(trace.setSpan(otelContext.active(), span), async () => {
@@ -35,8 +41,14 @@ export class ExtendedAwsLambdaInstrumentation extends AwsLambdaInstrumentation {
 
                     // @ts-ignore
                     if (config.responseHook) {
-                        // @ts-ignore
-                        config.responseHook(span, {err: null, res: result});
+                        try{
+                            // @ts-ignore
+                            config.responseHook(span, {err: null, res: result});
+                        }catch(e){
+                            logger.debug("Error processing success state response hook")
+                            logger.debug(e)
+                        }
+
                     }
 
                     span.end();
@@ -52,8 +64,14 @@ export class ExtendedAwsLambdaInstrumentation extends AwsLambdaInstrumentation {
                 } catch (error) {
                     // @ts-ignore
                     if (config.responseHook) {
-                        // @ts-ignore
-                        config.responseHook(span, {err: error});
+                        try{
+                            // @ts-ignore
+                            config.responseHook(span, {err: error});
+                        }catch(e){
+                            logger.debug("Error processing error state response hook")
+                            logger.debug(e)
+                        }
+
                     }
 
                     span.recordException(error);

diff --git a/src/instrumentation/LambdaInstrumentationWrapper.ts b/src/instrumentation/LambdaInstrumentationWrapper.ts
@@ -62,7 +62,7 @@ export function LambdaRequestHook(span, {event, context}){
 }
 
 export function LambdaResponseHook(span, {err, res}) : void {
-    if(err && !res){
+    if(err || !res){
         return
     }
     let statusCode = res['statusCode']

diff --git a/test/instrumentation/LambdaInstrumentationWrapperTest.ts b/test/instrumentation/LambdaInstrumentationWrapperTest.ts
@@ -278,4 +278,18 @@ describe("manually instrument lambda function", () => {
         }
         expect(errorCount).to.equal(0)
     })
+
+    it('can handle non-apigateway events without a response gracefully', async () => {
+        async function myHandler(event, context, callback){
+        }
+
+        let wrappedHandler = agentTestWrapper.instrumentLambda(myHandler)
+        let errorCount = 0
+        try {
+            await wrappedHandler({"some-different-event": "foo"}, {}, () => {})
+        } catch(error){
+            errorCount += 1
+        }
+        expect(errorCount).to.equal(0)
+    })
 })