fixup! fix(nextjs): Skip init inside a request of @sentry/cloudflare

Author: JPeer264

packages/nextjs/src/server/index.ts

@@ -2,7 +2,7 @@
 // can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
 /* eslint-disable import/export */
 import { HTTP_TARGET, URL_QUERY } from '@sentry/conventions/attributes';
-import type { EventProcessor } from '@sentry/core';
+import type { EventProcessor, Scope } from '@sentry/core';
 import {
   _INTERNAL_getActiveClient,
   applySdkMetadata,
@@ -237,9 +237,16 @@ export function init(options: NodeOptions): NodeClient | undefined {
 
   // On the client, not the global scope, so a later `init()` after
   // `close()` does not stack another copy. In a request of `withSentry` on
-  // Workers, `init` runs once per isolate and creates no client, so the global
-  // scope gets them and reaches every client of `withSentry`.
-  const eventProcessorTarget = isOwnedByCloudflare ? getGlobalScope() : client;
+  // Workers, `init` creates no client, so the global scope gets them, which
+  // reaches every client of `withSentry`, unless an earlier `init` added them.
+  let eventProcessorTarget: NodeClient | Scope | undefined = client;
+  if (isOwnedByCloudflare) {
+    const globalScope = getGlobalScope();
+    const isAdded = globalScope
+      .getScopeData()
+      .eventProcessors.some(processor => processor.id === 'DropReactControlFlowErrors');
+    eventProcessorTarget = isAdded ? undefined : globalScope;
+  }
   eventProcessorTarget?.addEventProcessor(
     Object.assign(
       ((event, hint) => {

packages/nextjs/test/serverSdk.test.ts

@@ -94,28 +94,39 @@ describe('Server init()', () => {
     expect(second).toBe(first);
   });
 
-  it('skips init and sets the `turbopack` tag on Cloudflare Workers in a request of `withSentry` from `@sentry/cloudflare`', () => {
+  it('skips init on Cloudflare Workers in a request of `withSentry` from `@sentry/cloudflare`', () => {
     vi.stubGlobal('navigator', { userAgent: 'Cloudflare-Workers' });
     setAsyncLocalStorageAsyncContextStrategy();
-    (process as { turbopack?: boolean }).turbopack = true;
 
     withIsolationScope(() => init({}));
 
     expect(nodeInit).not.toHaveBeenCalled();
-    expect(getGlobalScope().getScopeData().tags.turbopack).toBe(true);
   });
 
-  it('adds its event processors to the global scope on Cloudflare Workers in a request of `withSentry` from `@sentry/cloudflare`', () => {
+  it('sets the `turbopack` tag on Cloudflare Workers in a request of `withSentry` from `@sentry/cloudflare`', () => {
     vi.stubGlobal('navigator', { userAgent: 'Cloudflare-Workers' });
     setAsyncLocalStorageAsyncContextStrategy();
+    (process as { turbopack?: boolean }).turbopack = true;
 
     withIsolationScope(() => init({}));
 
+    expect(getGlobalScope().getScopeData().tags.turbopack).toBe(true);
+  });
+
+  it('adds its event processors to the global scope once on Cloudflare Workers in a request of `withSentry` from `@sentry/cloudflare`', () => {
+    vi.stubGlobal('navigator', { userAgent: 'Cloudflare-Workers' });
+    setAsyncLocalStorageAsyncContextStrategy();
+
+    withIsolationScope(() => {
+      init({});
+      init({});
+    });
+
     expect(
       getGlobalScope()
         .getScopeData()
-        .eventProcessors.map(processor => processor.id),
-    ).toContain('DropReactControlFlowErrors');
+        .eventProcessors.filter(processor => processor.id === 'DropReactControlFlowErrors'),
+    ).toHaveLength(1);
   });
 
   it('inits on Cloudflare Workers outside of a request of `withSentry` from `@sentry/cloudflare`', () => {