fix test app

Author: Lms24

dev-packages/e2e-tests/test-applications/tsx-express/instrument.mjs

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

dev-packages/e2e-tests/test-applications/tsx-express/src/app.ts

@@ -119,8 +119,8 @@ export const appRouter = t.router({
     .mutation(() => {
       throw new Error('I crashed in a trpc handler');
     }),
-  unauthorized: procedure.mutation(() => {
-    throw new TRPCError({ code: 'UNAUTHORIZED', cause: new Error('Unauthorized') });
+  badRequest: procedure.mutation(() => {
+    throw new TRPCError({ code: 'BAD_REQUEST', cause: new Error('Bad Request') });
   }),
 });
 

dev-packages/e2e-tests/test-applications/tsx-express/tests/errors.test.ts

@@ -27,16 +27,3 @@ test('Sends correct error event', async ({ baseURL }) => {
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
   });
 });
-
-test('Should record caught exceptions with local variable', async ({ baseURL }) => {
-  const errorEventPromise = waitForError('tsx-express', event => {
-    return event.transaction === 'GET /test-local-variables-caught';
-  });
-
-  await fetch(`${baseURL}/test-local-variables-caught`);
-
-  const errorEvent = await errorEventPromise;
-
-  const frames = errorEvent.exception?.values?.[0]?.stacktrace?.frames;
-  expect(frames?.[frames.length - 1]?.vars?.randomVariableToRecord).toBeDefined();
-});

dev-packages/e2e-tests/test-applications/tsx-express/tests/logs.test.ts

@@ -1,8 +1,8 @@
 import { expect, test } from '@playwright/test';
 import { waitForEnvelopeItem } from '@sentry-internal/test-utils';
-import type { SerializedLog, SerializedLogContainer } from '@sentry/core';
+import type { SerializedLogContainer } from '@sentry/core';
 
-test('should send logs', async ({ baseURL }) => {
+test('Sends logs', async ({ baseURL }) => {
   const logEnvelopePromise = waitForEnvelopeItem('tsx-express', envelope => {
     return envelope[0].type === 'log' && (envelope[1] as SerializedLogContainer).items[0]?.level === 'debug';
   });

dev-packages/e2e-tests/test-applications/tsx-express/tests/mcp.test.ts

@@ -3,7 +3,7 @@ import { waitForTransaction } from '@sentry-internal/test-utils';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 
-test('Should record transactions for mcp handlers', async ({ baseURL }) => {
+test('Records transactions for mcp handlers', async ({ baseURL }) => {
   const transport = new SSEClientTransport(new URL(`${baseURL}/sse`));
 
   const client = new Client({
@@ -18,7 +18,7 @@ test('Should record transactions for mcp handlers', async ({ baseURL }) => {
       return transactionEvent.transaction === 'POST /messages';
     });
     const toolTransactionPromise = waitForTransaction('tsx-express', transactionEvent => {
-      return transactionEvent.transaction === 'mcp-server/tool:echo';
+      return transactionEvent.transaction === 'tools/call echo';
     });
 
     const toolResult = await client.callTool({
@@ -39,9 +39,12 @@ test('Should record transactions for mcp handlers', async ({ baseURL }) => {
 
     const postTransaction = await postTransactionPromise;
     expect(postTransaction).toBeDefined();
+    expect(postTransaction.contexts?.trace?.op).toEqual('http.server');
 
     const toolTransaction = await toolTransactionPromise;
     expect(toolTransaction).toBeDefined();
+    expect(toolTransaction.contexts?.trace?.op).toEqual('mcp.server');
+    expect(toolTransaction.contexts?.trace?.data?.['mcp.method.name']).toEqual('tools/call');
 
     // TODO: When https://github.com/modelcontextprotocol/typescript-sdk/pull/358 is released check for trace id equality between the post transaction and the handler transaction
   });
@@ -51,7 +54,7 @@ test('Should record transactions for mcp handlers', async ({ baseURL }) => {
       return transactionEvent.transaction === 'POST /messages';
     });
     const resourceTransactionPromise = waitForTransaction('tsx-express', transactionEvent => {
-      return transactionEvent.transaction === 'mcp-server/resource:echo';
+      return transactionEvent.transaction === 'resources/read echo://foobar';
     });
 
     const resourceResult = await client.readResource({
@@ -76,7 +79,7 @@ test('Should record transactions for mcp handlers', async ({ baseURL }) => {
       return transactionEvent.transaction === 'POST /messages';
     });
     const promptTransactionPromise = waitForTransaction('tsx-express', transactionEvent => {
-      return transactionEvent.transaction === 'mcp-server/prompt:echo';
+      return transactionEvent.transaction === 'prompts/get echo';
     });
 
     const promptResult = await client.getPrompt({

dev-packages/e2e-tests/test-applications/tsx-express/tests/transactions.test.ts

@@ -66,7 +66,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
     data: {
       'sentry.origin': 'auto.http.otel.express',
       'sentry.op': 'middleware.express',
-      'http.route': '/',
       'express.name': 'query',
       'express.type': 'middleware',
     },
@@ -85,7 +84,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
     data: {
       'sentry.origin': 'auto.http.otel.express',
       'sentry.op': 'middleware.express',
-      'http.route': '/',
       'express.name': 'expressInit',
       'express.type': 'middleware',
     },
@@ -144,7 +142,6 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
     data: {
       'sentry.origin': 'auto.http.otel.express',
       'sentry.op': 'middleware.express',
-      'http.route': '/',
       'express.name': 'query',
       'express.type': 'middleware',
     },
@@ -163,7 +160,6 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
     data: {
       'sentry.origin': 'auto.http.otel.express',
       'sentry.op': 'middleware.express',
-      'http.route': '/',
       'express.name': 'expressInit',
       'express.type': 'middleware',
     },
@@ -192,7 +188,8 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
     parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     start_timestamp: expect.any(Number),
-    status: 'ok',
+    status: 'unknown_error',
+    measurements: {},
     timestamp: expect.any(Number),
     trace_id: expect.stringMatching(/[a-f0-9]{32}/),
   });

dev-packages/e2e-tests/test-applications/tsx-express/tests/trpc.test.ts

@@ -3,7 +3,7 @@ import { waitForError, waitForTransaction } from '@sentry-internal/test-utils';
 import { createTRPCProxyClient, httpBatchLink } from '@trpc/client';
 import type { AppRouter } from '../src/app';
 
-test('Should record span for trpc query', async ({ baseURL }) => {
+test('Records span for trpc query', async ({ baseURL }) => {
   const transactionEventPromise = waitForTransaction('tsx-express', transactionEvent => {
     return (
       transactionEvent.transaction === 'GET /trpc' &&
@@ -35,7 +35,7 @@ test('Should record span for trpc query', async ({ baseURL }) => {
   );
 });
 
-test('Should record transaction for trpc mutation', async ({ baseURL }) => {
+test('Records transaction for trpc mutation', async ({ baseURL }) => {
   const transactionEventPromise = waitForTransaction('tsx-express', transactionEvent => {
     return (
       transactionEvent.transaction === 'POST /trpc' &&
@@ -67,7 +67,7 @@ test('Should record transaction for trpc mutation', async ({ baseURL }) => {
   );
 });
 
-test('Should record transaction and error for a crashing trpc handler', async ({ baseURL }) => {
+test('Records transaction and error for a crashing trpc handler', async ({ baseURL }) => {
   const transactionEventPromise = waitForTransaction('tsx-express', transactionEvent => {
     return (
       transactionEvent.transaction === 'POST /trpc' &&
@@ -105,16 +105,16 @@ 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 }) => {
+test('Records transaction and error for a trpc handler that returns a status code', async ({ baseURL }) => {
   const transactionEventPromise = waitForTransaction('tsx-express', transactionEvent => {
     return (
       transactionEvent.transaction === 'POST /trpc' &&
-      !!transactionEvent.spans?.find(span => span.description === 'trpc/unauthorized')
+      !!transactionEvent.spans?.find(span => span.description === 'trpc/badRequest')
     );
   });
 
   const errorEventPromise = waitForError('tsx-express', errorEvent => {
-    return !!errorEvent?.exception?.values?.some(exception => exception.value?.includes('Unauthorized'));
+    return !!errorEvent?.exception?.values?.some(exception => exception.value?.includes('Bad Request'));
   });
 
   const trpcClient = createTRPCProxyClient<AppRouter>({
@@ -125,7 +125,7 @@ test('Should record transaction and error for a trpc handler that returns a stat
     ],
   });
 
-  await expect(trpcClient.unauthorized.mutate()).rejects.toBeDefined();
+  await expect(trpcClient.badRequest.mutate()).rejects.toBeDefined();
 
   await expect(transactionEventPromise).resolves.toBeDefined();
   await expect(errorEventPromise).resolves.toBeDefined();