do wrap :')

Author: chargome

dev-packages/e2e-tests/test-applications/nextjs-16/tests/middleware.test.ts

@@ -48,7 +48,8 @@ test('Faulty middlewares', async ({ request }) => {
     // Assert that isolation scope works properly
     expect(errorEvent.tags?.['my-isolated-tag']).toBe(true);
     expect(errorEvent.tags?.['my-global-scope-isolated-tag']).not.toBeDefined();
-    expect(errorEvent.transaction).toBe('/middleware');
+    // this differs between webpack and turbopack
+    expect(['middleware GET', '/middleware']).toContain(errorEvent.transaction);
   });
 });
 

dev-packages/e2e-tests/test-applications/nextjs-pages-dir/tests/middleware.test.ts

@@ -3,7 +3,7 @@ import { waitForError, waitForTransaction } from '@sentry-internal/test-utils';
 
 test('Should create a transaction for middleware', async ({ request }) => {
   const middlewareTransactionPromise = waitForTransaction('nextjs-pages-dir', async transactionEvent => {
-    return transactionEvent?.transaction === 'middleware GET /api/endpoint-behind-middleware';
+    return transactionEvent?.transaction === 'middleware GET';
   });
 
   const response = await request.get('/api/endpoint-behind-middleware');
@@ -23,10 +23,12 @@ test('Should create a transaction for middleware', async ({ request }) => {
 
 test('Faulty middlewares', async ({ request }) => {
   const middlewareTransactionPromise = waitForTransaction('nextjs-pages-dir', async transactionEvent => {
-    return transactionEvent?.transaction === 'middleware GET /api/endpoint-behind-faulty-middleware';
+    console.log('transactionEvent', transactionEvent.transaction);
+    return transactionEvent?.transaction === 'middleware GET';
   });
 
   const errorEventPromise = waitForError('nextjs-pages-dir', errorEvent => {
+    console.log('errorEvent', errorEvent.transaction);
     return errorEvent?.exception?.values?.[0]?.value === 'Middleware Error';
   });
 
@@ -48,14 +50,14 @@ test('Faulty middlewares', async ({ request }) => {
     // Assert that isolation scope works properly
     expect(errorEvent.tags?.['my-isolated-tag']).toBe(true);
     expect(errorEvent.tags?.['my-global-scope-isolated-tag']).not.toBeDefined();
-    expect(errorEvent.transaction).toBe('middleware GET /api/endpoint-behind-faulty-middleware');
+    expect(errorEvent.transaction).toBe('middleware GET');
   });
 });
 
 test('Should trace outgoing fetch requests inside middleware and create breadcrumbs for it', async ({ request }) => {
   const middlewareTransactionPromise = waitForTransaction('nextjs-pages-dir', async transactionEvent => {
     return (
-      transactionEvent?.transaction === 'middleware GET /api/endpoint-behind-middleware' &&
+      transactionEvent?.transaction === 'middleware GET' &&
       !!transactionEvent.spans?.find(span => span.op === 'http.client')
     );
   });

packages/nextjs/src/common/wrapMiddlewareWithSentry.ts

@@ -64,7 +64,7 @@ export function wrapMiddlewareWithSentry<H extends EdgeRouteHandler>(
           isolationScope.setSDKProcessingMetadata({
             normalizedRequest: winterCGRequestToRequestData(req),
           });
-          spanName = `middleware ${req.method} ${new URL(req.url).pathname}`;
+          spanName = `middleware ${req.method}`;
           spanSource = 'url';
         } else {
           spanName = 'middleware';

packages/nextjs/src/config/webpack.ts

@@ -283,9 +283,7 @@ export function constructWebpackConfigFunction({
       });
 
       // Wrap middleware
-      // if (userSentryOptions.autoInstrumentMiddleware ?? true) {
-      // eslint-disable-next-line no-constant-condition
-      if (false) {
+      if (userSentryOptions.autoInstrumentMiddleware ?? true) {
         newConfig.module.rules.unshift({
           test: isMiddlewareResource,
           use: [

packages/nextjs/src/edge/index.ts

@@ -1,3 +1,4 @@
+import { context } from '@opentelemetry/api';
 import {
   applySdkMetadata,
   getCapturedScopesOnSpan,
@@ -15,14 +16,13 @@ import {
   stripUrlQueryAndFragment,
   vercelWaitUntil,
 } from '@sentry/core';
+import { getScopesFromContext } from '@sentry/opentelemetry';
 import type { VercelEdgeOptions } from '@sentry/vercel-edge';
 import { getDefaultIntegrations, init as vercelEdgeInit } from '@sentry/vercel-edge';
 import { addHeadersAsAttributes } from '../common/utils/addHeadersAsAttributes';
 import { isBuild } from '../common/utils/isBuild';
 import { flushSafelyWithTimeout } from '../common/utils/responseEnd';
 import { distDirRewriteFramesIntegration } from './distDirRewriteFramesIntegration';
-import { getScopesFromContext } from '@sentry/opentelemetry';
-import { context } from '@opentelemetry/api';
 
 export * from '@sentry/vercel-edge';
 export * from '../common';
@@ -111,7 +111,19 @@ export function init(options: VercelEdgeOptions = {}): void {
       event.contexts?.trace?.data?.['next.span_name']
     ) {
       if (event.transaction) {
-        event.transaction = stripUrlQueryAndFragment(event.contexts.trace.data['next.span_name']);
+        // Older nextjs versions pass the full url appended to the middleware name, which results in high cardinality transaction names.
+        // We want to remove the url from the name here.
+        const spanName = event.contexts.trace.data['next.span_name'];
+
+        if (typeof spanName === 'string') {
+          const match = spanName.match(/^middleware (GET|POST|PUT|DELETE|PATCH|HEAD|OPTIONS)/);
+          if (match) {
+            const normalizedName = `middleware ${match[1]}`;
+            event.transaction = normalizedName;
+          } else {
+            event.transaction = stripUrlQueryAndFragment(event.contexts.trace.data['next.span_name']);
+          }
+        }
       }
     }
   });