Update route handler logic

Author: Luca Forstner

packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts

@@ -51,7 +51,6 @@ export function wrapRouteHandlerWithSentry<F extends (...args: any[]) => any>(
       const activeSpan = getActiveSpan();
       if (activeSpan) {
         const rootSpan = getRootSpan(activeSpan);
-        rootSpan.setAttribute('sentry.route_handler', true);
         const { scope } = getCapturedScopesOnSpan(rootSpan);
         setCapturedScopesOnSpan(rootSpan, scope ?? new Scope(), isolationScope);
       }

packages/nextjs/src/server/index.ts

@@ -1,6 +1,7 @@
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   applySdkMetadata,
   getClient,
   getGlobalScope,
@@ -284,32 +285,21 @@ export function init(options: NodeOptions): NodeClient | undefined {
   getGlobalScope().addEventProcessor(
     Object.assign(
       (event => {
-        // Sometimes, the HTTP integration will not work, causing us not to properly set an op for spans generated by
-        // Next.js that are actually more or less correct server HTTP spans, so we are backfilling the op here.
-
-        // if (
-        //   event.type === 'transaction' &&
-        //   event.transaction?.match(/^(RSC )?GET /) &&
-        //   event.contexts?.trace?.data?.['sentry.rsc'] === true &&
-        //   !event.contexts.trace.op
-        // ) {
-        //   event.contexts.trace.data = event.contexts.trace.data || {};
-        //   event.contexts.trace.data[SEMANTIC_ATTRIBUTE_SENTRY_OP] = 'http.server';
-        //   event.contexts.trace.op = 'http.server';
-        // }
-
-        // TODO: Add logic here to backfill things like, parameterized transaction name, op, request interface, etc.
-
         // Enhance route handler transactions
-        if (event.type === 'transaction' && event.contexts?.trace?.data?.['sentry.route_handler'] === true) {
+        if (
+          event.type === 'transaction' &&
+          event.contexts?.trace?.data?.['next.span_type'] === 'BaseServer.handleRequest'
+        ) {
           event.contexts.trace.data = event.contexts.trace.data || {};
           event.contexts.trace.data[SEMANTIC_ATTRIBUTE_SENTRY_OP] = 'http.server';
           event.contexts.trace.op = 'http.server';
-          if (typeof event.contexts.trace.data[ATTR_HTTP_ROUTE] === 'string') {
-            // eslint-disable-next-line deprecation/deprecation
-            event.transaction = `${event.contexts.trace.data[SEMATTRS_HTTP_METHOD]} ${event.contexts.trace.data[
-              ATTR_HTTP_ROUTE
-            ].replace(/\/route$/, '')}`;
+
+          // eslint-disable-next-line deprecation/deprecation
+          const method = event.contexts.trace.data[SEMATTRS_HTTP_METHOD];
+          const route = event.contexts.trace.data[ATTR_HTTP_ROUTE];
+          if (typeof method === 'string' && typeof route === 'string') {
+            event.transaction = `${method} ${route.replace(/\/route$/, '')}`;
+            event.contexts.trace.data[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE] = 'route';
           }
         }