try this

Author: msonnb

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;
@@ -80,7 +79,7 @@ export class LocalLambdaStack extends Stack {
         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: {

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

@@ -16,8 +16,6 @@ export const test = base.extend<{ testEnvironment: LocalLambdaStack; lambdaClien
     async ({}, use) => {
       console.log('[testEnvironment fixture] Setting up AWS Lambda test infrastructure');
 
-      console.log('NODE_VERSION', process.env.NODE_VERSION);
-
       execSync('docker network prune -f');
       execSync(`docker network create --driver bridge ${DOCKER_NETWORK_NAME}`);
 
@@ -31,25 +29,23 @@ 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 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`);
-      }
-
-      const samProcess = spawn('sam', args, {
-        stdio: ['ignore', debugLog.fd, debugLog.fd],
-      });
+      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],
+        },
+      );
 
       try {
         await LocalLambdaStack.waitForStack();
@@ -58,12 +54,12 @@ export const test = base.extend<{ testEnvironment: LocalLambdaStack; lambdaClien
       } finally {
         console.log('[testEnvironment fixture] Tearing down AWS Lambda test infrastructure');
 
-        samProcess.kill('SIGTERM');
+        process.kill('SIGTERM');
         await new Promise(resolve => {
-          samProcess.once('exit', resolve);
+          process.once('exit', resolve);
           setTimeout(() => {
-            if (!samProcess.killed) {
-              samProcess.kill('SIGKILL');
+            if (!process.killed) {
+              process.kill('SIGKILL');
             }
             resolve(void 0);
           }, 5000);