@jaypie/constructs 1.2.60 → 1.2.62

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/helpers/jaypieLambdaEnv.d.ts

@@ -2,6 +2,7 @@ export interface JaypieLambdaEnvOptions {
     initialEnvironment?: {
         [key: string]: string;
     };
+    serviceTag?: string;
 }
 export declare function jaypieLambdaEnv(options?: JaypieLambdaEnvOptions): {
     [key: string]: string;

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]);
@@ -738,7 +739,7 @@ function isValidSubdomain(subdomain) {
 }
 
 function jaypieLambdaEnv(options = {}) {
-    const { initialEnvironment = {} } = options;
+    const { initialEnvironment = {}, serviceTag } = options;
     // Start with empty environment - we'll only add valid values
     let environment = {};
     // First, add all valid string values from initialEnvironment
@@ -767,6 +768,11 @@ function jaypieLambdaEnv(options = {}) {
             environment[key] = defaultValue;
         }
     });
+    // Apply serviceTag as DD_SERVICE unless explicitly overridden.
+    // Precedence: explicit environment > serviceTag > process.env.PROJECT_SERVICE
+    if (serviceTag && !environment.DD_SERVICE) {
+        environment.DD_SERVICE = serviceTag;
+    }
     // Default environment variables from process.env if present
     const defaultEnvVars = [
         "DATADOG_API_KEY_ARN",
@@ -1638,7 +1644,7 @@ class JaypieLambda extends constructs.Construct {
         // Resolve environment from array or object syntax
         const initialEnvironment = resolveEnvironment(environmentInput);
         // Get base environment with defaults
-        const environment = jaypieLambdaEnv({ initialEnvironment });
+        const environment = jaypieLambdaEnv({ initialEnvironment, serviceTag });
         // Resolve secrets from mixed array (strings and JaypieSecret instances)
         // Use Stack.of(this) to ensure secrets are shared at stack level across all constructs
         const secrets = resolveSecrets(cdk.Stack.of(this), secretsInput);
@@ -1715,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);