From b10e5500c3330f1a644dca1b54d72e6bad9cf034 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Thu, 23 Feb 2023 15:21:40 +0100
Subject: [PATCH 1/2] test(replay): Potentially fix flaky xhr/fetch request
 tests

change order of actions and awaiting requests

use Promise.all in xhr test

reduce flush mindelay, increase maxdelay

explicitly await request response

simplify waitForResponse

skip tests on firefox

cleanup test
---
 .../suites/replay/requests/init.js            |  6 ++--
 .../suites/replay/requests/test.ts            | 30 +++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/packages/integration-tests/suites/replay/requests/init.js b/packages/integration-tests/suites/replay/requests/init.js
index 639cf05628e4..3050c796525e 100644
--- a/packages/integration-tests/suites/replay/requests/init.js
+++ b/packages/integration-tests/suites/replay/requests/init.js
@@ -2,9 +2,9 @@ import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
 window.Replay = new Sentry.Replay({
-  flushMinDelay: 500,
-  flushMaxDelay: 500,
-  useCompression: true,
+  flushMinDelay: 200,
+  flushMaxDelay: 2000,
+  useCompression: false,
 });
 
 Sentry.init({
diff --git a/packages/integration-tests/suites/replay/requests/test.ts b/packages/integration-tests/suites/replay/requests/test.ts
index fa5a1bdcf7c0..3b711afbfe88 100644
--- a/packages/integration-tests/suites/replay/requests/test.ts
+++ b/packages/integration-tests/suites/replay/requests/test.ts
@@ -4,8 +4,11 @@ import { sentryTest } from '../../../utils/fixtures';
 import { expectedFetchPerformanceSpan, expectedXHRPerformanceSpan } from '../../../utils/replayEventTemplates';
 import { getReplayRecordingContent, shouldSkipReplayTest, waitForReplayRequest } from '../../../utils/replayHelpers';
 
-sentryTest('replay recording should contain fetch request span', async ({ getLocalTestPath, page }) => {
-  if (shouldSkipReplayTest()) {
+sentryTest('replay recording should contain fetch request span', async ({ getLocalTestPath, page, browserName }) => {
+  // For some reason, observing and waiting for requests in firefox is extremely flaky.
+  // We therefore skip this test for firefox and only test on chromium/webkit.
+  // Possibly related: https://github.com/microsoft/playwright/issues/11390
+  if (shouldSkipReplayTest() || browserName === 'firefox') {
     sentryTest.skip();
   }
 
@@ -31,18 +34,23 @@ sentryTest('replay recording should contain fetch request span', async ({ getLoc
   const url = await getLocalTestPath({ testDir: __dirname });
 
   await page.goto(url);
-  await page.click('#fetch');
   await page.click('#go-background');
-
   const { performanceSpans: spans0 } = getReplayRecordingContent(await reqPromise0);
+
+  const receivedResponse = page.waitForResponse('https://example.com');
+  await page.click('#fetch');
+  await receivedResponse;
+
   const { performanceSpans: spans1 } = getReplayRecordingContent(await reqPromise1);
-  const performanceSpans = [...spans0, ...spans1];
 
+  const performanceSpans = [...spans0, ...spans1];
   expect(performanceSpans).toContainEqual(expectedFetchPerformanceSpan);
 });
 
-sentryTest('replay recording should contain XHR request span', async ({ getLocalTestPath, page }) => {
-  if (shouldSkipReplayTest()) {
+sentryTest('replay recording should contain XHR request span', async ({ getLocalTestPath, page, browserName }) => {
+  // For some reason, observing and waiting for requests in firefox is extremely flaky.
+  // We therefore skip this test for firefox and only test on chromium/webkit.
+  if (shouldSkipReplayTest() || browserName === 'firefox') {
     sentryTest.skip();
   }
 
@@ -68,11 +76,15 @@ sentryTest('replay recording should contain XHR request span', async ({ getLocal
   const url = await getLocalTestPath({ testDir: __dirname });
 
   await page.goto(url);
-  await page.click('#xhr');
   await page.click('#go-background');
-
   const { performanceSpans: spans0 } = getReplayRecordingContent(await reqPromise0);
+
+  const receivedResponse = page.waitForResponse('https://example.com');
+  await page.click('#xhr');
+  await receivedResponse;
+
   const { performanceSpans: spans1 } = getReplayRecordingContent(await reqPromise1);
+
   const performanceSpans = [...spans0, ...spans1];
 
   expect(performanceSpans).toContainEqual(expectedXHRPerformanceSpan);

From 44468e0f4c6210a4cfdbb8ee85dcda4c1bb9cf1c Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Tue, 28 Feb 2023 10:30:25 +0100
Subject: [PATCH 2/2] reset nim/max delays

seems ok
---
 packages/integration-tests/suites/replay/requests/init.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/integration-tests/suites/replay/requests/init.js b/packages/integration-tests/suites/replay/requests/init.js
index 3050c796525e..db6a0aa21821 100644
--- a/packages/integration-tests/suites/replay/requests/init.js
+++ b/packages/integration-tests/suites/replay/requests/init.js
@@ -2,8 +2,8 @@ import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
 window.Replay = new Sentry.Replay({
-  flushMinDelay: 200,
-  flushMaxDelay: 2000,
+  flushMinDelay: 500,
+  flushMaxDelay: 500,
   useCompression: false,
 });