Merge cde829b into 761b3dc

Author: astuyve

src/index.ts

@@ -44,6 +44,7 @@ export const decodeAuthorizerContextEnvVar = "DD_DECODE_AUTHORIZER_CONTEXT";
 export const coldStartTracingEnvVar = "DD_COLD_START_TRACING";
 export const minColdStartTraceDurationEnvVar = "DD_MIN_COLD_START_DURATION";
 export const coldStartTraceSkipLibEnvVar = "DD_COLD_START_TRACE_SKIP_LIB";
+export const localTestingEnvVar = "DD_LOCAL_TESTING";
 
 interface GlobalConfig {
   /**
@@ -86,6 +87,7 @@ export const defaultConfig: Config = {
   siteURL: "",
   minColdStartTraceDuration: 3,
   coldStartTraceSkipLib: "",
+  localTesting: false,
 } as const;
 
 let currentMetricsListener: MetricsListener | undefined;
@@ -365,6 +367,14 @@ function getConfig(userConfig?: Partial<Config>): Config {
     config.captureLambdaPayloadMaxDepth = Number(getEnvValue(captureLambdaPayloadMaxDepthEnvVar, "10"));
   }
 
+  if (userConfig === undefined || userConfig.localTesting === undefined) {
+    const result = getEnvValue(localTestingEnvVar, "false").toLowerCase();
+    // TODO deprecate 1 for truthy, this shouldn't have been allowed
+    // but the extension allows it, so we must as well
+    // @ts-ignore-next-line
+    config.localTesting = result === "true" || result === "1";
+  }
+
   return config;
 }
 

src/metrics/listener.spec.ts

@@ -37,6 +37,7 @@ describe("MetricsListener", () => {
       enhancedMetrics: false,
       logForwarding: false,
       shouldRetryMetrics: false,
+      localTesting: false,
       siteURL,
     });
 
@@ -56,6 +57,7 @@ describe("MetricsListener", () => {
       enhancedMetrics: false,
       logForwarding: false,
       shouldRetryMetrics: false,
+      localTesting: false,
       siteURL,
     });
 
@@ -73,6 +75,7 @@ describe("MetricsListener", () => {
       enhancedMetrics: false,
       logForwarding: false,
       shouldRetryMetrics: false,
+      localTesting: false,
       siteURL,
     });
 
@@ -91,6 +94,7 @@ describe("MetricsListener", () => {
       enhancedMetrics: false,
       logForwarding: true,
       shouldRetryMetrics: false,
+      localTesting: false,
       siteURL,
     });
     jest.useFakeTimers("legacy");
@@ -124,6 +128,7 @@ describe("MetricsListener", () => {
       enhancedMetrics: false,
       logForwarding: true,
       shouldRetryMetrics: false,
+      localTesting: true,
       siteURL,
     });
     jest.useFakeTimers("legacy");
@@ -146,6 +151,7 @@ describe("MetricsListener", () => {
       enhancedMetrics: false,
       logForwarding: true,
       shouldRetryMetrics: false,
+      localTesting: false,
       siteURL,
     });
     // jest.useFakeTimers();

src/metrics/listener.ts

@@ -46,6 +46,13 @@ export interface MetricsConfig {
    * @default false
    */
   enhancedMetrics: boolean;
+
+  /**
+   * Whether to call the extension's Flush endpoint in a local test
+   * Only needed locally, as the extension knows about the end of the invocation
+   * from the runtime
+   */
+  localTesting: boolean;
 }
 
 export class MetricsListener {
@@ -114,8 +121,8 @@ export class MetricsListener {
       }
     }
     try {
-      if (this.isAgentRunning) {
-        logDebug(`Flushing Extension`);
+      if (this.isAgentRunning && this.config.localTesting) {
+        logDebug(`Flushing Extension for local test`);
         await flushExtension();
       }
     } catch (error) {