decrease bundle size hit, fix unit test

Author: Lms24

packages/browser/src/tracing/request.ts

@@ -260,6 +260,11 @@ function addHTTPTimings(span: Span, client: Client): void {
     return;
   }
 
+  // Clean up the performance observer and other resources
+  // We have to wait here because otherwise this cleans itself up before it is fully done.
+  // Default (non-streaming): just deregister the observer.
+  let onEntryFound = (): void => void setTimeout(cleanup);
+
   // For streamed spans, we have to artificially delay the ending of the span until we
   // either receive the timing data, or HTTP_TIMING_WAIT_MS elapses.
   if (hasSpanStreamingEnabled(client)) {
@@ -276,36 +281,24 @@ function addHTTPTimings(span: Span, client: Client): void {
         return;
       }
       isEnded = true;
-      // In the next tick, clean up the performance observer
-      // We have to wait here because otherwise we clean it up before it is fully done
       setTimeout(cleanup);
       originalEnd(capturedEndTimestamp);
       clearTimeout(fallbackTimeout);
     };
 
-    const cleanup = addPerformanceInstrumentationHandler('resource', ({ entries }) => {
-      entries.forEach(entry => {
-        if (isPerformanceResourceTiming(entry) && entry.name.endsWith(url)) {
-          span.setAttributes(resourceTimingToSpanAttributes(entry));
-          endSpanAndCleanup();
-        }
-      });
-    });
+    onEntryFound = endSpanAndCleanup;
 
     // Fallback: always end the span after HTTP_TIMING_WAIT_MS even if no
     // PerformanceResourceTiming entry arrives (e.g. cross-origin without
     // Timing-Allow-Origin, or the browser didn't fire the observer in time).
     const fallbackTimeout = setTimeout(endSpanAndCleanup, HTTP_TIMING_WAIT_MS);
-    return;
   }
 
   const cleanup = addPerformanceInstrumentationHandler('resource', ({ entries }) => {
     entries.forEach(entry => {
       if (isPerformanceResourceTiming(entry) && entry.name.endsWith(url)) {
         span.setAttributes(resourceTimingToSpanAttributes(entry));
-        // In the next tick, clean this handler up
-        // We have to wait here because otherwise this cleans itself up before it is fully done
-        setTimeout(cleanup);
+        onEntryFound();
       }
     });
   });

packages/browser/test/integrations/spanstreaming.test.ts

@@ -171,7 +171,8 @@ describe('spanStreamingIntegration', () => {
     expect(mockSpanBufferInstance.flush).not.toHaveBeenCalled();
   });
 
-  it('flushes the trace when the segment span ends', () => {
+  it('flushes the trace when the segment span ends after a delay for close to finished child spans', () => {
+    vi.useFakeTimers();
     const client = new BrowserClient({
       ...getDefaultBrowserClientOptions(),
       dsn: 'https://username@domain/123',
@@ -185,6 +186,10 @@ describe('spanStreamingIntegration', () => {
     const span = new SentryCore.SentrySpan({ name: 'test' });
     client.emit('afterSegmentSpanEnd', span);
 
+    vi.advanceTimersByTime(500);
+
     expect(mockSpanBufferInstance.flush).toHaveBeenCalledWith(span.spanContext().traceId);
+
+    vi.useRealTimers();
   });
 });