@jaypie/constructs 1.2.61 → 1.2.63

package/dist/cjs/helpers/addDatadogLayers.d.ts

@@ -1,5 +1,6 @@
 import * as lambda from "aws-cdk-lib/aws-lambda";
 export interface AddDatadogLayerOptions {
     datadogApiKeyArn?: string;
+    serviceTag?: string;
 }
 export declare function addDatadogLayers(lambdaFunction: lambda.Function, options?: AddDatadogLayerOptions): boolean;

package/dist/cjs/index.cjs

@@ -299,6 +299,7 @@ class JaypieAccountLoggingBucket extends constructs.Construct {
 
 function addDatadogLayers(lambdaFunction, options = {}) {
     const datadogApiKeyArn = options?.datadogApiKeyArn;
+    const resolvedService = options?.serviceTag || process.env.PROJECT_SERVICE;
     const resolvedDatadogApiKeyArn = datadogApiKeyArn ||
         process.env.DATADOG_API_KEY_ARN ||
         process.env.CDK_ENV_DATADOG_API_KEY_ARN;
@@ -312,12 +313,12 @@ function addDatadogLayers(lambdaFunction, options = {}) {
         DD_ENV: process.env.PROJECT_ENV || "",
         DD_PROFILING_ENABLED: "false",
         DD_SERVERLESS_APPSEC_ENABLED: "false",
-        DD_SERVICE: process.env.PROJECT_SERVICE || "",
+        DD_SERVICE: resolvedService || "",
         DD_SITE: CDK$2.DATADOG.SITE,
         DD_TAGS: `${CDK$2.TAG.SPONSOR}:${process.env.PROJECT_SPONSOR || ""}`,
         DD_TRACE_OTEL_ENABLED: "false",
     };
-    // Add environment variables only if they don't already exist
+    // Apply Datadog environment variables (overwrites existing keys)
     Object.entries(datadogEnvVars).forEach(([key, value]) => {
         lambdaFunction.addEnvironment(key, value);
     });
@@ -327,7 +328,7 @@ function addDatadogLayers(lambdaFunction, options = {}) {
         nodeLayerVersion: CDK$2.DATADOG.LAYER.NODE,
         extensionLayerVersion: CDK$2.DATADOG.LAYER.EXTENSION,
         env: process.env.PROJECT_ENV,
-        service: process.env.PROJECT_SERVICE,
+        service: resolvedService,
         version: process.env.PROJECT_VERSION,
     });
     datadogLambda.addLambdaFunctions([lambdaFunction]);
@@ -767,10 +768,10 @@ function jaypieLambdaEnv(options = {}) {
             environment[key] = defaultValue;
         }
     });
-    // Apply serviceTag as PROJECT_SERVICE unless explicitly overridden.
+    // Apply serviceTag as DD_SERVICE unless explicitly overridden.
     // Precedence: explicit environment > serviceTag > process.env.PROJECT_SERVICE
-    if (serviceTag && !environment.PROJECT_SERVICE) {
-        environment.PROJECT_SERVICE = serviceTag;
+    if (serviceTag && !environment.DD_SERVICE) {
+        environment.DD_SERVICE = serviceTag;
     }
     // Default environment variables from process.env if present
     const defaultEnvVars = [
@@ -1720,7 +1721,10 @@ class JaypieLambda extends constructs.Construct {
                 }
                 : undefined,
         });
-        addDatadogLayers(this._lambda, { datadogApiKeyArn });
+        addDatadogLayers(this._lambda, {
+            datadogApiKeyArn,
+            serviceTag: environment.DD_SERVICE,
+        });
         // Grant secret read permissions
         Object.values(envSecrets).forEach((secret) => {
             secret.grantRead(this._lambda);