update

Author: jchrostek-dd

.gitlab/templates/pipeline.yaml.tpl

@@ -414,25 +414,61 @@ integration-test:
     expire_in: 30 days
 
 # Integration Tests - Cleanup stacks
-# integration-cleanup-stacks:
-#   stage: integration-tests
-#   tags: ["arch:amd64"]
-#   image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
-#   when: always
-#   rules:
-#     - when: always
-#   needs:
-#     - integration-test
-#   variables:
-#     IDENTIFIER: integration
-#   {{ with $environment := (ds "environments").environments.sandbox }}
-#   before_script:
-#     - EXTERNAL_ID_NAME={{ $environment.external_id }} ROLE_TO_ASSUME={{ $environment.role_to_assume }} AWS_ACCOUNT={{ $environment.account }} source .gitlab/scripts/get_secrets.sh
-#     - curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
-#     - apt-get install -y nodejs
-#     - cd integration-tests
-#   {{ end }}
-#   script:
-#     - echo "Destroying CDK stacks with identifier ${IDENTIFIER}..."
-#     - npx cdk destroy "IntegrationTests-$IDENTIFIER-*" --force || echo "Failed to destroy some stacks, but continuing..."
+integration-cleanup-stacks:
+  stage: integration-tests
+  tags: ["arch:amd64"]
+  image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
+  when: always
+  rules:
+    - when: always
+  needs:
+    - integration-test
+  variables:
+    IDENTIFIER: ${CI_COMMIT_SHORT_SHA}
+  {{ with $environment := (ds "environments").environments.sandbox }}
+  before_script:
+    - EXTERNAL_ID_NAME={{ $environment.external_id }} ROLE_TO_ASSUME={{ $environment.role_to_assume }} AWS_ACCOUNT={{ $environment.account }} source .gitlab/scripts/get_secrets.sh
+    - curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
+    - apt-get install -y nodejs
+    - cd integration-tests
+  {{ end }}
+  script:
+    - echo "Destroying CDK stacks with identifier ${IDENTIFIER}..."
+    - npx cdk destroy "integ-$IDENTIFIER-*" --force || echo "Failed to destroy some stacks, but continuing..."
+
+# Integration Tests - Cleanup layer
+integration-cleanup-layer:
+  stage: integration-tests
+  tags: ["arch:amd64"]
+  image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
+  when: always
+  rules:
+    - when: always
+  needs:
+    - integration-cleanup-stacks
+  variables:
+    IDENTIFIER: ${CI_COMMIT_SHORT_SHA}
+  {{ with $environment := (ds "environments").environments.sandbox }}
+  before_script:
+    - EXTERNAL_ID_NAME={{ $environment.external_id }} ROLE_TO_ASSUME={{ $environment.role_to_assume }} AWS_ACCOUNT={{ $environment.account }} source .gitlab/scripts/get_secrets.sh
+  {{ end }}
+  script:
+    - echo "Deleting integration test layer with identifier ${IDENTIFIER}..."
+    - |
+      LAYER_NAME="Datadog-Extension-${IDENTIFIER}"
+      echo "Looking for layer: ${LAYER_NAME}"
+
+      # Get all versions of the layer
+      VERSIONS=$(aws lambda list-layer-versions --layer-name "${LAYER_NAME}" --query 'LayerVersions[*].Version' --output text --region us-east-1 2>/dev/null || echo "")
+
+      if [ -z "$VERSIONS" ]; then
+        echo "No versions found for layer ${LAYER_NAME}"
+      else
+        echo "Found versions: ${VERSIONS}"
+        for VERSION in $VERSIONS; do
+          echo "Deleting ${LAYER_NAME} version ${VERSION}..."
+          aws lambda delete-layer-version --layer-name "${LAYER_NAME}" --version-number "${VERSION}" --region us-east-1 || echo "Failed to delete version ${VERSION}, continuing..."
+        done
+        echo "Successfully deleted all versions of ${LAYER_NAME}"
+      fi
 

integration-tests/lib/util.ts

@@ -21,7 +21,7 @@ export const datadogEnvVariables = {
     DD_VERSION: '1.0.0',
     DD_SERVERLESS_FLUSH_STRATEGY: 'end',
     DD_SERVERLESS_LOGS_ENABLED: 'true',
-    DD_LOG_LEVEL: 'debug',
+    DD_LOG_LEVEL: 'info',
   };
 
 export const secretPolicy = new iam.PolicyStatement({

integration-tests/tests/base.test.ts

@@ -15,22 +15,17 @@ describe('Example Lambda Integration Test', () => {
 
     // Step 3: Verify logs were sent to Datadog and contain the expected content
     const logs = result.logs;
-    console.log('Logs:', JSON.stringify(logs, null, 2));
-
     expect(logs?.length).toBeGreaterThanOrEqual(1);
     expect(logs?.some((log: any) => log.attributes.message.includes('Hello world!'))).toBe(true);
 
     // Step 4: Verify traces were sent to Datadog and contain the expected content
     const traces = result.traces;
-
-    // Assertions for traces
     expect(traces?.length).toBe(1);
 
     const trace = traces![0];
     const spanNames = trace.spans.map((span: any) => span.name);
     console.log('Span names:', spanNames);
 
-    // Should contain 'aws.lambda.cold_start' and 'aws.lambda' spans
     expect(spanNames).toContain('aws.lambda.cold_start');
     expect(spanNames).toContain('aws.lambda.load');
     expect(spanNames).toContain('aws.lambda');

integration-tests/tests/utils/datadog.ts

@@ -186,8 +186,6 @@ export async function getLogs(
   const fromTime = now - (2 * 60 * 60 * 1000); // 2 hours ago
   const toTime = now;
   try {
-    // NOTE: Logs use the original service name casing, unlike traces which use lowercase
-    // Build query with service name and optional request ID
     let query = `service:${serviceName}`;
     if (requestId) {
       query += ` ${requestId}`;
@@ -247,43 +245,4 @@ export async function queryMetrics(
     console.error('Error querying metrics:', error.response?.data || error.message);
     throw error;
   }
-}
-
-/**
- * Wait for data to appear in Datadog with retries
- */
-export async function waitForData<T>(
-  fetchFn: () => Promise<T[]>,
-  options: {
-    timeout?: number;
-    interval?: number;
-    minCount?: number;
-  } = {}
-): Promise<T[]> {
-  const timeout = options.timeout || 180000; // 3 minutes default
-  const interval = options.interval || 10000; // 10 seconds default
-  const minCount = options.minCount || 1;
-
-  const startTime = Date.now();
-  let attempts = 0;
-
-  while (Date.now() - startTime < timeout) {
-    attempts++;
-    console.log(`Attempt ${attempts}: Checking for data in Datadog...`);
-
-    try {
-      const data = await fetchFn();
-      if (data.length >= minCount) {
-        console.log(`Found ${data.length} items in Datadog`);
-        return data;
-      }
-      console.log(`Found ${data.length} items, waiting for at least ${minCount}...`);
-    } catch (error) {
-      console.log(`Error fetching data (attempt ${attempts}):`, error);
-    }
-
-    await new Promise(resolve => setTimeout(resolve, interval));
-  }
-
-  throw new Error(`Timeout waiting for data in Datadog after ${timeout}ms`);
-}
+}