finally

Author: msonnb

.github/workflows/build.yml

@@ -916,12 +916,6 @@ jobs:
         with:
           use-installer: true
           token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Pull SAM Docker images
-        if: matrix.test-application == 'aws-serverless'
-        run: |
-          docker pull public.ecr.aws/sam/build-nodejs18.x:latest
-          docker pull public.ecr.aws/sam/build-nodejs20.x:latest
-          docker pull public.ecr.aws/sam/build-nodejs22.x:latest
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         with:
@@ -968,6 +962,16 @@ jobs:
           browsers: chromium
           cwd: ${{ runner.temp }}/test-application
 
+      - name: Pull SAM Node 18 image
+        if: matrix.test-application == 'aws-serverless' && contains(matrix.assert-command, 'NODE_VERSION=18')
+        run: |
+          docker pull public.ecr.aws/sam/build-nodejs18.x:latest
+
+      - name: Pull SAM Node 20 image
+        if: matrix.test-application == 'aws-serverless' && contains(matrix.assert-command, 'NODE_VERSION=20')
+        run: |
+          docker pull public.ecr.aws/sam/build-nodejs20.x:latest
+
       - name: Run E2E test
         working-directory: ${{ runner.temp }}/test-application
         timeout-minutes: 10

dev-packages/e2e-tests/test-applications/aws-serverless/playwright.config.ts

@@ -1,5 +1,3 @@
 import { getPlaywrightConfig } from '@sentry-internal/test-utils';
 
-export default getPlaywrightConfig(undefined, {
-  timeout: 100000,
-});
+export default getPlaywrightConfig();

dev-packages/e2e-tests/test-applications/aws-serverless/src/lambda-functions-npm/TracingEsm/index.mjs

@@ -20,5 +20,5 @@ export const handler = Sentry.wrapHandler(async () => {
     req.end();
   });
 
-  Sentry.startSpan({ name: 'manual-span', op: process.version }, () => {});
+  Sentry.startSpan({ name: 'manual-span', op: 'manual' }, () => {});
 });

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

@@ -45,7 +45,6 @@ export const test = base.extend<{ testEnvironment: LocalLambdaStack; lambdaClien
         args.push('--invoke-image', `public.ecr.aws/sam/build-nodejs${process.env.NODE_VERSION}.x:latest`);
       }
 
-      console.log(`[testEnvironment fixture] NODE_VERSION: ${process.env.NODE_VERSION}`);
       console.log(`[testEnvironment fixture] Running SAM with args: ${args.join(' ')}`);
 
       const samProcess = spawn('sam', args, {