DataDog
diff --git a/‎src/metrics/listener.spec.ts
Lines changed: 34 additions & 1 deletion b/‎src/metrics/listener.spec.ts
Lines changed: 34 additions & 1 deletion
diff --git a/‎src/metrics/listener.ts
Lines changed: 4 additions & 2 deletions b/‎src/metrics/listener.ts
Lines changed: 4 additions & 2 deletions
@@ -128,7 +128,7 @@ describe("MetricsListener", () => {
       const listener = new MetricsListener(kms as any, {
         apiKey: "",
         apiKeyKMS: "",
-        apiKeySecretARN: "api-key-secret-arn",
+        apiKeySecretARN: "arn:aws:secretsmanager:us-gov-west-1:1234567890:secret:key-name-123ABC",
         enhancedMetrics: false,
         logForwarding: false,
         shouldRetryMetrics: false,
@@ -141,6 +141,39 @@ describe("MetricsListener", () => {
 
       expect(secretsManagerSpy).toHaveBeenCalledWith({
         useFipsEndpoint: true,
+        region: "us-gov-west-1",
+      });
+
+      secretsManagerSpy.mockRestore();
+    } finally {
+      process.env.AWS_REGION = "us-east-1";
+    }
+  });
+
+  it("uses correct secrets region", async () => {
+    try {
+      process.env.AWS_REGION = "us-east-1";
+      const secretsManagerModule = require("@aws-sdk/client-secrets-manager");
+      const secretsManagerSpy = jest.spyOn(secretsManagerModule, "SecretsManager");
+
+      const kms = new MockKMS("kms-api-key-decrypted");
+      const listener = new MetricsListener(kms as any, {
+        apiKey: "",
+        apiKeyKMS: "",
+        apiKeySecretARN: "arn:aws:secretsmanager:ap-west-1:1234567890:secret:key-name-123ABC",
+        enhancedMetrics: false,
+        logForwarding: false,
+        shouldRetryMetrics: false,
+        localTesting: false,
+        siteURL,
+      });
+
+      await listener.onStartInvocation({});
+      await listener.onCompleteInvocation();
+
+      expect(secretsManagerSpy).toHaveBeenCalledWith({
+        useFipsEndpoint: false,
+        region: "ap-west-1",
       });
 
       secretsManagerSpy.mockRestore();
 
@@ -224,10 +224,12 @@ export class MetricsListener {
     if (config.apiKeySecretARN !== "") {
       try {
         const { SecretsManager } = await import("@aws-sdk/client-secrets-manager");
-        const region = process.env.AWS_REGION;
-        const isGovRegion = region !== undefined && region.startsWith("us-gov-");
+        const secretRegion = config.apiKeySecretARN.split(":")[3];
+        const lambdaRegion = process.env.AWS_REGION;
+        const isGovRegion = lambdaRegion !== undefined && lambdaRegion.startsWith("us-gov-");
         const secretsManager = new SecretsManager({
           useFipsEndpoint: isGovRegion,
+          region: secretRegion,
         });
         const secret = await secretsManager.getSecretValue({ SecretId: config.apiKeySecretARN });
         return secret?.SecretString ?? "";