Update Dependencies

src/index.ts

@@ -1,5 +1,4 @@
-import { Handler, Context } from "aws-lambda";
-
+import { Context, Handler } from "aws-lambda";
 import {
   incrementErrorsMetric,
   incrementInvocationsMetric,
@@ -8,19 +7,20 @@ import {
   MetricsListener,
 } from "./metrics";
 import { TraceConfig, TraceHeaders, TraceListener } from "./trace";
+import { extractHTTPStatusCodeTag } from "./trace/trigger";
 import {
+  logDebug,
   logError,
-  LogLevel,
   Logger,
+  LogLevel,
+  promisifiedHandler,
   setColdStart,
-  setLogLevel,
   setLogger,
-  promisifiedHandler,
-  logDebug,
+  setLogLevel,
   tagObject,
 } from "./utils";
+
 export { TraceHeaders } from "./trace";
-import { extractHTTPStatusCodeTag } from "./trace/trigger";
 
 export const apiKeyEnvVar = "DD_API_KEY";
 export const apiKeyKMSEnvVar = "DD_KMS_API_KEY";
@@ -123,7 +123,9 @@ export function datadog<TEvent, TResult>(
         incrementInvocationsMetric(metricsListener, context);
       }
     } catch (err) {
-      logDebug("Failed to start listeners", err);
+      if (err instanceof Error) {
+        logDebug("Failed to start listeners", err);
+      }
     }
 
     let result: TResult | undefined;
@@ -164,7 +166,9 @@ export function datadog<TEvent, TResult>(
         incrementErrorsMetric(metricsListener, context);
       }
     } catch (err) {
-      logDebug("Failed to complete listeners", err);
+      if (err instanceof Error) {
+        logDebug("Failed to complete listeners", err);
+      }
     }
     currentMetricsListener = undefined;
     currentTraceListener = undefined;

src/metrics/kms-service.spec.ts

@@ -1,5 +1,5 @@
-import { KMSService } from "./kms-service";
 import nock from "nock";
+import { KMSService } from "./kms-service";
 
 describe("KMSService", () => {
   const ENCRYPTED_KEY = "BQICAHj0djbIQaGrIfSD2gstvRF3h8YGMeEvO5rRHNiuWwSeegEFl57KxNejRn"; // random fake key
@@ -79,7 +79,9 @@ describe("KMSService", () => {
       await kmsService.decrypt(ENCRYPTED_KEY);
       fail();
     } catch (e) {
-      expect(e.message).toEqual(EXPECTED_ERROR_MESSAGE);
+      if (e instanceof Error) {
+        expect((e as Error).message).toEqual(EXPECTED_ERROR_MESSAGE);
+      }
     }
     fakeKmsCall.done();
   });

src/metrics/kms-service.ts

@@ -28,7 +28,7 @@ export class KMSService {
       }
       return result.Plaintext.toString("ascii");
     } catch (err) {
-      if (err.code === "MODULE_NOT_FOUND") {
+      if ((err as any).code === "MODULE_NOT_FOUND") {
         const errorMsg = "optional dependency aws-sdk not installed. KMS key decryption will not work";
         logError(errorMsg);
         throw Error(errorMsg);

src/metrics/listener.ts

@@ -1,13 +1,12 @@
+import { StatsD } from "hot-shots";
 import { promisify } from "util";
-
 import { logDebug, logError } from "../utils";
 import { APIClient } from "./api";
+import { flushExtension, isAgentRunning } from "./extension";
 import { KMSService } from "./kms-service";
 import { writeMetricToStdout } from "./metric-log";
 import { Distribution } from "./model";
 import { Processor } from "./processor";
-import { StatsD } from "hot-shots";
-import { isAgentRunning, flushExtension } from "./extension";
 
 const metricsBatchSendIntervalMS = 10000; // 10 seconds
 
@@ -109,15 +108,19 @@ export class MetricsListener {
     } catch (error) {
       // This can fail for a variety of reasons, from the API not being reachable,
       // to KMS key decryption failing.
-      logError("failed to flush metrics", error);
+      if (error instanceof Error) {
+        logError("failed to flush metrics", error as Error);
+      }
     }
     try {
       if (this.isAgentRunning) {
         logDebug(`Flushing Extension`);
         await flushExtension();
       }
     } catch (error) {
-      logError("failed to flush extension", error);
+      if (error instanceof Error) {
+        logError("failed to flush extension", error as Error);
+      }
     }
     this.currentProcessor = undefined;
   }
@@ -172,7 +175,9 @@ export class MetricsListener {
       try {
         return await this.kmsClient.decrypt(config.apiKeyKMS);
       } catch (error) {
-        logError("couldn't decrypt kms api key", error);
+        if (error instanceof Error) {
+          logError("couldn't decrypt kms api key", error as Error);
+        }
       }
     } else {
       const errorMessage = "api key not configured, see https://dtdg.co/sls-node-metrics";

src/trace/context.ts

@@ -1,12 +1,11 @@
-import { Context } from "aws-lambda";
+import { Context, SQSEvent } from "aws-lambda";
 import { BigNumber } from "bignumber.js";
 import { randomBytes } from "crypto";
 import { createSocket, Socket } from "dgram";
-import { SQSEvent } from "aws-lambda";
-
 import { logDebug, logError } from "../utils";
 import { isSQSEvent } from "../utils/event-type-guards";
 import {
+  awsXrayDaemonAddressEnvVar,
   parentIDHeader,
   SampleMode,
   samplingPriorityHeader,
@@ -18,7 +17,6 @@ import {
   xraySubsegmentName,
   xraySubsegmentNamespace,
   xrayTraceEnvVar,
-  awsXrayDaemonAddressEnvVar,
 } from "./constants";
 import { TraceExtractor } from "./listener";
 
@@ -59,7 +57,9 @@ export function extractTraceContext(
       trace = extractor(event, context);
       logDebug(`extracted trace context from the custom extractor`, { trace });
     } catch (error) {
-      logError("custom extractor function failed", error);
+      if (error instanceof Error) {
+        logError("custom extractor function failed", error as Error);
+      }
     }
   }
 
@@ -76,7 +76,9 @@ export function extractTraceContext(
     try {
       addStepFunctionContextToXray(stepFuncContext);
     } catch (error) {
-      logError("couldn't add step function metadata to xray", error);
+      if (error instanceof Error) {
+        logError("couldn't add step function metadata to xray", error as Error);
+      }
     }
   }
 
@@ -86,7 +88,9 @@ export function extractTraceContext(
       logDebug(`added trace context to xray metadata`, { trace });
     } catch (error) {
       // This might fail if running in an environment where xray isn't set up, (like for local development).
-      logError("couldn't add trace context to xray metadata", error);
+      if (error instanceof Error) {
+        logError("couldn't add trace context to xray metadata", error as Error);
+      }
     }
     return trace;
   }
@@ -172,8 +176,10 @@ export function sendXraySubsegment(segment: string) {
       logDebug(`Xray daemon received metadata payload`, { error, bytes });
     });
   } catch (error) {
-    client?.close();
-    logDebug("Error occurred submitting to xray daemon", error);
+    if (error instanceof Error) {
+      client?.close();
+      logDebug("Error occurred submitting to xray daemon", error);
+    }
   }
 }
 
@@ -210,7 +216,9 @@ export function readTraceFromSQSEvent(event: SQSEvent): TraceContext | undefined
       logDebug(`extracted trace context from sqs event`, { trace, event });
       return trace;
     } catch (err) {
-      logError("Error parsing SQS message trace data", err);
+      if (err instanceof Error) {
+        logError("Error parsing SQS message trace data", err as Error);
+      }
       return;
     }
   }

src/trace/tracer-wrapper.ts

@@ -30,7 +30,9 @@ export class TracerWrapper {
       this.tracer = require(path);
       return;
     } catch (err) {
-      logDebug("Couldn't require dd-trace from main", err);
+      if (err instanceof Object || err instanceof Error) {
+        logDebug("Couldn't require dd-trace from main", err);
+      }
     }
   }
 

src/utils/handler.ts

@@ -1,5 +1,4 @@
 import { Callback, Context, Handler } from "aws-lambda";
-
 import { logError } from "./log";
 
 export type OnWrapFunc<T = (...args: any[]) => any> = (fn: T) => T;
@@ -19,8 +18,10 @@ export function wrap<TEvent, TResult>(
     try {
       await onStart(event, context);
     } catch (error) {
-      // Swallow the error and continue processing.
-      logError("Pre-lambda hook threw error", error);
+      if (error instanceof Error) {
+        // Swallow the error and continue processing.
+        logError("Pre-lambda hook threw error", error as Error);
+      }
     }
     let result: TResult | undefined;
 
@@ -31,13 +32,17 @@ export function wrap<TEvent, TResult>(
     try {
       wrappedHandler = onWrap !== undefined ? onWrap(promHandler) : promHandler;
     } catch (error) {
-      logError("Failed to apply wrap to handler function", error);
+      if (error instanceof Error) {
+        logError("Failed to apply wrap to handler function", error as Error);
+      }
     }
 
     try {
       result = await wrappedHandler(event, context);
     } catch (error) {
-      handlerError = error;
+      if (error instanceof Error) {
+        handlerError = error;
+      }
       throw error;
     } finally {
       try {
@@ -47,8 +52,10 @@ export function wrap<TEvent, TResult>(
           await onComplete(event, context);
         }
       } catch (error) {
-        // Swallow the error and continue processing.
-        logError("Post-lambda hook threw error", error);
+        if (error instanceof Error) {
+          // Swallow the error and continue processing.
+          logError("Post-lambda hook threw error", error as Error);
+        }
       }
     }