debug

Author: RulaKhaled

packages/cloudflare/test/request.test.ts

@@ -91,12 +91,24 @@ describe('withSentry', () => {
   });
 
   test('flush must be called when all waitUntil are done', async () => {
-    const flushSpy = vi.spyOn(SentryCore.Client.prototype, 'flush').mockImplementation(async function (this: any) {
-      const callNum = flushSpy.mock.calls.length;
-      console.log(`[FLUSH #${callNum}] Client: ${this?.constructor?.name || 'unknown'}`);
-      const stack = new Error().stack?.split('\n').slice(2, 7).join('\n  ');
+    let flushCallCount = 0;
+    const originalFlush = SentryCore.Client.prototype.flush;
+
+    const flushSpy = vi.spyOn(SentryCore.Client.prototype, 'flush').mockImplementation(async function (
+      this: any,
+      timeout?: number,
+    ) {
+      flushCallCount++;
+      console.log(`[FLUSH #${flushCallCount}] Client: ${this?.constructor?.name || 'unknown'}, timeout: ${timeout}`);
+      const stack = new Error().stack?.split('\n').slice(2, 10).join('\n  ');
       console.log(`  Stack:\n  ${stack}`);
-      return true;
+      console.log(`  this._flushLock:`, this._flushLock ? 'exists' : 'undefined');
+      console.log(
+        `  Recursion check: flushCallCount=${flushCallCount}, spy.calls.length=${flushSpy.mock.calls.length}`,
+      );
+
+      // Important: Return a resolved promise to avoid triggering parent flush logic
+      return Promise.resolve(true);
     });
     flushSpy.mockClear(); // Explicitly clear before test
 
@@ -105,13 +117,32 @@ describe('withSentry', () => {
       vi.useRealTimers();
       flushSpy.mockRestore();
     });
+    let pendingCount = 0;
     const waits: Promise<unknown>[] = [];
     const waitUntil = vi.fn(promise => {
       const callNum = waitUntil.mock.calls.length;
-      console.log(`[WAITUNTIL #${callNum}]`);
+      pendingCount++;
+      console.log(
+        `[WAITUNTIL #${callNum}] Pending: ${pendingCount}, Promise type: ${promise?.constructor?.name || 'unknown'}`,
+      );
       const stack = new Error().stack?.split('\n').slice(2, 5).join('\n  ');
       console.log(`  Stack:\n  ${stack}`);
-      waits.push(promise);
+
+      // Wrap the promise to log when it resolves
+      const wrappedPromise = promise.then(
+        val => {
+          pendingCount--;
+          console.log(`[WAITUNTIL #${callNum} RESOLVED] Pending now: ${pendingCount}`);
+          return val;
+        },
+        err => {
+          pendingCount--;
+          console.log(`[WAITUNTIL #${callNum} REJECTED] Pending now: ${pendingCount}`, err);
+          throw err;
+        },
+      );
+
+      waits.push(wrappedPromise);
     });
 
     const context = {