test(e2e): Enable ESM loader test

fix?

hm

Bump node version

Bump node version

bump ci?

hm

.

.

test(e2e): Re-active & fix node-express-esm-loader test app

Author: mydea

.github/workflows/build.yml

@@ -1003,7 +1003,7 @@ jobs:
             'create-remix-app-express',
             'create-remix-app-express-vite-dev',
             'debug-id-sourcemaps',
-            # 'esm-loader-node-express-app', # This is currently broken for upstream reasons. See https://github.com/getsentry/sentry-javascript/pull/11338#issuecomment-2025450675
+            'node-express-esm-loader',
             'nextjs-app-dir',
             'nextjs-14',
             'react-create-hash-router',

dev-packages/e2e-tests/package.json

@@ -27,7 +27,7 @@
     "yaml": "2.2.2"
   },
   "volta": {
-    "node": "18.18.0",
+    "node": "18.19.1",
     "yarn": "1.22.19",
     "pnpm": "8.15.5"
   }

dev-packages/e2e-tests/test-applications/esm-loader-node-express-app/.npmrc renamed to dev-packages/e2e-tests/test-applications/node-express-esm-loader/.npmrc

@@ -1,25 +1,21 @@
 {
-  "name": "node-express-app",
+  "name": "node-express-esm-loader",
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "start": "node --import=@sentry/node/import-hook src/app.mjs",
+    "start": "node --import ./src/instrument.mjs src/app.mjs",
     "clean": "npx rimraf node_modules,pnpm-lock.yaml",
     "test:build": "pnpm install",
     "test:assert": "playwright test"
   },
   "dependencies": {
     "@sentry/node": "latest || *",
-    "@sentry/types": "latest || *",
-    "express": "4.19.2",
-    "@types/express": "4.17.17",
-    "@types/node": "18.15.1",
-    "typescript": "4.9.5"
+    "@sentry/opentelemetry": "latest || *",
+    "express": "4.19.2"
   },
   "devDependencies": {
     "@sentry-internal/event-proxy-server": "link:../../../event-proxy-server",
-    "@playwright/test": "^1.27.1",
-    "ts-node": "10.9.1"
+    "@playwright/test": "^1.27.1"
   },
   "volta": {
     "extends": "../../package.json",

dev-packages/e2e-tests/test-applications/esm-loader-node-express-app/package.json renamed to dev-packages/e2e-tests/test-applications/node-express-esm-loader/package.json

@@ -53,8 +53,10 @@ const config: PlaywrightTestConfig = {
   /* Run your local dev server before starting the tests */
   webServer: [
     {
-      command: 'pnpm ts-node-script start-event-proxy.ts',
+      command: 'pnpm ts-node-script start-event-proxy.mjs',
       port: eventProxyPort,
+      stdout: 'pipe',
+      stderr: 'pipe',
     },
     {
       command: 'pnpm start',

dev-packages/e2e-tests/test-applications/esm-loader-node-express-app/playwright.config.ts renamed to dev-packages/e2e-tests/test-applications/node-express-esm-loader/playwright.config.ts

@@ -1,13 +1,6 @@
-import * as Sentry from '@sentry/node';
-
-Sentry.init({
-  environment: 'qa', // dynamic sampling bias to keep transactions
-  dsn: process.env.E2E_TEST_DSN,
-  debug: true,
-  tunnel: `http://localhost:3031/`, // proxy server
-  tracesSampleRate: 1,
-});
+// @ts-check
 
+import * as Sentry from '@sentry/node';
 import express from 'express';
 
 const app = express();
@@ -36,7 +29,6 @@ app.get('/test-error', function (req, res) {
 
 Sentry.setupExpressErrorHandler(app);
 
-// @ts-ignore
 app.use(function onError(err, req, res, next) {
   // The error id is attached to `res.sentry` to be returned
   // and optionally displayed to the user for support.

dev-packages/e2e-tests/test-applications/esm-loader-node-express-app/src/app.mjs renamed to dev-packages/e2e-tests/test-applications/node-express-esm-loader/src/app.mjs

@@ -0,0 +1,8 @@
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.E2E_TEST_DSN,
+  tunnel: `http://localhost:3031/`, // proxy server
+  tracesSampleRate: 1,
+});

dev-packages/e2e-tests/test-applications/node-express-esm-loader/src/instrument.mjs

@@ -2,5 +2,5 @@ import { startEventProxyServer } from '@sentry-internal/event-proxy-server';
 
 startEventProxyServer({
   port: 3031,
-  proxyServerName: 'esm-loader-node-express-app',
+  proxyServerName: 'node-express-esm-loader',
 });

dev-packages/e2e-tests/test-applications/esm-loader-node-express-app/start-event-proxy.ts renamed to dev-packages/e2e-tests/test-applications/node-express-esm-loader/start-event-proxy.mjs

@@ -2,7 +2,7 @@ import { expect, test } from '@playwright/test';
 import { waitForError, waitForTransaction } from '@sentry-internal/event-proxy-server';
 
 test('Should record exceptions captured inside handlers', async ({ request }) => {
-  const errorEventPromise = waitForError('esm-loader-node-express-app', errorEvent => {
+  const errorEventPromise = waitForError('node-express-esm-loader', errorEvent => {
     return !!errorEvent?.exception?.values?.[0]?.value?.includes('This is an error');
   });
 
@@ -12,8 +12,7 @@ test('Should record exceptions captured inside handlers', async ({ request }) =>
 });
 
 test('Should record a transaction for a parameterless route', async ({ request }) => {
-  const transactionEventPromise = waitForTransaction('esm-loader-node-express-app', transactionEvent => {
-    console.log('txn', transactionEvent.transaction);
+  const transactionEventPromise = waitForTransaction('node-express-esm-loader', transactionEvent => {
     return transactionEvent?.transaction === 'GET /test-success';
   });
 
@@ -22,9 +21,9 @@ test('Should record a transaction for a parameterless route', async ({ request }
   await expect(transactionEventPromise).resolves.toBeDefined();
 });
 
-test('Should record a transaction for route with aparameters', async ({ request }) => {
-  const transactionEventPromise = waitForTransaction('esm-loader-node-express-app', transactionEvent => {
-    return transactionEvent?.transaction === 'GET /test-transaction/:param';
+test('Should record a transaction for route with parameters', async ({ request }) => {
+  const transactionEventPromise = waitForTransaction('node-express-esm-loader', transactionEvent => {
+    return transactionEvent?.transaction === 'GET /test-transaction/1';
   });
 
   await request.get('/test-transaction/1');

dev-packages/e2e-tests/test-applications/esm-loader-node-express-app/tests/server.test.ts renamed to dev-packages/e2e-tests/test-applications/node-express-esm-loader/tests/server.test.ts

@@ -34,6 +34,7 @@
     "fix": "eslint . --format stylish --fix",
     "lint": "eslint . --format stylish",
     "build": "run-s build:transpile build:types",
+    "build:tarball": "run-s build:transpile build:types",
     "build:dev": "yarn build",
     "build:transpile": "rollup -c rollup.npm.config.mjs",
     "build:types": "tsc -p tsconfig.types.json",