Merge branch 'v9' into cg-v9backport-rr-createsenrtyhandleerror

Author: chargome

dev-packages/browser-integration-tests/suites/replay/autoFlushOnFeedback/init.js

@@ -5,9 +5,6 @@ window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   useCompression: false,
-  _experiments: {
-    autoFlushOnFeedback: true,
-  },
 });
 
 Sentry.init({

dev-packages/e2e-tests/test-applications/nextjs-14/tests/generation-functions.test.ts

@@ -42,16 +42,17 @@ test('Should send a transaction and an error event for a faulty generateMetadata
   });
 
   const errorEventPromise = waitForError('nextjs-14', errorEvent => {
-    return errorEvent?.exception?.values?.[0]?.value === 'generateMetadata Error';
+    return (
+      errorEvent?.exception?.values?.[0]?.value === 'generateMetadata Error' &&
+      errorEvent.transaction === 'Page.generateMetadata (/generation-functions)'
+    );
   });
 
   await page.goto(`/generation-functions?metadataTitle=${testTitle}&shouldThrowInGenerateMetadata=1`);
 
   const errorEvent = await errorEventPromise;
   const transactionEvent = await transactionPromise;
 
-  expect(errorEvent.transaction).toBe('Page.generateMetadata (/generation-functions)');
-
   // Assert that isolation scope works properly
   expect(errorEvent.tags?.['my-isolated-tag']).toBe(true);
   expect(errorEvent.tags?.['my-global-scope-isolated-tag']).not.toBeDefined();

packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts

@@ -12,12 +12,14 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   setCapturedScopesOnSpan,
   setHttpStatus,
+  vercelWaitUntil,
   winterCGHeadersToDict,
   withIsolationScope,
   withScope,
 } from '@sentry/core';
 import { isNotFoundNavigationError, isRedirectNavigationError } from './nextNavigationErrorUtils';
 import type { RouteHandlerContext } from './types';
+import { flushSafelyWithTimeout } from './utils/responseEnd';
 import { commonObjectToIsolationScope } from './utils/tracingUtils';
 
 /**
@@ -92,6 +94,9 @@ export function wrapRouteHandlerWithSentry<F extends (...args: any[]) => any>(
                   });
                 }
               },
+              () => {
+                vercelWaitUntil(flushSafelyWithTimeout());
+              },
             );
 
             try {

packages/node/src/integrations/tracing/openai/instrumentation.ts

@@ -83,12 +83,19 @@ export class SentryOpenAiInstrumentation extends InstrumentationBase<Instrumenta
       }
     }
 
-    const isESM = Object.prototype.toString.call(exports) === '[object Module]';
-    if (isESM) {
+    // Constructor replacement - handle read-only properties
+    // The OpenAI property might have only a getter, so use defineProperty
+    try {
       exports.OpenAI = WrappedOpenAI;
-      return exports;
+    } catch (error) {
+      // If direct assignment fails, override the property descriptor
+      Object.defineProperty(exports, 'OpenAI', {
+        value: WrappedOpenAI,
+        writable: true,
+        configurable: true,
+        enumerable: true,
+      });
     }
-
-    return { ...exports, OpenAI: WrappedOpenAI };
+    return exports;
   }
 }

packages/replay-internal/src/replay.ts

@@ -939,7 +939,7 @@ export class ReplayContainer implements ReplayContainerInterface {
 
       // There is no way to remove these listeners, so ensure they are only added once
       if (!this._hasInitializedCoreListeners) {
-        addGlobalListeners(this, { autoFlushOnFeedback: this._options._experiments.autoFlushOnFeedback });
+        addGlobalListeners(this);
 
         this._hasInitializedCoreListeners = true;
       }

packages/replay-internal/src/types/replay.ts

@@ -235,6 +235,9 @@ export interface ReplayPluginOptions extends ReplayNetworkOptions {
      * https://github.com/rrweb-io/rrweb/blob/master/docs/recipes/cross-origin-iframes.md#considerations
      */
     recordCrossOriginIframes: boolean;
+    /**
+     * @deprecated This option is now the default behavior and the option is no longer needed. It will be removed in the next major version.
+     */
     autoFlushOnFeedback: boolean;
     /**
      * Completetly ignore mutations matching the given selectors.

packages/replay-internal/src/util/addGlobalListeners.ts

@@ -16,10 +16,7 @@ import type { ReplayContainer } from '../types';
 /**
  * Add global listeners that cannot be removed.
  */
-export function addGlobalListeners(
-  replay: ReplayContainer,
-  { autoFlushOnFeedback }: { autoFlushOnFeedback?: boolean },
-): void {
+export function addGlobalListeners(replay: ReplayContainer): void {
   // Listeners from core SDK //
   const client = getClient();
 
@@ -64,17 +61,15 @@ export function addGlobalListeners(
       const replayId = replay.getSessionId();
       if (options?.includeReplay && replay.isEnabled() && replayId && feedbackEvent.contexts?.feedback) {
         // In case the feedback is sent via API and not through our widget, we want to flush replay
-        if (feedbackEvent.contexts.feedback.source === 'api' && autoFlushOnFeedback) {
+        if (feedbackEvent.contexts.feedback.source === 'api') {
           await replay.flush();
         }
         feedbackEvent.contexts.feedback.replay_id = replayId;
       }
     });
 
-    if (autoFlushOnFeedback) {
-      client.on('openFeedbackWidget', async () => {
-        await replay.flush();
-      });
-    }
+    client.on('openFeedbackWidget', async () => {
+      await replay.flush();
+    });
   }
 }