wip

Author: msonnb

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

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

dev-packages/e2e-tests/test-applications/aws-serverless/src/lambda-functions-layer/TracingCjs/index.js

@@ -2,11 +2,13 @@ const Sentry = require('@sentry/aws-serverless');
 const http = require('http');
 
 exports.handler = async (event, context) => {
+  console.log(process.version);
+  console.log('PROCESS VERSION');
   await Sentry.startSpan({ name: 'manual-span', op: 'test' }, async () => {
     await new Promise(resolve => {
       http.get('http://example.com', res => {
         res.on('data', d => {
-          process.stdout.write(d);
+          process.stdout.write(process.version);
         });
 
         res.on('end', () => {

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: 'manual' }, () => {});
+  Sentry.startSpan({ name: 'manual-span', op: process.version }, () => {});
 });

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

@@ -16,6 +16,8 @@ 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}`);
 
@@ -29,23 +31,25 @@ 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`);
+      }
+
+      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);

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

@@ -40,6 +40,8 @@ test.describe('Lambda layer', () => {
 
     expect(transactionEvent.spans).toHaveLength(2);
 
+    console.log(transactionEvent.spans);
+
     // shows that the Otel Http instrumentation is working
     expect(transactionEvent.spans).toContainEqual(
       expect.objectContaining({