try with num ordering

Author: mydea

packages/integration-tests/suites/replay/sessionMaxAge/test.ts

@@ -25,8 +25,9 @@ for (let i = 0; i < 100; i++) {
       sentryTest.skip();
     }
 
-    const reqPromise0 = waitForReplayRequest(page, 0);
-    const reqPromise1 = waitForReplayRequest(page, 1);
+    const reqPromise0 = waitForReplayRequest(page, { requestNum: 0 });
+    const reqPromise1 = waitForReplayRequest(page, { requestNum: 1 });
+    const reqPromise2 = waitForReplayRequest(page, { requestNum: 2 });
 
     await page.route('https://dsn.ingest.sentry.io/**/*', route => {
       return route.fulfill({
@@ -55,9 +56,6 @@ for (let i = 0; i < 100; i++) {
     const stringifiedSnapshot = normalize(fullSnapshots0[0]);
     expect(stringifiedSnapshot).toMatchSnapshot('snapshot-0.json');
 
-    // We wait for another segment 0
-    const reqPromise2 = waitForReplayRequest(page, 0);
-
     // Wait for an incremental snapshot
     // Wait half of the session max age (after initial flush), but account for potentially slow runners
     const timePassed1 = Date.now() - startTimestamp;

packages/integration-tests/utils/replayHelpers.ts

@@ -37,8 +37,16 @@ type SnapshotNode = {
  * @param segmentId the segment_id of the replay event
  * @returns
  */
-export function waitForReplayRequest(page: Page, segmentId?: number): Promise<Response> {
-  return page.waitForResponse(res => {
+export async function waitForReplayRequest(
+  page: Page,
+  segmentIdOrOptions?: number | { segmentId?: number; requestNum?: number },
+): Promise<Response> {
+  let replayRequestCounter = 0;
+
+  const segmentId = typeof segmentIdOrOptions === 'number' ? segmentIdOrOptions : segmentIdOrOptions?.segmentId;
+  const requestNum = typeof segmentIdOrOptions === 'number' ? undefined : segmentIdOrOptions?.requestNum;
+
+  const response = await page.waitForResponse(res => {
     const req = res.request();
 
     const postData = req.postData();
@@ -53,6 +61,13 @@ export function waitForReplayRequest(page: Page, segmentId?: number): Promise<Re
         return false;
       }
 
+      const currentRequestNum = replayRequestCounter;
+      replayRequestCounter++;
+
+      if (requestNum !== undefined) {
+        return currentRequestNum === requestNum;
+      }
+
       if (segmentId !== undefined) {
         return event.segment_id === segmentId;
       }
@@ -62,6 +77,8 @@ export function waitForReplayRequest(page: Page, segmentId?: number): Promise<Re
       return false;
     }
   });
+
+  return response;
 }
 
 export function isReplayEvent(event: Event): event is ReplayEvent {