stop using existing request data event processors on transaction events

Author: lobsterkatie

packages/nextjs/src/config/wrappers/wrapperUtils.ts

@@ -122,14 +122,16 @@ export function callTracedServerSideDataFetcher<F extends (...args: any[]) => Pr
     if (currentScope) {
       currentScope.setSpan(dataFetcherSpan);
       currentScope.addEventProcessor(event =>
-        addRequestDataToEvent(event, req, {
-          include: {
-            // When the `transaction` option is set to true, it tries to extract a transaction name from the request
-            // object. We don't want this since we already have a high-quality transaction name with a parameterized
-            // route. Setting `transaction` to `true` will clobber that transaction name.
-            transaction: false,
-          },
-        }),
+        event.type !== 'transaction'
+          ? addRequestDataToEvent(event, req, {
+              include: {
+                // When the `transaction` option is set to true, it tries to extract a transaction name from the request
+                // object. We don't want this since we already have a high-quality transaction name with a parameterized
+                // route. Setting `transaction` to `true` will clobber that transaction name.
+                transaction: false,
+              },
+            })
+          : event,
       );
     }
 

packages/nextjs/src/utils/instrumentServer.ts

@@ -244,7 +244,9 @@ function makeWrappedReqHandler(origReqHandler: ReqHandler): WrappedReqHandler {
       const currentScope = getCurrentHub().getScope();
 
       if (currentScope) {
-        currentScope.addEventProcessor(event => addRequestDataToEvent(event, nextReq));
+        currentScope.addEventProcessor(event =>
+          event.type !== 'transaction' ? addRequestDataToEvent(event, nextReq) : event,
+        );
 
         // We only want to record page and API requests
         if (hasTracingEnabled() && shouldTraceRequest(nextReq.url, publicDirFiles)) {

packages/nextjs/src/utils/withSentry.ts

@@ -41,7 +41,9 @@ export const withSentry = (origHandler: NextApiHandler): WrappedNextApiHandler =
       const currentScope = getCurrentHub().getScope();
 
       if (currentScope) {
-        currentScope.addEventProcessor(event => addRequestDataToEvent(event, req));
+        currentScope.addEventProcessor(event =>
+          event.type !== 'transaction' ? addRequestDataToEvent(event, req) : event,
+        );
 
         if (hasTracingEnabled()) {
           // If there is a trace header set, extract the data from it (parentSpanId, traceId, and sampling decision)