fix cdk issue

Author: jchrostek-dd

integration-tests/lib/stacks/base-stack.ts

@@ -16,6 +16,13 @@ export class BaseStack extends cdk.Stack {
   constructor(scope: Construct, id: string, props: cdk.StackProps) {
     super(scope, id, props);
 
+    // Get layers once for the entire stack
+    const extensionLayer = getExtensionLayer(this);
+    const node20Layer = getNode20Layer(this);
+    const python313Layer = getPython313Layer(this);
+    const java21Layer = getJava21Layer(this);
+    const dotnet8Layer = getDotnet8Layer(this);
+
     // Node.js Lambda
     const nodeFunctionName = `${id}-node-lambda`;
     const nodeFunction = new lambda.Function(this, nodeFunctionName, {
@@ -35,8 +42,8 @@ export class BaseStack extends cdk.Stack {
       logGroup: createLogGroup(this, nodeFunctionName)
     });
     nodeFunction.addToRolePolicy(defaultDatadogSecretPolicy);
-    nodeFunction.addLayers(getExtensionLayer(this));
-    nodeFunction.addLayers(getNode20Layer(this));
+    nodeFunction.addLayers(extensionLayer);
+    nodeFunction.addLayers(node20Layer);
 
     // Python Lambda
     const pythonFunctionName = `${id}-python-lambda`;
@@ -60,8 +67,8 @@ export class BaseStack extends cdk.Stack {
       logGroup: createLogGroup(this, pythonFunctionName)
     });
     pythonFunction.addToRolePolicy(defaultDatadogSecretPolicy);
-    pythonFunction.addLayers(getExtensionLayer(this));
-    pythonFunction.addLayers(getPython313Layer(this));
+    pythonFunction.addLayers(extensionLayer);
+    pythonFunction.addLayers(python313Layer);
 
     // Java Lambda
     const javaFunctionName = `${id}-java-lambda`;
@@ -82,8 +89,8 @@ export class BaseStack extends cdk.Stack {
       logGroup: createLogGroup(this, javaFunctionName)
     });
     javaFunction.addToRolePolicy(defaultDatadogSecretPolicy);
-    javaFunction.addLayers(getExtensionLayer(this));
-    javaFunction.addLayers(getJava21Layer(this));
+    javaFunction.addLayers(extensionLayer);
+    javaFunction.addLayers(java21Layer);
 
     // .NET Lambda
     const dotnetFunctionName = `${id}-dotnet-lambda`;
@@ -103,7 +110,7 @@ export class BaseStack extends cdk.Stack {
       logGroup: createLogGroup(this, dotnetFunctionName)
     });
     dotnetFunction.addToRolePolicy(defaultDatadogSecretPolicy);
-    dotnetFunction.addLayers(getExtensionLayer(this));
-    dotnetFunction.addLayers(getDotnet8Layer(this));
+    dotnetFunction.addLayers(extensionLayer);
+    dotnetFunction.addLayers(dotnet8Layer);
   }
 }

integration-tests/lib/stacks/otlp-stack.ts

@@ -12,6 +12,9 @@ export class OtlpStack extends cdk.Stack {
   constructor(scope: Construct, id: string, props: cdk.StackProps) {
     super(scope, id, props);
 
+    // Get extension layer once for the entire stack
+    const extensionLayer = getExtensionLayer(this);
+
     // Node.js Lambda
     const nodeFunctionName = `${id}-node-lambda`;
     const nodeFunction = new lambda.Function(this, nodeFunctionName, {
@@ -33,7 +36,7 @@ export class OtlpStack extends cdk.Stack {
       logGroup: createLogGroup(this, nodeFunctionName)
     });
     nodeFunction.addToRolePolicy(defaultDatadogSecretPolicy);
-    nodeFunction.addLayers(getExtensionLayer(this));
+    nodeFunction.addLayers(extensionLayer);
 
     // Python Lambda
     const pythonFunctionName = `${id}-python-lambda`;
@@ -56,7 +59,7 @@ export class OtlpStack extends cdk.Stack {
       logGroup: createLogGroup(this, pythonFunctionName)
     });
     pythonFunction.addToRolePolicy(defaultDatadogSecretPolicy);
-    pythonFunction.addLayers(getExtensionLayer(this));
+    pythonFunction.addLayers(extensionLayer);
 
     // Java Lambda
     const javaFunctionName = `${id}-java-lambda`;
@@ -79,7 +82,7 @@ export class OtlpStack extends cdk.Stack {
       logGroup: createLogGroup(this, javaFunctionName)
     });
     javaFunction.addToRolePolicy(defaultDatadogSecretPolicy);
-    javaFunction.addLayers(getExtensionLayer(this));
+    javaFunction.addLayers(extensionLayer);
 
     // .NET Lambda
     const dotnetFunctionName = `${id}-dotnet-lambda`;
@@ -102,6 +105,6 @@ export class OtlpStack extends cdk.Stack {
       logGroup: createLogGroup(this, dotnetFunctionName)
     });
     dotnetFunction.addToRolePolicy(defaultDatadogSecretPolicy);
-    dotnetFunction.addLayers(getExtensionLayer(this));
+    dotnetFunction.addLayers(extensionLayer);
   }
 }