Merge branch 'develop' into lforst-otel-for-nextjs

Author: Luca Forstner

.github/workflows/build.yml

@@ -100,6 +100,7 @@ jobs:
               - 'packages/rollup-utils/**'
               - 'packages/utils/**'
               - 'packages/types/**'
+              - 'dev-packages/test-utils/**'
             browser: &browser
               - *shared
               - 'packages/browser/**'

dev-packages/test-utils/src/event-proxy-server.ts

@@ -138,7 +138,7 @@ export async function startProxyServer(
     eventCallbackListeners.add(callbackListener);
 
     eventBuffer.forEach(bufferedEvent => {
-      if (bufferedEvent.timestamp > listenerTimestamp) {
+      if (bufferedEvent.timestamp >= listenerTimestamp) {
         callbackListener(bufferedEvent.data);
       }
     });
@@ -284,6 +284,7 @@ export async function waitForRequest(
   proxyServerName: string,
   timestamp: number,
   callback: (eventData: SentryRequestCallbackData) => Promise<boolean> | boolean,
+  timestamp: number = Date.now(),
 ): Promise<SentryRequestCallbackData> {
   const eventCallbackServerPort = await retrieveCallbackServerPort(proxyServerName);
 
@@ -340,18 +341,23 @@ export function waitForEnvelopeItem(
   proxyServerName: string,
   timestamp: number,
   callback: (envelopeItem: EnvelopeItem) => Promise<boolean> | boolean,
+  timestamp: number = Date.now(),
 ): Promise<EnvelopeItem> {
   return new Promise((resolve, reject) => {
-    waitForRequest(proxyServerName, timestamp, async eventData => {
-      const envelopeItems = eventData.envelope[1];
-      for (const envelopeItem of envelopeItems) {
-        if (await callback(envelopeItem)) {
-          resolve(envelopeItem);
-          return true;
+    waitForRequest(
+      proxyServerName,
+      async eventData => {
+        const envelopeItems = eventData.envelope[1];
+        for (const envelopeItem of envelopeItems) {
+          if (await callback(envelopeItem)) {
+            resolve(envelopeItem);
+            return true;
+          }
         }
-      }
-      return false;
-    }).catch(reject);
+        return false;
+      },
+      timestamp,
+    ).catch(reject);
   });
 }
 
@@ -362,14 +368,18 @@ export function waitForError(
 ): Promise<Event> {
   const timestamp = Date.now();
   return new Promise((resolve, reject) => {
-    waitForEnvelopeItem(proxyServerName, timestamp, async envelopeItem => {
-      const [envelopeItemHeader, envelopeItemBody] = envelopeItem;
-      if (envelopeItemHeader.type === 'event' && (await callback(envelopeItemBody as Event))) {
-        resolve(envelopeItemBody as Event);
-        return true;
-      }
-      return false;
-    }).catch(reject);
+    waitForEnvelopeItem(
+      proxyServerName,
+      async envelopeItem => {
+        const [envelopeItemHeader, envelopeItemBody] = envelopeItem;
+        if (envelopeItemHeader.type === 'event' && (await callback(envelopeItemBody as Event))) {
+          resolve(envelopeItemBody as Event);
+          return true;
+        }
+        return false;
+      },
+      timestamp,
+    ).catch(reject);
   });
 }
 
@@ -380,14 +390,18 @@ export function waitForTransaction(
 ): Promise<Event> {
   const timestamp = Date.now();
   return new Promise((resolve, reject) => {
-    waitForEnvelopeItem(proxyServerName, timestamp, async envelopeItem => {
-      const [envelopeItemHeader, envelopeItemBody] = envelopeItem;
-      if (envelopeItemHeader.type === 'transaction' && (await callback(envelopeItemBody as Event))) {
-        resolve(envelopeItemBody as Event);
-        return true;
-      }
-      return false;
-    }).catch(reject);
+    waitForEnvelopeItem(
+      proxyServerName,
+      async envelopeItem => {
+        const [envelopeItemHeader, envelopeItemBody] = envelopeItem;
+        if (envelopeItemHeader.type === 'transaction' && (await callback(envelopeItemBody as Event))) {
+          resolve(envelopeItemBody as Event);
+          return true;
+        }
+        return false;
+      },
+      timestamp,
+    ).catch(reject);
   });
 }