fix: bugbot issue

Author: isaacs

CHANGELOG.md

@@ -90,7 +90,7 @@
 
 Work in this release was contributed by @Shubham-Padkonde and @tobias-schnabel. Thank you for your contributions!
 
-- **feat(core)**: `Sentry.init()` now warns when it runs while a client is still active. For now, the new client still replaces the active client, but the active client is not closed, so state from both can mix. Call `Sentry.init()` once, or call `await Sentry.close()` before you call it again. `Sentry.close()` now unbinds the client it closes, so after `close()`, `getClient()` returns `undefined`, `isInitialized()` returns `false`, and a later `init()` sets up a new client. In `@sentry/cloudflare`, closing the client also clears the isolate's client cache, so later requests no longer reuse the closed client. On the server, `@sentry/nextjs` and `@sentry/remix` now return the active client from a repeated `init()` call, not `undefined`.
+- **feat(core)**: `Sentry.init()` now warns when it runs while a client is still active. For now, the new client still replaces the active client, but the active client is not closed, so state from both can mix. Call `Sentry.init()` once, or call `await Sentry.close()` before you call it again. `Sentry.close()` now unbinds the client it closes, so after `close()`, `getClient()` returns `undefined`, `isInitialized()` returns `false`, and a later `init()` sets up a new client. In `@sentry/cloudflare`, later requests no longer reuse the isolate's cached client once it is closed or closing. On the server, `@sentry/nextjs` and `@sentry/remix` now return the active client from a repeated `init()` call, not `undefined`.
 
 ## 11.2.0
 

docs/repeated-init.md

@@ -34,14 +34,14 @@ When `init()` replaces a client, nothing closes the old one:
 
 ## Current behavior
 
-| Entry point                                                               | Repeated call                                                                                                                                                      |
-| ------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `initAndBind` (browser and its wrappers, Deno), Node `_init`, Vercel Edge | Warns, then replaces the client. Returns the new client.                                                                                                           |
-| Next.js server, Remix server, Hono Node                                   | Keeps the first client and returns it. Logs in debug mode only.                                                                                                    |
-| Hono Bun and Deno                                                         | Keeps the first client and returns it. Warns with its own text.                                                                                                    |
-| Nuxt server                                                               | Keeps the first client and returns it. Logs that a `--import` preload is no longer needed.                                                                         |
-| Cloudflare (default)                                                      | Keeps the first client of the isolate and returns it. Closing that client clears the cache. `cacheClient: false` makes a new client on each call, with no warning. |
-| Next.js edge                                                              | Warns, then replaces the client. Returns `void`.                                                                                                                   |
+| Entry point                                                               | Repeated call                                                                                                                                                         |
+| ------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `initAndBind` (browser and its wrappers, Deno), Node `_init`, Vercel Edge | Warns, then replaces the client. Returns the new client.                                                                                                              |
+| Next.js server, Remix server, Hono Node                                   | Keeps the first client and returns it. Logs in debug mode only.                                                                                                       |
+| Hono Bun and Deno                                                         | Keeps the first client and returns it. Warns with its own text.                                                                                                       |
+| Nuxt server                                                               | Keeps the first client and returns it. Logs that a `--import` preload is no longer needed.                                                                            |
+| Cloudflare (default)                                                      | Keeps the first client of the isolate and returns it, unless that client is closed or closing. `cacheClient: false` makes a new client on each call, with no warning. |
+| Next.js edge                                                              | Warns, then replaces the client. Returns `void`.                                                                                                                      |
 
 The shared warning lives in `warnIfClientIsActive()` in
 `packages/core/src/sdk.ts`. Core exports it as

packages/cloudflare/src/baseSdk.ts

@@ -1,5 +1,5 @@
 import type { Integration } from '@sentry/core';
-import { debug, getCurrentScope, setCurrentClient } from '@sentry/core';
+import { _INTERNAL_isClientClosed, debug, getCurrentScope, setCurrentClient } from '@sentry/core';
 import {
   consoleIntegration,
   conversationIdIntegration,
@@ -16,7 +16,7 @@ import {
 import type { CloudflareClientOptions, CloudflareOptions } from './client';
 import { CloudflareClient } from './client';
 import { makeFlushLock } from './flush';
-import { _clearGlobalClientCache, cacheClient, getCachedClient } from './clientCache';
+import { cacheClient, getCachedClient } from './clientCache';
 import { DEBUG_BUILD } from './debug-build';
 import { fetchIntegration } from './integrations/fetch';
 import { httpServerIntegration } from './integrations/httpServer';
@@ -94,7 +94,9 @@ export function initWithDefaultIntegrations(
   const cached = getCachedClient();
   const cacheEnabled = options.cacheClient !== false;
 
-  if (cacheEnabled && cached) {
+  // A closed client drops all data. `close()` marks the client before it
+  // flushes, so this also skips a client that is still closing.
+  if (cacheEnabled && cached && !_INTERNAL_isClientClosed(cached)) {
     if (DEBUG_BUILD && cached.getOptions().dsn !== options.dsn) {
       debug.warn(
         '[Sentry] init() was called with a different DSN than the cached client of this isolate; the cached client keeps its DSN. Pass `cacheClient: false` for per-invocation options.',
@@ -145,12 +147,6 @@ export function initWithDefaultIntegrations(
 
   if (cacheEnabled && client) {
     cacheClient(client);
-    // A closed client drops all data, so the next `init()` must not reuse it.
-    client.on('close', () => {
-      if (getCachedClient() === client) {
-        _clearGlobalClientCache();
-      }
-    });
   }
 
   // An instrumented module that first evaluates AFTER this init (e.g. a driver

packages/cloudflare/src/clientCache.ts

@@ -17,7 +17,7 @@ export function cacheClient(client: CloudflareClient): void {
   (GLOBAL_OBJ as GlobalWithCloudflareClient)[GLOBAL_CLIENT_KEY] = client;
 }
 
-/** @hidden Clears the isolate's cached Cloudflare client. */
+/** @hidden Only for testing - clears the isolate's cached Cloudflare client. */
 export function _clearGlobalClientCache(): void {
   (GLOBAL_OBJ as GlobalWithCloudflareClient)[GLOBAL_CLIENT_KEY] = undefined;
 }

packages/cloudflare/test/sdk.test.ts

@@ -166,6 +166,21 @@ describe('cacheClient', () => {
     expect(init({ ...options })).toBe(second);
   });
 
+  test('sets up a new cached client while the cached client is closing', async () => {
+    const options = {
+      dsn: 'https://public@dsn.ingest.sentry.io/1337',
+    } as const;
+
+    const first = init({ ...options });
+    const closing = first!.close();
+    const second = init({ ...options });
+    await closing;
+
+    expect(second).not.toBe(first);
+    expect(second?.getOptions().enabled).not.toBe(false);
+    expect(init({ ...options })).toBe(second);
+  });
+
   test('keeps the cached client when a client that is not cached closes', async () => {
     const cached = init({ dsn: 'https://public@dsn.ingest.sentry.io/1337' });
     const uncached = init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', cacheClient: false });

packages/core/src/index.ts

@@ -58,7 +58,7 @@ export { Scope } from './scope';
 export type { CaptureContext, ScopeContext, ScopeData } from './scope';
 export { notifyEventProcessors } from './eventProcessors';
 export { getEnvelopeEndpointWithUrlEncodedAuth, getReportDialogEndpoint, SENTRY_API_VERSION } from './api';
-export { Client } from './client';
+export { Client, isClientClosed as _INTERNAL_isClientClosed } from './client';
 export {
   getActiveClient as _INTERNAL_getActiveClient,
   initAndBind,