Merge 6cc0816 into e08ad86

duncanista · web-flow · commit a1247d132549 · 2024-03-20T10:27:50.000-04:00
diff --git a/integration_tests/snapshots/logs/http-requests_node16.log b/integration_tests/snapshots/logs/http-requests_node16.log
@@ -37,9 +37,12 @@ START
   "v": 1
 }
 HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 END Duration: XXXX ms Memory Used: XXXX MB
 START
 {
@@ -58,7 +61,10 @@ START
   "v": 1
 }
 HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 END Duration: XXXX ms Memory Used: XXXX MB
diff --git a/integration_tests/snapshots/logs/http-requests_node18.log b/integration_tests/snapshots/logs/http-requests_node18.log
@@ -37,9 +37,12 @@ START
   "v": 1
 }
 HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 END Duration: XXXX ms Memory Used: XXXX MB
 START
 {
@@ -58,7 +61,10 @@ START
   "v": 1
 }
 HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 END Duration: XXXX ms Memory Used: XXXX MB
diff --git a/integration_tests/snapshots/logs/http-requests_node20.log b/integration_tests/snapshots/logs/http-requests_node20.log
@@ -37,9 +37,12 @@ START
   "v": 1
 }
 HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 END Duration: XXXX ms Memory Used: XXXX MB
 START
 {
@@ -58,7 +61,10 @@ START
   "v": 1
 }
 HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 END Duration: XXXX ms Memory Used: XXXX MB
diff --git a/integration_tests/snapshots/logs/sync-metrics_node16.log b/integration_tests/snapshots/logs/sync-metrics_node16.log
@@ -19,6 +19,7 @@ XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed APIGat
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 END Duration: XXXX ms (init: XXXX ms) Memory Used: XXXX MB
 START
+XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS request
 {
   "e": XXXX,
   "m": "aws.lambda.enhanced.invocations",
@@ -34,10 +35,11 @@ START
   ],
   "v": 1
 }
-XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS request
+HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 END Duration: XXXX ms Memory Used: XXXX MB
 START
+XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request
 {
   "e": XXXX,
   "m": "aws.lambda.enhanced.invocations",
@@ -53,6 +55,6 @@ START
   ],
   "v": 1
 }
-XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request
+HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 END Duration: XXXX ms Memory Used: XXXX MB
diff --git a/integration_tests/snapshots/logs/sync-metrics_node18.log b/integration_tests/snapshots/logs/sync-metrics_node18.log
@@ -19,6 +19,7 @@ XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed APIGat
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 END Duration: XXXX ms (init: XXXX ms) Memory Used: XXXX MB
 START
+XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS request
 {
   "e": XXXX,
   "m": "aws.lambda.enhanced.invocations",
@@ -34,10 +35,11 @@ START
   ],
   "v": 1
 }
-XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS request
+HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 END Duration: XXXX ms Memory Used: XXXX MB
 START
+XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request
 {
   "e": XXXX,
   "m": "aws.lambda.enhanced.invocations",
@@ -53,6 +55,6 @@ START
   ],
   "v": 1
 }
-XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request
+HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 END Duration: XXXX ms Memory Used: XXXX MB
diff --git a/integration_tests/snapshots/logs/sync-metrics_node20.log b/integration_tests/snapshots/logs/sync-metrics_node20.log
@@ -36,8 +36,10 @@ XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS re
   "v": 1
 }
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
+HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 END Duration: XXXX ms Memory Used: XXXX MB
 START
+XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request
 {
   "e": XXXX,
   "m": "aws.lambda.enhanced.invocations",
@@ -53,6 +55,6 @@ START
   ],
   "v": 1
 }
-XXXX-XX-XX XX:XX:XX.XXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request
+HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
 END Duration: XXXX ms Memory Used: XXXX MB
diff --git a/src/metrics/api.ts b/src/metrics/api.ts
@@ -1,7 +1,8 @@
 import querystring from "querystring";
 import { URL } from "url";
 
-import { logDebug, post } from "../utils";
+import { logDebug } from "../utils";
+import { post } from "../utils/request";
 import { APIMetric } from "./model";
 
 const API_KEY_QUERY_PARAM = "api_key";
diff --git a/src/metrics/extension.spec.ts b/src/metrics/extension.spec.ts
@@ -1,6 +1,6 @@
 import nock from "nock";
 
-import { isExtensionRunning, flushExtension, EXTENSION_URL } from "./extension";
+import { isExtensionRunning, EXTENSION_URL } from "./extension";
 import mock from "mock-fs";
 
 describe("isExtensionRunning", () => {
@@ -22,15 +22,3 @@ describe("isExtensionRunning", () => {
     expect(ran).toBeFalsy();
   });
 });
-describe("flushExtension", () => {
-  it("calls flush on the extension", async () => {
-    const scope = nock(EXTENSION_URL).post("/lambda/flush", JSON.stringify({})).reply(200);
-    await flushExtension();
-    expect(scope.isDone()).toBeTruthy();
-  });
-  it("catches error when flush doesn't respond", async () => {
-    const scope = nock(EXTENSION_URL).post("/lambda/flush", JSON.stringify({})).replyWithError("Unavailable");
-    await flushExtension();
-    expect(scope.isDone()).toBeTruthy();
-  });
-});
diff --git a/src/metrics/extension.ts b/src/metrics/extension.ts
@@ -1,26 +1,13 @@
-import { URL } from "url";
-import { post, logDebug, logError } from "../utils";
+import { logDebug } from "../utils";
 import fs from "fs";
 
 export const EXTENSION_URL = "http://127.0.0.1:8124";
 const EXTENSION_PATH = "/opt/extensions/datadog-agent";
-const LOCAL_FLUSH_PATH = "/lambda/flush";
-const LOCAL_FLUSH_TIMEOUT_MS = 100;
 
 export async function isExtensionRunning() {
   const extensionExists = await fileExists(EXTENSION_PATH);
   if (!extensionExists) {
-    logDebug(`Extension Layer is not present`);
-    return false;
-  }
-  return true;
-}
-
-export async function flushExtension(): Promise<boolean> {
-  const url = new URL(LOCAL_FLUSH_PATH, EXTENSION_URL);
-  const result = await post(url, {}, { timeout: LOCAL_FLUSH_TIMEOUT_MS });
-  if (!result.success) {
-    logError(`Failed to flush extension. ${result.errorMessage}`);
+    logDebug(`Extension Layer is not present.`);
     return false;
   }
   return true;
diff --git a/src/metrics/listener.spec.ts b/src/metrics/listener.spec.ts
@@ -7,6 +7,7 @@ import { EXTENSION_URL } from "./extension";
 import { MetricsListener } from "./listener";
 import StatsDClient from "hot-shots";
 jest.mock("hot-shots");
+jest.requireActual("../utils/request");
 
 const siteURL = "example.com";
 
@@ -78,7 +79,7 @@ describe("MetricsListener", () => {
       siteURL,
     });
 
-    listener.onStartInvocation({});
+    await listener.onStartInvocation({});
     listener.sendDistributionMetric("my-metric", 10, false, "tag:a", "tag:b");
     await expect(listener.onCompleteInvocation()).resolves.toEqual(undefined);
   });
@@ -153,10 +154,50 @@ describe("MetricsListener", () => {
     });
     // jest.useFakeTimers();
 
-    listener.onStartInvocation({});
+    await listener.onStartInvocation({});
     listener.sendDistributionMetricWithDate("my-metric", 10, new Date(1584983836 * 1000), false, "tag:a", "tag:b");
     await listener.onCompleteInvocation();
 
     expect(spy).toHaveBeenCalledWith(`{"e":1584983836,"m":"my-metric","t":["tag:a","tag:b"],"v":10}\n`);
   });
+
+  describe("_localFlush", () => {
+    let listener: MetricsListener | undefined;
+    beforeEach(async () => {
+      mock({
+        "/opt/extensions/datadog-agent": Buffer.from([0]),
+      });
+      const distributionMock = jest.fn();
+      (StatsDClient as any).mockImplementation(() => {
+        return {
+          distribution: distributionMock,
+          close: (callback: any) => callback(undefined),
+        };
+      });
+      const kms = new MockKMS("kms-api-key-decrypted");
+      listener = new MetricsListener(kms as any, {
+        apiKey: "api-key",
+        apiKeyKMS: "",
+        enhancedMetrics: false,
+        logForwarding: true,
+        shouldRetryMetrics: false,
+        localTesting: true,
+        siteURL,
+      });
+      await listener.onStartInvocation({});
+    });
+    afterEach(() => {
+      listener = undefined;
+    });
+    it("calls flush on the agent", async () => {
+      const scope = nock(EXTENSION_URL).post("/lambda/flush", JSON.stringify({})).reply(200);
+      await listener!["_localFlush"]();
+      expect(scope.isDone()).toBeTruthy();
+    });
+    it("catches error when flush doesn't respond", async () => {
+      const scope = nock(EXTENSION_URL).post("/lambda/flush", JSON.stringify({})).replyWithError("Unavailable");
+      await listener!["_localFlush"]();
+      expect(scope.isDone()).toBeTruthy();
+    });
+  });
 });
diff --git a/src/metrics/listener.ts b/src/metrics/listener.ts
@@ -1,14 +1,15 @@
 import { StatsD } from "hot-shots";
 import { promisify } from "util";
 import { logDebug, logError } from "../utils";
-import { APIClient } from "./api";
-import { flushExtension, isExtensionRunning } from "./extension";
+import { EXTENSION_URL, isExtensionRunning } from "./extension";
 import { KMSService } from "./kms-service";
 import { writeMetricToStdout } from "./metric-log";
 import { Distribution } from "./model";
-import { Processor } from "./processor";
+import { URL } from "url";
 
-const metricsBatchSendIntervalMS = 10000; // 10 seconds
+const METRICS_BATCH_SEND_INTERVAL = 10000; // 10 seconds
+const LOCAL_FLUSH_TIMEOUT_MS = 100;
+const LOCAL_FLUSH_PATH = "/lambda/flush";
 
 export interface MetricsConfig {
   /**
@@ -56,7 +57,7 @@ export interface MetricsConfig {
 }
 
 export class MetricsListener {
-  private currentProcessor?: Promise<Processor>;
+  private currentProcessor?: Promise<any>;
   private apiKey: Promise<string>;
   private statsDClient?: StatsD;
   private isExtensionRunning?: boolean = undefined;
@@ -83,6 +84,7 @@ export class MetricsListener {
 
       return;
     }
+
     this.currentProcessor = this.createProcessor(this.config, this.apiKey);
   }
 
@@ -120,16 +122,8 @@ export class MetricsListener {
         logError("failed to flush metrics", error as Error);
       }
     }
-    try {
-      if (this.isExtensionRunning && this.config.localTesting) {
-        logDebug(`Flushing Extension for local test`);
-        await flushExtension();
-      }
-    } catch (error) {
-      if (error instanceof Error) {
-        logError("failed to flush extension", error as Error);
-      }
-    }
+
+    await this._localFlush();
     this.currentProcessor = undefined;
   }
 
@@ -171,12 +165,17 @@ export class MetricsListener {
   }
 
   private async createProcessor(config: MetricsConfig, apiKey: Promise<string>) {
-    const key = await apiKey;
-    const url = `https://api.${config.siteURL}`;
-    const apiClient = new APIClient(key, url);
-    const processor = new Processor(apiClient, metricsBatchSendIntervalMS, config.shouldRetryMetrics);
-    processor.startProcessing();
-    return processor;
+    if (!this.isExtensionRunning && !this.config.logForwarding) {
+      const { APIClient } = require("./api");
+      const { Processor } = require("./processor");
+
+      const key = await apiKey;
+      const url = `https://api.${config.siteURL}`;
+      const apiClient = new APIClient(key, url);
+      const processor = new Processor(apiClient, METRICS_BATCH_SEND_INTERVAL, config.shouldRetryMetrics);
+      processor.startProcessing();
+      return processor;
+    }
   }
 
   private async getAPIKey(config: MetricsConfig) {
@@ -193,4 +192,21 @@ export class MetricsListener {
     }
     return "";
   }
+
+  private async _localFlush() {
+    try {
+      if (this.isExtensionRunning && this.config.localTesting) {
+        const { post } = require("../utils/request");
+        const url = new URL(LOCAL_FLUSH_PATH, EXTENSION_URL);
+        const result = await post(url, {}, { timeout: LOCAL_FLUSH_TIMEOUT_MS });
+        if (!result.success) {
+          logError(`Failed to flush extension. ${result.errorMessage}`);
+        }
+      }
+    } catch (error) {
+      if (error instanceof Error) {
+        logError("Failed to flush extension", error);
+      }
+    }
+  }
 }
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -2,5 +2,4 @@ export { didFunctionColdStart, getSandboxInitTags, setSandboxInit, isProactiveIn
 export { wrap, promisifiedHandler } from "./handler";
 export { Timer } from "./timer";
 export { logError, logDebug, Logger, setLogLevel, setLogger, LogLevel } from "./log";
-export { get, post } from "./request";
 export { tagObject } from "./tag-object";

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,10 @@ XXXX-XX-XX XX:XX:XX.XXX INFO [dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS re`
`36`	`36`	`"v": 1`
`37`	`37`	`}`
`38`	`38`	`HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]`
	`39`	`+HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]`
`39`	`40`	`END Duration: XXXX ms Memory Used: XXXX MB`
`40`	`41`	`START`
	`42`	`+XXXX-XX-XX XX:XX:XX.XXX INFO [dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request`
`41`	`43`	`{`
`42`	`44`	`"e": XXXX,`
`43`	`45`	`"m": "aws.lambda.enhanced.invocations",`
`@@ -53,6 +55,6 @@ START`
`53`	`55`	`],`
`54`	`56`	`"v": 1`
`55`	`57`	`}`
`56`		`-XXXX-XX-XX XX:XX:XX.XXX INFO [dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request`
	`58`	`+HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]`
`57`	`59`	`HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]`
`58`	`60`	`END Duration: XXXX ms Memory Used: XXXX MB`