update

Author: jchrostek-dd

.dockerignore

@@ -1,5 +1,2 @@
 bottlecap/target/
-integration-tests/node_modules/
-integration-tests/cdk.out/
-integration-tests/test-results/
-.layers/
+integration-tests/

integration-tests/bin/app.ts

@@ -2,8 +2,7 @@
 import 'source-map-support/register';
 import * as cdk from 'aws-cdk-lib';
 import * as os from 'os';
-import { BaseNodeStack } from '../lib/base-node-stack';
-import { BasePythonStack } from '../lib/base-python-stack';
+import { BaseNodeStack } from '../lib/stacks/base-node-stack';
 
 const app = new cdk.App();
 
@@ -41,8 +40,4 @@ new BaseNodeStack(app, `integ-${identifier}-base-node`, {
   env,
 });
 
-new BasePythonStack(app, `integ-${identifier}-base-python`, {
-  env,
-});
-
 app.synth();

integration-tests/lib/base-node-stack.ts …tion-tests/lib/stacks/base-node-stack.tsintegration-tests/lib/base-node-stack.ts renamed to integration-tests/lib/stacks/base-node-stack.ts integration-tests/lib/base-node-stack.ts renamed to integration-tests/lib/stacks/base-node-stack.ts

@@ -1,7 +1,7 @@
 import * as cdk from 'aws-cdk-lib';
 import * as lambda from 'aws-cdk-lib/aws-lambda';
 import { Construct } from 'constructs';
-import { createLogGroup, datadogEnvVariables, secretPolicy, getExtensionLayer, getNode20Layer } from './util';
+import { createLogGroup, defaultDatadogEnvVariables, defaultDatadogSecretPolicy, getExtensionLayer, getNode20Layer } from '../util';
 
 export class BaseNodeStack extends cdk.Stack {
   constructor(scope: Construct, id: string, props: cdk.StackProps) {
@@ -17,14 +17,14 @@ export class BaseNodeStack extends cdk.Stack {
       timeout: cdk.Duration.seconds(30),
       memorySize: 256,
       environment: {
-        ...datadogEnvVariables,
+        ...defaultDatadogEnvVariables,
         DD_SERVICE: nodeFunctionName,
         DD_TRACE_ENABLED: 'true',
         DD_LAMBDA_HANDLER: 'index.handler',
       },
       logGroup: createLogGroup(this, nodeFunctionName)
     });
-    nodeFunction.addToRolePolicy(secretPolicy)
+    nodeFunction.addToRolePolicy(defaultDatadogSecretPolicy)
     nodeFunction.addLayers(getExtensionLayer(this));
     nodeFunction.addLayers(getNode20Layer(this));
   }

integration-tests/lib/util.ts

@@ -4,27 +4,22 @@ import * as cdk from 'aws-cdk-lib';
 import * as iam from 'aws-cdk-lib/aws-iam';
 import { LayerVersion } from "aws-cdk-lib/aws-lambda";
 
-export const datadogSecretArn = process.env.DATADOG_API_SECRET_ARN || '';
-export const extensionLayerArn = process.env.EXTENSION_LAYER_ARN || 'arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Extension-ARM:89' 
+export const datadogSecretArn = process.env.DATADOG_API_SECRET_ARN!;
+export const extensionLayerArn = process.env.EXTENSION_LAYER_ARN!;
 
 export const node20LayerArn = 'arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node20-x:130';
-export const python312LayerArn = 'arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python312-ARM:117';
 
-export interface Props extends cdk.StackProps{
-  identifier: string
-}
-
-export const datadogEnvVariables = {
+export const defaultDatadogEnvVariables = {
     DD_API_KEY_SECRET_ARN: datadogSecretArn,
     DD_SITE: 'datadoghq.com',
-    DD_ENV: 'sandbox',
+    DD_ENV: 'integration',
     DD_VERSION: '1.0.0',
     DD_SERVERLESS_FLUSH_STRATEGY: 'end',
     DD_SERVERLESS_LOGS_ENABLED: 'true',
     DD_LOG_LEVEL: 'info',
   };
 
-export const secretPolicy = new iam.PolicyStatement({
+export const defaultDatadogSecretPolicy = new iam.PolicyStatement({
   effect: iam.Effect.ALLOW,
   actions: [
     'secretsmanager:GetSecretValue',
@@ -55,12 +50,4 @@ export const getNode20Layer = (scope: Construct) => {
     'DatadogNode20Layer',
     node20LayerArn
   );
-};
-
-export const getPython312Layer = (scope: Construct) => {
-  return LayerVersion.fromLayerVersionArn(
-    scope,
-    'DatadogPython312Layer',
-    python312LayerArn
-  );
 };

integration-tests/scripts/local_publish.sh

@@ -19,7 +19,7 @@ echo "Layer name will be: Datadog-Extension-ARM-$IDENTIFIER"
 ORIGINAL_DIR=$(pwd)
 
 # Navigate to the extension root directory
-cd /Users/john.chrostek/Projects/lambda-agent/datadog-lambda-extension
+cd "$(dirname "$0")/../.."
 
 # Build and publish for ARM64 with custom layer name
 LAYER_PATH=".layers/datadog_extension-arm64.zip"
@@ -39,8 +39,6 @@ NEW_VERSION=$(aws-vault exec sso-serverless-sandbox-account-admin -- aws lambda
 echo ""
 echo "=========================================="
 echo "DONE: Published version $NEW_VERSION"
-echo "Layer: $LAYER_NAME"
-echo "Region: $REGION"
 echo "=========================================="
 
 # Return to original directory

integration-tests/tests/utils/datadog.ts

@@ -45,12 +45,6 @@ export interface DatadogLog {
   };
 }
 
-export interface DatadogMetric {
-  metric: string;
-  points: Array<[number, number]>;
-  tags: string[];
-}
-
 /**
  * Search for traces in Datadog using the v2 API
  * @param serviceName - Datadog service name
@@ -212,37 +206,4 @@ export async function getLogs(
     console.error('Error searching logs:', error.response?.data || error.message);
     throw error;
   }
-}
-
-/**
- * Query metrics from Datadog
- * @param query - Metrics query (e.g., "avg:aws.lambda.duration{function_name:my-function}")
- * @param from - Start time in seconds since epoch
- * @param to - End time in seconds since epoch
- */
-export async function queryMetrics(
-  serviceName: string,
-): Promise<DatadogMetric[]> {
-  const now = Date.now();
-  const fromTime = now - (15 * 60 * 1000); // 15 minutes ago
-  const toTime = now;
-  try {
-    const response = await datadogClient.post('/api/v2/metrics/query', {
-      params: {
-        data: {
-          type: 'query_request',
-          attributes: {
-            query: `service:${serviceName}`,
-            from: new Date(fromTime).toISOString(),
-            to: new Date(toTime).toISOString(),
-          },
-        },
-      },
-    });
-
-    return response.data.series || [];
-  } catch (error: any) {
-    console.error('Error querying metrics:', error.response?.data || error.message);
-    throw error;
-  }
 }

integration-tests/tests/utils/lambda.ts

@@ -11,10 +11,9 @@ export interface LambdaInvocationResult {
 export async function invokeLambda(
   functionName: string,
   payload: any = {},
-  coldStart: boolean = false,
-  getLogs: boolean = false
+  coldStart: boolean = false
 ): Promise<LambdaInvocationResult> {
-  console.log(`Invoking Lambda: ${functionName}, coldStart: ${coldStart}, getLogs: ${getLogs}, payload: ${JSON.stringify(payload)}`);
+  console.log(`Invoking Lambda: ${functionName}, coldStart: ${coldStart}, payload: ${JSON.stringify(payload)}`);
 
   if (coldStart) {
     console.log('Forcing cold start...');

integration-tests/tests/utils/util.ts

@@ -10,10 +10,10 @@ export interface LambdaInvocationDatadogData {
 }
 
 export async function invokeLambdaAndGetDatadogData(functionName: string, payload: any = {}, coldStart: boolean = false): Promise<LambdaInvocationDatadogData> {
-    const result = await invokeLambda(functionName, payload, coldStart, false);
+    const result = await invokeLambda(functionName, payload, coldStart);
 
     console.log('Waiting 10 minutes for logs and traces to be indexed in Datadog...');
-    await new Promise(resolve => setTimeout(resolve, 300000));
+    await new Promise(resolve => setTimeout(resolve, 600000));
 
     const traces = await getTraces(functionName, result.requestId);
     const logs = await getLogs(functionName, result.requestId);
@@ -27,5 +27,4 @@ export async function invokeLambdaAndGetDatadogData(functionName: string, payloa
     };
 
     return lambdaInvocationData;
-
 }