fix test

Author: mydea

packages/nextjs/src/common/withServerActionInstrumentation.ts

@@ -6,6 +6,7 @@ import {
   handleCallbackErrors,
   runWithAsyncContext,
   startSpan,
+  withScope,
 } from '@sentry/core';
 import { logger, tracingContextFromHeaders } from '@sentry/utils';
 
@@ -84,47 +85,48 @@ async function withServerActionInstrumentationImplementation<A extends (...args:
 
     let res;
     try {
-      res = await startSpan(
-        {
-          op: 'function.server_action',
-          name: `serverAction/${serverActionName}`,
-          status: 'ok',
-          ...traceparentData,
-          metadata: {
-            source: 'route',
-            dynamicSamplingContext: traceparentData && !dynamicSamplingContext ? {} : dynamicSamplingContext,
-            request: {
-              headers: fullHeadersObject,
-            },
-          },
-        },
-        async span => {
-          const result = await handleCallbackErrors(callback, error => {
-            captureException(error, { mechanism: { handled: false } });
+      res = await withScope(scope => {
+        if (options.formData) {
+          const formDataObject: Record<string, unknown> = {};
+          options.formData.forEach((value, key) => {
+            if (typeof value === 'string') {
+              formDataObject[key] = value;
+            } else {
+              formDataObject[key] = '[non-string value]';
+            }
           });
+          // Since formDataObject is not a primitive, we cannot store it on the span as attributes
+          // so instead we put it as extra on the scope
+          scope.setExtra('server_action_form_data', formDataObject);
+        }
 
-          if (options.recordResponse !== undefined ? options.recordResponse : sendDefaultPii) {
-            span?.setAttribute('server_action_result', result);
-          }
-
-          if (options.formData) {
-            const formDataObject: Record<string, unknown> = {};
-            options.formData.forEach((value, key) => {
-              if (typeof value === 'string') {
-                formDataObject[key] = value;
-              } else {
-                formDataObject[key] = '[non-string value]';
-              }
+        return startSpan(
+          {
+            op: 'function.server_action',
+            name: `serverAction/${serverActionName}`,
+            status: 'ok',
+            ...traceparentData,
+            metadata: {
+              source: 'route',
+              dynamicSamplingContext: traceparentData && !dynamicSamplingContext ? {} : dynamicSamplingContext,
+              request: {
+                headers: fullHeadersObject,
+              },
+            },
+          },
+          async span => {
+            const result = await handleCallbackErrors(callback, error => {
+              captureException(error, { mechanism: { handled: false } });
             });
-            // Since formDataObject is not a primitive, we cannot store it on the span as attributes
-            // so instead we put it as extra on the scope
-            const scope = getCurrentScope();
-            scope.setExtra('server_action_form_data', formDataObject);
-          }
 
-          return result;
-        },
-      );
+            if (options.recordResponse !== undefined ? options.recordResponse : sendDefaultPii) {
+              span?.setAttribute('server_action_result', result);
+            }
+
+            return result;
+          },
+        );
+      });
     } finally {
       if (!platformSupportsStreaming()) {
         // Lambdas require manual flushing to prevent execution freeze before the event is sent