ref(replay): Make addMemoryEntry and createPerformanceSpans to sync

Author: mydea

packages/replay/src/coreHandlers/handleFetch.ts

@@ -61,7 +61,7 @@ export function handleFetchSpanListener(replay: ReplayContainer): (handlerData:
     }
 
     replay.addUpdate(() => {
-      void createPerformanceSpans(replay, [result]);
+      createPerformanceSpans(replay, [result]);
       // Returning true will cause `addUpdate` to not flush
       // We do not want network requests to cause a flush. This will prevent
       // recurring/polling requests from keeping the replay session alive.

packages/replay/src/coreHandlers/handleHistory.ts

@@ -43,7 +43,7 @@ export function handleHistorySpanListener(replay: ReplayContainer): (handlerData
     replay.triggerUserActivity();
 
     replay.addUpdate(() => {
-      void createPerformanceSpans(replay, [result]);
+      createPerformanceSpans(replay, [result]);
       // Returning false to flush
       return false;
     });

packages/replay/src/coreHandlers/handleXhr.ts

@@ -80,7 +80,7 @@ export function handleXhrSpanListener(replay: ReplayContainer): (handlerData: Xh
     }
 
     replay.addUpdate(() => {
-      void createPerformanceSpans(replay, [result]);
+      createPerformanceSpans(replay, [result]);
       // Returning true will cause `addUpdate` to not flush
       // We do not want network requests to cause a flush. This will prevent
       // recurring/polling requests from keeping the replay session alive.

packages/replay/src/replay.ts

@@ -696,12 +696,12 @@ export class ReplayContainer implements ReplayContainerInterface {
    * Observed performance events are added to `this.performanceEvents`. These
    * are included in the replay event before it is finished and sent to Sentry.
    */
-  addPerformanceEntries(): Promise<void[]> {
+  addPerformanceEntries(): void {
     // Copy and reset entries before processing
     const entries = [...this.performanceEvents];
     this.performanceEvents = [];
 
-    return createPerformanceSpans(this, createPerformanceEntries(entries));
+    createPerformanceSpans(this, createPerformanceEntries(entries));
   }
 
   /**

packages/replay/src/util/addMemoryEntry.ts

@@ -6,14 +6,14 @@ import { createPerformanceSpans } from './createPerformanceSpans';
  * Create a "span" for the total amount of memory being used by JS objects
  * (including v8 internal objects).
  */
-export function addMemoryEntry(replay: ReplayContainer): Promise<void[]> | undefined {
+export function addMemoryEntry(replay: ReplayContainer): void {
   // window.performance.memory is a non-standard API and doesn't work on all browsers, so we try-catch this
   try {
-    return createPerformanceSpans(replay, [
+    createPerformanceSpans(replay, [
       // @ts-ignore memory doesn't exist on type Performance as the API is non-standard (we check that it exists above)
       createMemoryEntry(WINDOW.performance.memory),
     ]);
   } catch (error) {
-    return;
+    // Do nothing
   }
 }

packages/replay/src/util/createPerformanceSpans.ts

@@ -7,23 +7,21 @@ import { addEvent } from './addEvent';
 /**
  * Create a "span" for each performance entry. The parent transaction is `this.replayEvent`.
  */
-export function createPerformanceSpans(replay: ReplayContainer, entries: ReplayPerformanceEntry[]): Promise<void[]> {
-  return Promise.all(
-    entries.map(({ type, start, end, name, data }) =>
-      addEvent(replay, {
-        type: EventType.Custom,
-        timestamp: start,
-        data: {
-          tag: 'performanceSpan',
-          payload: {
-            op: type,
-            description: name,
-            startTimestamp: start,
-            endTimestamp: end,
-            data,
-          },
+export function createPerformanceSpans(replay: ReplayContainer, entries: ReplayPerformanceEntry[]): void {
+  entries.map(({ type, start, end, name, data }) =>
+    addEvent(replay, {
+      type: EventType.Custom,
+      timestamp: start,
+      data: {
+        tag: 'performanceSpan',
+        payload: {
+          op: type,
+          description: name,
+          startTimestamp: start,
+          endTimestamp: end,
+          data,
         },
-      }),
-    ),
+      },
+    }),
   );
 }

packages/replay/test/unit/flush.test.ts

@@ -179,8 +179,8 @@ it('long first flush enqueues following events', async () => {
   });
 
   // Add this to test that segment ID increases
-  mockAddPerformanceEntries.mockImplementationOnce(async () => {
-    return createPerformanceSpans(
+  mockAddPerformanceEntries.mockImplementationOnce(() => {
+    createPerformanceSpans(
       replay,
       createPerformanceEntries([
         {