Merge branch 'v9' into cg-v9backport-rr-flush-requesthandler

Author: chargome

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;
   }
 }