test: Streamline E2E test app names

No need to have the `-app` suffix there.

Author: mydea

.github/workflows/build.yml

@@ -993,7 +993,7 @@ jobs:
           [
             'angular-17',
             'cloudflare-astro',
-            'node-express-app',
+            'node-express',
             'create-react-app',
             'create-next-app',
             'create-remix-app',
@@ -1012,13 +1012,12 @@ jobs:
             'sveltekit-2',
             'sveltekit-2-svelte-5',
             'generic-ts3.8',
-            'node-fastify-app',
-            # TODO(v8): Re-enable hapi tests
-            # 'node-hapi-app',
-            'node-nestjs-app',
+            'node-fastify',
+            'node-hapi',
+            'node-nestjs',
             'node-exports-test-app',
-            'node-koa-app',
-            'node-connect-app',
+            'node-koa',
+            'node-connect',
             'vue-3',
             'webpack-4',
             'webpack-5'

dev-packages/e2e-tests/test-applications/node-connect-app/start-event-proxy.ts

@@ -1,5 +1,5 @@
 {
-  "name": "node-connect-app",
+  "name": "node-connect",
   "version": "1.0.0",
   "private": true,
   "scripts": {

dev-packages/e2e-tests/test-applications/node-connect-app/.npmrc renamed to dev-packages/e2e-tests/test-applications/node-connect/.npmrc

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

dev-packages/e2e-tests/test-applications/node-connect-app/package.json renamed to dev-packages/e2e-tests/test-applications/node-connect/package.json

@@ -40,7 +40,7 @@ test('Sends exception to Sentry', async ({ baseURL }) => {
 });
 
 test('Sends correct error event', async ({ baseURL }) => {
-  const errorEventPromise = waitForError('node-connect-app', event => {
+  const errorEventPromise = waitForError('node-connect', event => {
     return !event.type && event.exception?.values?.[0]?.value === 'This is an exception';
   });
 

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

@@ -8,7 +8,7 @@ const sentryTestProject = process.env.E2E_TEST_SENTRY_TEST_PROJECT;
 const EVENT_POLLING_TIMEOUT = 90_000;
 
 test('Sends an API route transaction', async ({ baseURL }) => {
-  const pageloadTransactionEventPromise = waitForTransaction('node-connect-app', transactionEvent => {
+  const pageloadTransactionEventPromise = waitForTransaction('node-connect', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent?.transaction === 'GET /test-transaction'

dev-packages/e2e-tests/test-applications/node-connect-app/src/app.ts renamed to dev-packages/e2e-tests/test-applications/node-connect/src/app.ts

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

dev-packages/e2e-tests/test-applications/node-koa-app/start-event-proxy.ts renamed to dev-packages/e2e-tests/test-applications/node-connect/start-event-proxy.ts

@@ -40,7 +40,7 @@ test('Sends exception to Sentry', async ({ baseURL }) => {
 });
 
 test('Sends correct error event', async ({ baseURL }) => {
-  const errorEventPromise = waitForError('node-express-app', event => {
+  const errorEventPromise = waitForError('node-express', event => {
     return !event.type && event.exception?.values?.[0]?.value === 'This is an exception with id 123';
   });
 
@@ -109,7 +109,7 @@ test('Should record caught exceptions with local variable', async ({ baseURL })
 });
 
 test('Should record uncaught exceptions with local variable', async ({ baseURL }) => {
-  const errorEventPromise = waitForError('node-express-app', errorEvent => {
+  const errorEventPromise = waitForError('node-express', errorEvent => {
     return !!errorEvent?.exception?.values?.[0]?.value?.includes('Uncaught Local Variable Error');
   });
 

dev-packages/e2e-tests/test-applications/node-connect-app/tests/errors.test.ts renamed to dev-packages/e2e-tests/test-applications/node-connect/tests/errors.test.ts

@@ -4,7 +4,7 @@ import { createTRPCProxyClient, httpBatchLink } from '@trpc/client';
 import type { AppRouter } from '../src/app';
 
 test('Should record span for trpc query', async ({ baseURL }) => {
-  const transactionEventPromise = waitForTransaction('node-express-app', transactionEvent => {
+  const transactionEventPromise = waitForTransaction('node-express', transactionEvent => {
     return (
       transactionEvent.transaction === 'GET /trpc' &&
       !!transactionEvent.spans?.find(span => span.description === 'trpc/getSomething')
@@ -41,7 +41,7 @@ test('Should record span for trpc query', async ({ baseURL }) => {
 });
 
 test('Should record transaction for trpc mutation', async ({ baseURL }) => {
-  const transactionEventPromise = waitForTransaction('node-express-app', transactionEvent => {
+  const transactionEventPromise = waitForTransaction('node-express', transactionEvent => {
     return (
       transactionEvent.transaction === 'POST /trpc' &&
       !!transactionEvent.spans?.find(span => span.description === 'trpc/createSomething')
@@ -77,14 +77,14 @@ test('Should record transaction for trpc mutation', async ({ baseURL }) => {
 });
 
 test('Should record transaction and error for a crashing trpc handler', async ({ baseURL }) => {
-  const transactionEventPromise = waitForTransaction('node-express-app', transactionEvent => {
+  const transactionEventPromise = waitForTransaction('node-express', transactionEvent => {
     return (
       transactionEvent.transaction === 'POST /trpc' &&
       !!transactionEvent.spans?.find(span => span.description === 'trpc/crashSomething')
     );
   });
 
-  const errorEventPromise = waitForError('node-express-app', errorEvent => {
+  const errorEventPromise = waitForError('node-express', errorEvent => {
     return !!errorEvent?.exception?.values?.some(exception => exception.value?.includes('I crashed in a trpc handler'));
   });
 
@@ -103,14 +103,14 @@ test('Should record transaction and error for a crashing trpc handler', async ({
 });
 
 test('Should record transaction and error for a trpc handler that returns a status code', async ({ baseURL }) => {
-  const transactionEventPromise = waitForTransaction('node-express-app', transactionEvent => {
+  const transactionEventPromise = waitForTransaction('node-express', transactionEvent => {
     return (
       transactionEvent.transaction === 'POST /trpc' &&
       !!transactionEvent.spans?.find(span => span.description === 'trpc/dontFindSomething')
     );
   });
 
-  const errorEventPromise = waitForError('node-express-app', errorEvent => {
+  const errorEventPromise = waitForError('node-express', errorEvent => {
     return !!errorEvent?.exception?.values?.some(exception => exception.value?.includes('Page not found'));
   });
 

dev-packages/e2e-tests/test-applications/node-connect-app/tests/transactions.test.ts renamed to dev-packages/e2e-tests/test-applications/node-connect/tests/transactions.test.ts

@@ -1,5 +1,5 @@
 {
-  "name": "node-fastify-app",
+  "name": "node-fastify",
   "version": "1.0.0",
   "private": true,
   "scripts": {

dev-packages/e2e-tests/test-applications/node-connect-app/tsconfig.json renamed to dev-packages/e2e-tests/test-applications/node-connect/tsconfig.json

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

dev-packages/e2e-tests/test-applications/node-express-app/start-event-proxy.ts

@@ -40,7 +40,7 @@ test('Sends exception to Sentry', async ({ baseURL }) => {
 });
 
 test('Sends correct error event', async ({ baseURL }) => {
-  const errorEventPromise = waitForError('node-koa-app', event => {
+  const errorEventPromise = waitForError('node-fastify', event => {
     return !event.type && event.exception?.values?.[0]?.value === 'This is an exception with id 123';
   });
 

dev-packages/e2e-tests/test-applications/node-express-app/.gitignore renamed to dev-packages/e2e-tests/test-applications/node-express/.gitignore

@@ -7,14 +7,14 @@ import axios from 'axios';
 test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
   const id = crypto.randomUUID();
 
-  const inboundTransactionPromise = waitForTransaction('node-fastify-app', transactionEvent => {
+  const inboundTransactionPromise = waitForTransaction('node-fastify', transactionEvent => {
     return (
       transactionEvent.contexts?.trace?.op === 'http.server' &&
       transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-inbound-headers/${id}`
     );
   });
 
-  const outboundTransactionPromise = waitForTransaction('node-fastify-app', transactionEvent => {
+  const outboundTransactionPromise = waitForTransaction('node-fastify', transactionEvent => {
     return (
       transactionEvent.contexts?.trace?.op === 'http.server' &&
       transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-outgoing-http/${id}`
@@ -121,14 +121,14 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
 test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
   const id = crypto.randomUUID();
 
-  const inboundTransactionPromise = waitForTransaction('node-fastify-app', transactionEvent => {
+  const inboundTransactionPromise = waitForTransaction('node-fastify', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-inbound-headers/${id}`
     );
   });
 
-  const outboundTransactionPromise = waitForTransaction('node-fastify-app', transactionEvent => {
+  const outboundTransactionPromise = waitForTransaction('node-fastify', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-outgoing-fetch/${id}`
@@ -233,7 +233,7 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
 });
 
 test('Propagates trace for outgoing external http requests', async ({ baseURL }) => {
-  const inboundTransactionPromise = waitForTransaction('node-fastify-app', transactionEvent => {
+  const inboundTransactionPromise = waitForTransaction('node-fastify', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-outgoing-http-external-allowed`
@@ -269,7 +269,7 @@ test('Propagates trace for outgoing external http requests', async ({ baseURL })
 });
 
 test('Does not propagate outgoing http requests not covered by tracePropagationTargets', async ({ baseURL }) => {
-  const inboundTransactionPromise = waitForTransaction('node-fastify-app', transactionEvent => {
+  const inboundTransactionPromise = waitForTransaction('node-fastify', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-outgoing-http-external-disallowed`
@@ -292,7 +292,7 @@ test('Does not propagate outgoing http requests not covered by tracePropagationT
 });
 
 test('Propagates trace for outgoing external fetch requests', async ({ baseURL }) => {
-  const inboundTransactionPromise = waitForTransaction('node-fastify-app', transactionEvent => {
+  const inboundTransactionPromise = waitForTransaction('node-fastify', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-outgoing-fetch-external-allowed`
@@ -328,7 +328,7 @@ test('Propagates trace for outgoing external fetch requests', async ({ baseURL }
 });
 
 test('Does not propagate outgoing fetch requests not covered by tracePropagationTargets', async ({ baseURL }) => {
-  const inboundTransactionPromise = waitForTransaction('node-fastify-app', transactionEvent => {
+  const inboundTransactionPromise = waitForTransaction('node-fastify', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-outgoing-fetch-external-disallowed`

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

@@ -8,7 +8,7 @@ const sentryTestProject = process.env.E2E_TEST_SENTRY_TEST_PROJECT;
 const EVENT_POLLING_TIMEOUT = 90_000;
 
 test('Sends an API route transaction', async ({ baseURL }) => {
-  const pageloadTransactionEventPromise = waitForTransaction('node-fastify-app', transactionEvent => {
+  const pageloadTransactionEventPromise = waitForTransaction('node-fastify', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent?.transaction === 'GET /test-transaction'

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

@@ -1,5 +1,5 @@
 {
-  "name": "node-hapi-app",
+  "name": "node-hapi",
   "version": "1.0.0",
   "private": true,
   "scripts": {

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

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

dev-packages/e2e-tests/test-applications/node-express-app/src/app.ts renamed to dev-packages/e2e-tests/test-applications/node-express/src/app.ts

@@ -40,7 +40,7 @@ test('Sends captured exception to Sentry', async ({ baseURL }) => {
 });
 
 test('Sends thrown error to Sentry', async ({ baseURL }) => {
-  const errorEventPromise = waitForError('node-hapi-app', errorEvent => {
+  const errorEventPromise = waitForError('node-hapi', errorEvent => {
     return errorEvent?.exception?.values?.[0]?.value === 'This is an error';
   });
 
@@ -81,7 +81,7 @@ test('Sends thrown error to Sentry', async ({ baseURL }) => {
 });
 
 test('Sends successful transactions to Sentry', async ({ baseURL }) => {
-  const pageloadTransactionEventPromise = waitForTransaction('node-hapi-app', transactionEvent => {
+  const pageloadTransactionEventPromise = waitForTransaction('node-hapi', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'hapi.request' && transactionEvent?.transaction === '/test-success'
     );
@@ -122,7 +122,7 @@ test('Sends successful transactions to Sentry', async ({ baseURL }) => {
 });
 
 test('sends error with parameterized transaction name', async ({ baseURL }) => {
-  const errorEventPromise = waitForError('node-hapi-app', errorEvent => {
+  const errorEventPromise = waitForError('node-hapi', errorEvent => {
     return errorEvent?.exception?.values?.[0]?.value === 'This is an error with id 123';
   });
 
@@ -136,7 +136,7 @@ test('sends error with parameterized transaction name', async ({ baseURL }) => {
 });
 
 test('Sends parameterized transactions to Sentry', async ({ baseURL }) => {
-  const pageloadTransactionEventPromise = waitForTransaction('node-hapi-app', transactionEvent => {
+  const pageloadTransactionEventPromise = waitForTransaction('node-hapi', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'hapi.request' &&
       transactionEvent?.transaction === '/test-param/{param}'

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

@@ -1,5 +1,5 @@
 {
-  "name": "node-koa-app",
+  "name": "node-koa",
   "version": "1.0.0",
   "private": true,
   "scripts": {

dev-packages/e2e-tests/test-applications/node-express-app/tests/error.test.ts renamed to dev-packages/e2e-tests/test-applications/node-express/tests/error.test.ts

@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/event-proxy-server';
+
+startEventProxyServer({
+  port: 3031,
+  proxyServerName: 'node-koa',
+});

dev-packages/e2e-tests/test-applications/node-express-app/tests/transaction.test.ts renamed to dev-packages/e2e-tests/test-applications/node-express/tests/transaction.test.ts

@@ -40,7 +40,7 @@ test('Sends exception to Sentry', async ({ baseURL }) => {
 });
 
 test('Sends correct error event', async ({ baseURL }) => {
-  const errorEventPromise = waitForError('node-fastify-app', event => {
+  const errorEventPromise = waitForError('node-koa', event => {
     return !event.type && event.exception?.values?.[0]?.value === 'This is an exception with id 123';
   });
 

dev-packages/e2e-tests/test-applications/node-express-app/tests/trpc.test.ts renamed to dev-packages/e2e-tests/test-applications/node-express/tests/trpc.test.ts

@@ -7,14 +7,14 @@ import axios from 'axios';
 test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
   const id = crypto.randomUUID();
 
-  const inboundTransactionPromise = waitForTransaction('node-koa-app', transactionEvent => {
+  const inboundTransactionPromise = waitForTransaction('node-koa', transactionEvent => {
     return (
       transactionEvent.contexts?.trace?.op === 'http.server' &&
       transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-inbound-headers/${id}`
     );
   });
 
-  const outboundTransactionPromise = waitForTransaction('node-koa-app', transactionEvent => {
+  const outboundTransactionPromise = waitForTransaction('node-koa', transactionEvent => {
     return (
       transactionEvent.contexts?.trace?.op === 'http.server' &&
       transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-outgoing-http/${id}`
@@ -121,14 +121,14 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
 test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
   const id = crypto.randomUUID();
 
-  const inboundTransactionPromise = waitForTransaction('node-koa-app', transactionEvent => {
+  const inboundTransactionPromise = waitForTransaction('node-koa', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-inbound-headers/${id}`
     );
   });
 
-  const outboundTransactionPromise = waitForTransaction('node-koa-app', transactionEvent => {
+  const outboundTransactionPromise = waitForTransaction('node-koa', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-outgoing-fetch/${id}`
@@ -233,7 +233,7 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
 });
 
 test('Propagates trace for outgoing external http requests', async ({ baseURL }) => {
-  const inboundTransactionPromise = waitForTransaction('node-koa-app', transactionEvent => {
+  const inboundTransactionPromise = waitForTransaction('node-koa', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-outgoing-http-external-allowed`
@@ -269,7 +269,7 @@ test('Propagates trace for outgoing external http requests', async ({ baseURL })
 });
 
 test('Does not propagate outgoing http requests not covered by tracePropagationTargets', async ({ baseURL }) => {
-  const inboundTransactionPromise = waitForTransaction('node-koa-app', transactionEvent => {
+  const inboundTransactionPromise = waitForTransaction('node-koa', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-outgoing-http-external-disallowed`
@@ -292,7 +292,7 @@ test('Does not propagate outgoing http requests not covered by tracePropagationT
 });
 
 test('Propagates trace for outgoing external fetch requests', async ({ baseURL }) => {
-  const inboundTransactionPromise = waitForTransaction('node-koa-app', transactionEvent => {
+  const inboundTransactionPromise = waitForTransaction('node-koa', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-outgoing-fetch-external-allowed`
@@ -328,7 +328,7 @@ test('Propagates trace for outgoing external fetch requests', async ({ baseURL }
 });
 
 test('Does not propagate outgoing fetch requests not covered by tracePropagationTargets', async ({ baseURL }) => {
-  const inboundTransactionPromise = waitForTransaction('node-koa-app', transactionEvent => {
+  const inboundTransactionPromise = waitForTransaction('node-koa', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-outgoing-fetch-external-disallowed`