diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 99ca517863ac..01f9ab5584f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -995,7 +995,7 @@ jobs: [ 'angular-17', 'cloudflare-astro', - 'node-express-app', + 'node-express', 'create-react-app', 'create-next-app', 'create-remix-app', @@ -1015,13 +1015,12 @@ jobs: 'sveltekit-2', 'sveltekit-2-svelte-5', 'generic-ts3.8', - 'node-fastify-app', - # TODO(v8): Re-enable hapi tests + 'node-fastify', 'node-hapi', - 'node-nestjs-app', + 'node-nestjs', 'node-exports-test-app', - 'node-koa-app', - 'node-connect-app', + 'node-koa', + 'node-connect', 'vue-3', 'webpack-4', 'webpack-5' diff --git a/dev-packages/e2e-tests/test-applications/node-connect-app/.npmrc b/dev-packages/e2e-tests/test-applications/node-connect/.npmrc similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-connect-app/.npmrc rename to dev-packages/e2e-tests/test-applications/node-connect/.npmrc diff --git a/dev-packages/e2e-tests/test-applications/node-connect-app/package.json b/dev-packages/e2e-tests/test-applications/node-connect/package.json similarity index 96% rename from dev-packages/e2e-tests/test-applications/node-connect-app/package.json rename to dev-packages/e2e-tests/test-applications/node-connect/package.json index ad93a513eca8..24ecbcea1b02 100644 --- a/dev-packages/e2e-tests/test-applications/node-connect-app/package.json +++ b/dev-packages/e2e-tests/test-applications/node-connect/package.json @@ -1,5 +1,5 @@ { - "name": "node-connect-app", + "name": "node-connect", "version": "1.0.0", "private": true, "scripts": { diff --git a/dev-packages/e2e-tests/test-applications/node-connect-app/playwright.config.ts b/dev-packages/e2e-tests/test-applications/node-connect/playwright.config.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-connect-app/playwright.config.ts rename to dev-packages/e2e-tests/test-applications/node-connect/playwright.config.ts diff --git a/dev-packages/e2e-tests/test-applications/node-connect-app/src/app.ts b/dev-packages/e2e-tests/test-applications/node-connect/src/app.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-connect-app/src/app.ts rename to dev-packages/e2e-tests/test-applications/node-connect/src/app.ts diff --git a/dev-packages/e2e-tests/test-applications/node-koa-app/start-event-proxy.ts b/dev-packages/e2e-tests/test-applications/node-connect/start-event-proxy.ts similarity index 77% rename from dev-packages/e2e-tests/test-applications/node-koa-app/start-event-proxy.ts rename to dev-packages/e2e-tests/test-applications/node-connect/start-event-proxy.ts index 65eda84d3f8a..cac2f8db1f82 100644 --- a/dev-packages/e2e-tests/test-applications/node-koa-app/start-event-proxy.ts +++ b/dev-packages/e2e-tests/test-applications/node-connect/start-event-proxy.ts @@ -2,5 +2,5 @@ import { startEventProxyServer } from '@sentry-internal/event-proxy-server'; startEventProxyServer({ port: 3031, - proxyServerName: 'node-koa-app', + proxyServerName: 'node-connect', }); diff --git a/dev-packages/e2e-tests/test-applications/node-connect-app/tests/errors.test.ts b/dev-packages/e2e-tests/test-applications/node-connect/tests/errors.test.ts similarity index 96% rename from dev-packages/e2e-tests/test-applications/node-connect-app/tests/errors.test.ts rename to dev-packages/e2e-tests/test-applications/node-connect/tests/errors.test.ts index 68ba042612d9..c83fa1b38889 100644 --- a/dev-packages/e2e-tests/test-applications/node-connect-app/tests/errors.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-connect/tests/errors.test.ts @@ -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'; }); diff --git a/dev-packages/e2e-tests/test-applications/node-connect-app/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-connect/tests/transactions.test.ts similarity index 99% rename from dev-packages/e2e-tests/test-applications/node-connect-app/tests/transactions.test.ts rename to dev-packages/e2e-tests/test-applications/node-connect/tests/transactions.test.ts index f42c417371c6..4a9548015422 100644 --- a/dev-packages/e2e-tests/test-applications/node-connect-app/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-connect/tests/transactions.test.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' diff --git a/dev-packages/e2e-tests/test-applications/node-connect-app/tsconfig.json b/dev-packages/e2e-tests/test-applications/node-connect/tsconfig.json similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-connect-app/tsconfig.json rename to dev-packages/e2e-tests/test-applications/node-connect/tsconfig.json diff --git a/dev-packages/e2e-tests/test-applications/node-express-app/start-event-proxy.ts b/dev-packages/e2e-tests/test-applications/node-express-app/start-event-proxy.ts deleted file mode 100644 index 369041a9c792..000000000000 --- a/dev-packages/e2e-tests/test-applications/node-express-app/start-event-proxy.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { startEventProxyServer } from '@sentry-internal/event-proxy-server'; - -startEventProxyServer({ - port: 3031, - proxyServerName: 'node-express-app', -}); diff --git a/dev-packages/e2e-tests/test-applications/node-express-app/.gitignore b/dev-packages/e2e-tests/test-applications/node-express/.gitignore similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-express-app/.gitignore rename to dev-packages/e2e-tests/test-applications/node-express/.gitignore diff --git a/dev-packages/e2e-tests/test-applications/node-express-app/.npmrc b/dev-packages/e2e-tests/test-applications/node-express/.npmrc similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-express-app/.npmrc rename to dev-packages/e2e-tests/test-applications/node-express/.npmrc diff --git a/dev-packages/e2e-tests/test-applications/node-express-app/package.json b/dev-packages/e2e-tests/test-applications/node-express/package.json similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-express-app/package.json rename to dev-packages/e2e-tests/test-applications/node-express/package.json diff --git a/dev-packages/e2e-tests/test-applications/node-express-app/playwright.config.ts b/dev-packages/e2e-tests/test-applications/node-express/playwright.config.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-express-app/playwright.config.ts rename to dev-packages/e2e-tests/test-applications/node-express/playwright.config.ts diff --git a/dev-packages/e2e-tests/test-applications/node-express-app/src/app.ts b/dev-packages/e2e-tests/test-applications/node-express/src/app.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-express-app/src/app.ts rename to dev-packages/e2e-tests/test-applications/node-express/src/app.ts diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-app/start-event-proxy.ts b/dev-packages/e2e-tests/test-applications/node-express/start-event-proxy.ts similarity index 75% rename from dev-packages/e2e-tests/test-applications/node-nestjs-app/start-event-proxy.ts rename to dev-packages/e2e-tests/test-applications/node-express/start-event-proxy.ts index 9f99b9ac5d23..a31586dd09fc 100644 --- a/dev-packages/e2e-tests/test-applications/node-nestjs-app/start-event-proxy.ts +++ b/dev-packages/e2e-tests/test-applications/node-express/start-event-proxy.ts @@ -2,5 +2,5 @@ import { startEventProxyServer } from '@sentry-internal/event-proxy-server'; startEventProxyServer({ port: 3031, - proxyServerName: 'node-nestjs-app', + proxyServerName: 'node-express', }); diff --git a/dev-packages/e2e-tests/test-applications/node-express-app/tests/error.test.ts b/dev-packages/e2e-tests/test-applications/node-express/tests/error.test.ts similarity index 96% rename from dev-packages/e2e-tests/test-applications/node-express-app/tests/error.test.ts rename to dev-packages/e2e-tests/test-applications/node-express/tests/error.test.ts index 23d922b50a84..4e725f8eb8ad 100644 --- a/dev-packages/e2e-tests/test-applications/node-express-app/tests/error.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-express/tests/error.test.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'); }); diff --git a/dev-packages/e2e-tests/test-applications/node-express-app/tests/transaction.test.ts b/dev-packages/e2e-tests/test-applications/node-express/tests/transaction.test.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-express-app/tests/transaction.test.ts rename to dev-packages/e2e-tests/test-applications/node-express/tests/transaction.test.ts diff --git a/dev-packages/e2e-tests/test-applications/node-express-app/tests/trpc.test.ts b/dev-packages/e2e-tests/test-applications/node-express/tests/trpc.test.ts similarity index 93% rename from dev-packages/e2e-tests/test-applications/node-express-app/tests/trpc.test.ts rename to dev-packages/e2e-tests/test-applications/node-express/tests/trpc.test.ts index 4b287946d86d..368f14bd43ee 100644 --- a/dev-packages/e2e-tests/test-applications/node-express-app/tests/trpc.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-express/tests/trpc.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')); }); diff --git a/dev-packages/e2e-tests/test-applications/node-express-app/tsconfig.json b/dev-packages/e2e-tests/test-applications/node-express/tsconfig.json similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-express-app/tsconfig.json rename to dev-packages/e2e-tests/test-applications/node-express/tsconfig.json diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-app/.gitignore b/dev-packages/e2e-tests/test-applications/node-fastify/.gitignore similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-fastify-app/.gitignore rename to dev-packages/e2e-tests/test-applications/node-fastify/.gitignore diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-app/.npmrc b/dev-packages/e2e-tests/test-applications/node-fastify/.npmrc similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-fastify-app/.npmrc rename to dev-packages/e2e-tests/test-applications/node-fastify/.npmrc diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-app/package.json b/dev-packages/e2e-tests/test-applications/node-fastify/package.json similarity index 96% rename from dev-packages/e2e-tests/test-applications/node-fastify-app/package.json rename to dev-packages/e2e-tests/test-applications/node-fastify/package.json index 56c8818933af..0293412ba76b 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-app/package.json +++ b/dev-packages/e2e-tests/test-applications/node-fastify/package.json @@ -1,5 +1,5 @@ { - "name": "node-fastify-app", + "name": "node-fastify", "version": "1.0.0", "private": true, "scripts": { diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-app/playwright.config.ts b/dev-packages/e2e-tests/test-applications/node-fastify/playwright.config.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-fastify-app/playwright.config.ts rename to dev-packages/e2e-tests/test-applications/node-fastify/playwright.config.ts diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-app/src/app.ts b/dev-packages/e2e-tests/test-applications/node-fastify/src/app.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-fastify-app/src/app.ts rename to dev-packages/e2e-tests/test-applications/node-fastify/src/app.ts diff --git a/dev-packages/e2e-tests/test-applications/node-connect-app/start-event-proxy.ts b/dev-packages/e2e-tests/test-applications/node-fastify/start-event-proxy.ts similarity index 75% rename from dev-packages/e2e-tests/test-applications/node-connect-app/start-event-proxy.ts rename to dev-packages/e2e-tests/test-applications/node-fastify/start-event-proxy.ts index 97434b7c7b07..e627ce9a8bef 100644 --- a/dev-packages/e2e-tests/test-applications/node-connect-app/start-event-proxy.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify/start-event-proxy.ts @@ -2,5 +2,5 @@ import { startEventProxyServer } from '@sentry-internal/event-proxy-server'; startEventProxyServer({ port: 3031, - proxyServerName: 'node-connect-app', + proxyServerName: 'node-fastify', }); diff --git a/dev-packages/e2e-tests/test-applications/node-koa-app/tests/errors.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify/tests/errors.test.ts similarity index 97% rename from dev-packages/e2e-tests/test-applications/node-koa-app/tests/errors.test.ts rename to dev-packages/e2e-tests/test-applications/node-fastify/tests/errors.test.ts index 5759c2bad543..8014803360cd 100644 --- a/dev-packages/e2e-tests/test-applications/node-koa-app/tests/errors.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify/tests/errors.test.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'; }); diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-app/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify/tests/propagation.test.ts similarity index 97% rename from dev-packages/e2e-tests/test-applications/node-fastify-app/tests/propagation.test.ts rename to dev-packages/e2e-tests/test-applications/node-fastify/tests/propagation.test.ts index 11d8e896b2aa..471d9daa16b5 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-app/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify/tests/propagation.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-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` diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-app/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify/tests/transactions.test.ts similarity index 99% rename from dev-packages/e2e-tests/test-applications/node-fastify-app/tests/transactions.test.ts rename to dev-packages/e2e-tests/test-applications/node-fastify/tests/transactions.test.ts index 0e2fe4f2215b..8324a9913d1b 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-app/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify/tests/transactions.test.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-fastify-app', transactionEvent => { + const pageloadTransactionEventPromise = waitForTransaction('node-fastify', transactionEvent => { return ( transactionEvent?.contexts?.trace?.op === 'http.server' && transactionEvent?.transaction === 'GET /test-transaction' diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-app/tsconfig.json b/dev-packages/e2e-tests/test-applications/node-fastify/tsconfig.json similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-fastify-app/tsconfig.json rename to dev-packages/e2e-tests/test-applications/node-fastify/tsconfig.json diff --git a/dev-packages/e2e-tests/test-applications/node-koa-app/.npmrc b/dev-packages/e2e-tests/test-applications/node-koa/.npmrc similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-koa-app/.npmrc rename to dev-packages/e2e-tests/test-applications/node-koa/.npmrc diff --git a/dev-packages/e2e-tests/test-applications/node-koa-app/index.js b/dev-packages/e2e-tests/test-applications/node-koa/index.js similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-koa-app/index.js rename to dev-packages/e2e-tests/test-applications/node-koa/index.js diff --git a/dev-packages/e2e-tests/test-applications/node-koa-app/package.json b/dev-packages/e2e-tests/test-applications/node-koa/package.json similarity index 96% rename from dev-packages/e2e-tests/test-applications/node-koa-app/package.json rename to dev-packages/e2e-tests/test-applications/node-koa/package.json index c9e35dda13ac..34a30fd5f9f1 100644 --- a/dev-packages/e2e-tests/test-applications/node-koa-app/package.json +++ b/dev-packages/e2e-tests/test-applications/node-koa/package.json @@ -1,5 +1,5 @@ { - "name": "node-koa-app", + "name": "node-koa", "version": "1.0.0", "private": true, "scripts": { diff --git a/dev-packages/e2e-tests/test-applications/node-koa-app/playwright.config.ts b/dev-packages/e2e-tests/test-applications/node-koa/playwright.config.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-koa-app/playwright.config.ts rename to dev-packages/e2e-tests/test-applications/node-koa/playwright.config.ts diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-app/start-event-proxy.ts b/dev-packages/e2e-tests/test-applications/node-koa/start-event-proxy.ts similarity index 75% rename from dev-packages/e2e-tests/test-applications/node-fastify-app/start-event-proxy.ts rename to dev-packages/e2e-tests/test-applications/node-koa/start-event-proxy.ts index cb3a189ed920..969f745f2d7a 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-app/start-event-proxy.ts +++ b/dev-packages/e2e-tests/test-applications/node-koa/start-event-proxy.ts @@ -2,5 +2,5 @@ import { startEventProxyServer } from '@sentry-internal/event-proxy-server'; startEventProxyServer({ port: 3031, - proxyServerName: 'node-fastify-app', + proxyServerName: 'node-koa', }); diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-app/tests/errors.test.ts b/dev-packages/e2e-tests/test-applications/node-koa/tests/errors.test.ts similarity index 96% rename from dev-packages/e2e-tests/test-applications/node-fastify-app/tests/errors.test.ts rename to dev-packages/e2e-tests/test-applications/node-koa/tests/errors.test.ts index 8a4dd6c9bcd7..ce9ade128884 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-app/tests/errors.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-koa/tests/errors.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'; }); diff --git a/dev-packages/e2e-tests/test-applications/node-koa-app/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.test.ts similarity index 98% rename from dev-packages/e2e-tests/test-applications/node-koa-app/tests/propagation.test.ts rename to dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.test.ts index 4ed65dbe69a8..801539ebbafe 100644 --- a/dev-packages/e2e-tests/test-applications/node-koa-app/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.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` diff --git a/dev-packages/e2e-tests/test-applications/node-koa-app/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-koa/tests/transactions.test.ts similarity index 99% rename from dev-packages/e2e-tests/test-applications/node-koa-app/tests/transactions.test.ts rename to dev-packages/e2e-tests/test-applications/node-koa/tests/transactions.test.ts index 1ff7c3f78d6e..720c835dcfdd 100644 --- a/dev-packages/e2e-tests/test-applications/node-koa-app/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-koa/tests/transactions.test.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-koa-app', transactionEvent => { + const pageloadTransactionEventPromise = waitForTransaction('node-koa', transactionEvent => { return ( transactionEvent?.contexts?.trace?.op === 'http.server' && transactionEvent?.transaction === 'GET /test-transaction' diff --git a/dev-packages/e2e-tests/test-applications/node-koa-app/tsconfig.json b/dev-packages/e2e-tests/test-applications/node-koa/tsconfig.json similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-koa-app/tsconfig.json rename to dev-packages/e2e-tests/test-applications/node-koa/tsconfig.json diff --git a/dev-packages/e2e-tests/test-applications/node-koa-app/yarn.lock b/dev-packages/e2e-tests/test-applications/node-koa/yarn.lock similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-koa-app/yarn.lock rename to dev-packages/e2e-tests/test-applications/node-koa/yarn.lock diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-app/.gitignore b/dev-packages/e2e-tests/test-applications/node-nestjs/.gitignore similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-nestjs-app/.gitignore rename to dev-packages/e2e-tests/test-applications/node-nestjs/.gitignore diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-app/.npmrc b/dev-packages/e2e-tests/test-applications/node-nestjs/.npmrc similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-nestjs-app/.npmrc rename to dev-packages/e2e-tests/test-applications/node-nestjs/.npmrc diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-app/nest-cli.json b/dev-packages/e2e-tests/test-applications/node-nestjs/nest-cli.json similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-nestjs-app/nest-cli.json rename to dev-packages/e2e-tests/test-applications/node-nestjs/nest-cli.json diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-app/package.json b/dev-packages/e2e-tests/test-applications/node-nestjs/package.json similarity index 98% rename from dev-packages/e2e-tests/test-applications/node-nestjs-app/package.json rename to dev-packages/e2e-tests/test-applications/node-nestjs/package.json index 6135e17ad1a1..8da77df738c5 100644 --- a/dev-packages/e2e-tests/test-applications/node-nestjs-app/package.json +++ b/dev-packages/e2e-tests/test-applications/node-nestjs/package.json @@ -1,5 +1,5 @@ { - "name": "node-nestjs-app", + "name": "node-nestjs", "version": "0.0.1", "private": true, "scripts": { diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-app/playwright.config.ts b/dev-packages/e2e-tests/test-applications/node-nestjs/playwright.config.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-nestjs-app/playwright.config.ts rename to dev-packages/e2e-tests/test-applications/node-nestjs/playwright.config.ts diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-app/src/app.controller.ts b/dev-packages/e2e-tests/test-applications/node-nestjs/src/app.controller.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-nestjs-app/src/app.controller.ts rename to dev-packages/e2e-tests/test-applications/node-nestjs/src/app.controller.ts diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-app/src/app.module.ts b/dev-packages/e2e-tests/test-applications/node-nestjs/src/app.module.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-nestjs-app/src/app.module.ts rename to dev-packages/e2e-tests/test-applications/node-nestjs/src/app.module.ts diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-app/src/app.service.ts b/dev-packages/e2e-tests/test-applications/node-nestjs/src/app.service.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-nestjs-app/src/app.service.ts rename to dev-packages/e2e-tests/test-applications/node-nestjs/src/app.service.ts diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-app/src/main.ts b/dev-packages/e2e-tests/test-applications/node-nestjs/src/main.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-nestjs-app/src/main.ts rename to dev-packages/e2e-tests/test-applications/node-nestjs/src/main.ts diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-app/src/utils.ts b/dev-packages/e2e-tests/test-applications/node-nestjs/src/utils.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-nestjs-app/src/utils.ts rename to dev-packages/e2e-tests/test-applications/node-nestjs/src/utils.ts diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs/start-event-proxy.ts b/dev-packages/e2e-tests/test-applications/node-nestjs/start-event-proxy.ts new file mode 100644 index 000000000000..583769c59a92 --- /dev/null +++ b/dev-packages/e2e-tests/test-applications/node-nestjs/start-event-proxy.ts @@ -0,0 +1,6 @@ +import { startEventProxyServer } from '@sentry-internal/event-proxy-server'; + +startEventProxyServer({ + port: 3031, + proxyServerName: 'node-nestjs', +}); diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-app/tests/errors.test.ts b/dev-packages/e2e-tests/test-applications/node-nestjs/tests/errors.test.ts similarity index 96% rename from dev-packages/e2e-tests/test-applications/node-nestjs-app/tests/errors.test.ts rename to dev-packages/e2e-tests/test-applications/node-nestjs/tests/errors.test.ts index 7ad93315a84f..dd0e4cc7e1bf 100644 --- a/dev-packages/e2e-tests/test-applications/node-nestjs-app/tests/errors.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-nestjs/tests/errors.test.ts @@ -42,7 +42,7 @@ test('Sends captured error to Sentry', async ({ baseURL }) => { }); test('Sends exception to Sentry', async ({ baseURL }) => { - const errorEventPromise = waitForError('node-nestjs-app', event => { + const errorEventPromise = waitForError('node-nestjs', event => { return !event.type && event.exception?.values?.[0]?.value === 'This is an exception with id 123'; }); diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-app/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/node-nestjs/tests/propagation.test.ts similarity index 97% rename from dev-packages/e2e-tests/test-applications/node-nestjs-app/tests/propagation.test.ts rename to dev-packages/e2e-tests/test-applications/node-nestjs/tests/propagation.test.ts index 698b0833fd0d..e0a75a0b3af0 100644 --- a/dev-packages/e2e-tests/test-applications/node-nestjs-app/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-nestjs/tests/propagation.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-nestjs-app', transactionEvent => { + const inboundTransactionPromise = waitForTransaction('node-nestjs', transactionEvent => { return ( transactionEvent.contexts?.trace?.op === 'http.server' && transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-inbound-headers/${id}` ); }); - const outboundTransactionPromise = waitForTransaction('node-nestjs-app', transactionEvent => { + const outboundTransactionPromise = waitForTransaction('node-nestjs', 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-nestjs-app', transactionEvent => { + const inboundTransactionPromise = waitForTransaction('node-nestjs', transactionEvent => { return ( transactionEvent?.contexts?.trace?.op === 'http.server' && transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-inbound-headers/${id}` ); }); - const outboundTransactionPromise = waitForTransaction('node-nestjs-app', transactionEvent => { + const outboundTransactionPromise = waitForTransaction('node-nestjs', 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-nestjs-app', transactionEvent => { + const inboundTransactionPromise = waitForTransaction('node-nestjs', 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-nestjs-app', transactionEvent => { + const inboundTransactionPromise = waitForTransaction('node-nestjs', 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-nestjs-app', transactionEvent => { + const inboundTransactionPromise = waitForTransaction('node-nestjs', 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-nestjs-app', transactionEvent => { + const inboundTransactionPromise = waitForTransaction('node-nestjs', transactionEvent => { return ( transactionEvent?.contexts?.trace?.op === 'http.server' && transactionEvent.contexts?.trace?.data?.['http.target'] === `/test-outgoing-fetch-external-disallowed` diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-app/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-nestjs/tests/transactions.test.ts similarity index 99% rename from dev-packages/e2e-tests/test-applications/node-nestjs-app/tests/transactions.test.ts rename to dev-packages/e2e-tests/test-applications/node-nestjs/tests/transactions.test.ts index e5a78a6f6fb7..3fe5c1e65263 100644 --- a/dev-packages/e2e-tests/test-applications/node-nestjs-app/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-nestjs/tests/transactions.test.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-nestjs-app', transactionEvent => { + const pageloadTransactionEventPromise = waitForTransaction('node-nestjs', transactionEvent => { return ( transactionEvent?.contexts?.trace?.op === 'http.server' && transactionEvent?.transaction === 'GET /test-transaction' diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-app/tsconfig.build.json b/dev-packages/e2e-tests/test-applications/node-nestjs/tsconfig.build.json similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-nestjs-app/tsconfig.build.json rename to dev-packages/e2e-tests/test-applications/node-nestjs/tsconfig.build.json diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-app/tsconfig.json b/dev-packages/e2e-tests/test-applications/node-nestjs/tsconfig.json similarity index 100% rename from dev-packages/e2e-tests/test-applications/node-nestjs-app/tsconfig.json rename to dev-packages/e2e-tests/test-applications/node-nestjs/tsconfig.json