fix check error logic and check event header

thundra-io · Apr 18, 2020 · 1ab5be6 · 1ab5be6
1 parent 1980939
commit 1ab5be6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/ThundraWrapper.ts b/src/ThundraWrapper.ts
@@ -484,13 +484,14 @@ class ThundraWrapper {
 
     isErrorResponse(result: any) {
         let isError = false;
-        if (Utils.isValidResponse(result) && typeof result.body === 'string') {
-            const statusCode = result.statusCode.toString();
-            if (statusCode.startsWith('4') || statusCode.startsWith('5')) {
+        if (Utils.isValidResponse(result) && result.body) {
+            if (typeof result.body === 'string') {
+                if (result.statusCode >= 400 && result.statusCode <= 599) {
+                    isError = true;
+                }
+            } else {
                 isError = true;
             }
-        } else if (Utils.isValidResponse(result)) {
-            isError = true;
         }
         return isError;
     }

diff --git a/src/plugins/Trace.ts b/src/plugins/Trace.ts
@@ -319,7 +319,7 @@ export class Trace {
         const lambdaEventType = LambdaEventUtils.getLambdaEventType(originalEvent, originalContext);
         if (lambdaEventType === LambdaEventType.Lambda) {
             return this.tracer.extract(opentracing.FORMAT_TEXT_MAP, originalContext.clientContext.custom);
-        } else if (lambdaEventType === LambdaEventType.APIGatewayProxy) {
+        } else if (lambdaEventType === LambdaEventType.APIGatewayProxy && originalEvent.headers) {
             return this.tracer.extract(opentracing.FORMAT_HTTP_HEADERS, originalEvent.headers);
         } else if (lambdaEventType === LambdaEventType.SNS) {
             return LambdaEventUtils.extractSpanContextFromSNSEvent(this.tracer, originalEvent);