test(aws): Run E2E tests in all supported Node versions

Author: msonnb

.github/workflows/build.yml

@@ -965,7 +965,7 @@ jobs:
       - name: Run E2E test
         working-directory: ${{ runner.temp }}/test-application
         timeout-minutes: 10
-        run: pnpm test:assert
+        run: ${{ matrix.assert-command || 'pnpm test:assert' }}
 
       - name: Upload Playwright Traces
         uses: actions/upload-artifact@v4
@@ -1086,7 +1086,7 @@ jobs:
       - name: Run E2E test
         working-directory: ${{ runner.temp }}/test-application
         timeout-minutes: 10
-        run: pnpm ${{ matrix.assert-command || 'test:assert' }}
+        run: ${{ matrix.assert-command || 'pnpm test:assert' }}
 
       - name: Pre-process E2E Test Dumps
         if: failure()

dev-packages/e2e-tests/test-applications/aws-serverless/package.json

@@ -23,5 +23,19 @@
   },
   "volta": {
     "extends": "../../package.json"
+  },
+  "sentryTest": {
+    "variants": [
+      {
+        "build-command": "NODE_VERSION=20 ./pull-sam-image.sh && pnpm test:build",
+        "assert-command": "NODE_VERSION=20 pnpm test:assert",
+        "label": "aws-serverless (Node 20)"
+      },
+      {
+        "build-command": "NODE_VERSION=18 ./pull-sam-image.sh && pnpm test:build",
+        "assert-command": "NODE_VERSION=18 pnpm test:assert",
+        "label": "aws-serverless (Node 18)"
+      }
+    ]
   }
 }

dev-packages/e2e-tests/test-applications/aws-serverless/pull-sam-image.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Script to pull the correct SAM docker image based on the NODE_VERSION environment variable.
+
+set -e
+
+if [[ -z "$NODE_VERSION" ]]; then
+    echo "Error: NODE_VERSION not set"
+    exit 1
+fi
+
+echo "Pulling SAM Node $NODE_VERSION docker image..."
+docker pull --platform linux/amd64 "public.ecr.aws/sam/build-nodejs${NODE_VERSION}.x:latest"
+
+echo "Successfully pulled SAM Node $NODE_VERSION docker image"

dev-packages/e2e-tests/test-applications/aws-serverless/src/stack.ts

@@ -13,7 +13,6 @@ const LAMBDA_FUNCTIONS_WITH_NPM_DIR = './src/lambda-functions-npm';
 const LAMBDA_FUNCTION_TIMEOUT = 10;
 const LAYER_DIR = './node_modules/@sentry/aws-serverless/';
 export const SAM_PORT = 3001;
-const NODE_RUNTIME = `nodejs${process.version.split('.').at(0)?.replace('v', '')}.x`;
 
 export class LocalLambdaStack extends Stack {
   sentryLayer: CfnResource;
@@ -73,22 +72,20 @@ export class LocalLambdaStack extends Stack {
         execFileSync('npm', ['install', '--prefix', path.join(functionsDir, lambdaDir)], { stdio: 'inherit' });
       }
 
-      const isEsm = fs.existsSync(path.join(functionsDir, lambdaDir, 'index.mjs'));
-
       new CfnResource(this, functionName, {
         type: 'AWS::Serverless::Function',
         properties: {
           CodeUri: path.join(functionsDir, lambdaDir),
           Handler: 'index.handler',
-          Runtime: NODE_RUNTIME,
+          Runtime: `nodejs${process.env.NODE_VERSION ?? '22'}.x`,
           Timeout: LAMBDA_FUNCTION_TIMEOUT,
           Layers: addLayer ? [{ Ref: this.sentryLayer.logicalId }] : undefined,
           Environment: {
             Variables: {
               SENTRY_DSN: dsn,
               SENTRY_TRACES_SAMPLE_RATE: 1.0,
               SENTRY_DEBUG: true,
-              NODE_OPTIONS: `--${isEsm ? 'import' : 'require'}=@sentry/aws-serverless/awslambda-auto`,
+              NODE_OPTIONS: `--import=@sentry/aws-serverless/awslambda-auto`,
             },
           },
         },

dev-packages/e2e-tests/test-applications/aws-serverless/tests/lambda-fixtures.ts

@@ -29,23 +29,27 @@ export const test = base.extend<{ testEnvironment: LocalLambdaStack; lambdaClien
       const debugLog = tmp.fileSync({ prefix: 'sentry_aws_lambda_tests_sam_debug', postfix: '.log' });
       console.log(`[test_environment fixture] Writing SAM debug log to: ${debugLog.name}`);
 
-      const process = spawn(
-        'sam',
-        [
-          'local',
-          'start-lambda',
-          '--debug',
-          '--template',
-          SAM_TEMPLATE_FILE,
-          '--warm-containers',
-          'EAGER',
-          '--docker-network',
-          DOCKER_NETWORK_NAME,
-        ],
-        {
-          stdio: ['ignore', debugLog.fd, debugLog.fd],
-        },
-      );
+      const args = [
+        'local',
+        'start-lambda',
+        '--debug',
+        '--template',
+        SAM_TEMPLATE_FILE,
+        '--warm-containers',
+        'EAGER',
+        '--docker-network',
+        DOCKER_NETWORK_NAME,
+      ];
+
+      if (process.env.NODE_VERSION) {
+        args.push('--invoke-image', `public.ecr.aws/sam/build-nodejs${process.env.NODE_VERSION}.x:latest`);
+      }
+
+      console.log(`[testEnvironment fixture] Running SAM with args: ${args.join(' ')}`);
+
+      const samProcess = spawn('sam', args, {
+        stdio: ['ignore', debugLog.fd, debugLog.fd],
+      });
 
       try {
         await LocalLambdaStack.waitForStack();
@@ -54,12 +58,12 @@ export const test = base.extend<{ testEnvironment: LocalLambdaStack; lambdaClien
       } finally {
         console.log('[testEnvironment fixture] Tearing down AWS Lambda test infrastructure');
 
-        process.kill('SIGTERM');
+        samProcess.kill('SIGTERM');
         await new Promise(resolve => {
-          process.once('exit', resolve);
+          samProcess.once('exit', resolve);
           setTimeout(() => {
-            if (!process.killed) {
-              process.kill('SIGKILL');
+            if (!samProcess.killed) {
+              samProcess.kill('SIGKILL');
             }
             resolve(void 0);
           }, 5000);