test(e2e): Use collectStreamedSpansUntilSegment helper in nitro-3 tests

Replace the hand-rolled accumulate-until-segment logic with the shared
test-utils helper, as suggested in review. The helper already scopes the
result to the matched trace, so the per-trace filtering falls away.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: s1gr1d

dev-packages/e2e-tests/test-applications/nitro-3/tests/cache.test.ts

@@ -1,21 +1,17 @@
 import { expect, test } from '@playwright/test';
-import { collectStreamedSpans } from '@sentry-internal/test-utils';
+import { collectStreamedSpansUntilSegment } from '@sentry-internal/test-utils';
 
 test.describe('Cache Instrumentation', () => {
   const SEMANTIC_ATTRIBUTE_CACHE_KEY = 'cache.key';
   const SEMANTIC_ATTRIBUTE_CACHE_HIT = 'cache.hit';
 
-  // Streamed spans arrive across several envelopes (a child can flush before its segment),
-  // so accumulate until the segment span has arrived and filter by its trace.
   async function collectCacheSpans() {
-    const spans = await collectStreamedSpans('nitro-3', spans =>
-      spans.some(span => span.is_segment && span.attributes['url.path']?.value === '/api/test-cache'),
+    const spans = await collectStreamedSpansUntilSegment(
+      'nitro-3',
+      span => span.attributes['url.path']?.value === '/api/test-cache',
     );
-    const segmentSpan = spans.find(span => span.is_segment && span.attributes['url.path']?.value === '/api/test-cache');
 
-    return spans.filter(
-      span => span.trace_id === segmentSpan?.trace_id && span.attributes['sentry.origin']?.value === 'auto.cache.nitro',
-    );
+    return spans.filter(span => span.attributes['sentry.origin']?.value === 'auto.cache.nitro');
   }
 
   test('instruments cachedFunction and cachedHandler calls and creates spans with correct attributes', async ({

dev-packages/e2e-tests/test-applications/nitro-3/tests/span-nesting.test.ts

@@ -1,20 +1,12 @@
 import { expect, test } from '@playwright/test';
-import { collectStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';
+import { collectStreamedSpansUntilSegment, getSpanOp } from '@sentry-internal/test-utils';
 
-// Streamed spans arrive across several envelopes (a child can flush before its segment),
-// so accumulate until the segment span has arrived and filter by its trace.
-async function collectNestingSpans() {
-  const spans = await collectStreamedSpans('nitro-3', spans =>
-    spans.some(span => span.is_segment && span.name === 'GET /api/test-nesting'),
-  );
-  const segmentSpan = spans.find(span => span.is_segment && span.name === 'GET /api/test-nesting');
-  return spans.filter(span => span.trace_id === segmentSpan?.trace_id);
+function collectNestingSpans() {
+  return collectStreamedSpansUntilSegment('nitro-3', 'GET /api/test-nesting');
 }
 
 test('Span nesting: all spans share the same trace_id', async ({ request }) => {
-  const spansPromise = collectStreamedSpans('nitro-3', spans =>
-    spans.some(span => span.is_segment && span.name === 'GET /api/test-nesting'),
-  );
+  const spansPromise = collectNestingSpans();
 
   await request.get('/api/test-nesting');
 

dev-packages/e2e-tests/test-applications/nitro-3/tests/storage-aliases.test.ts

@@ -1,17 +1,10 @@
 import { expect, test } from '@playwright/test';
-import { collectStreamedSpans } from '@sentry-internal/test-utils';
+import { collectStreamedSpansUntilSegment } from '@sentry-internal/test-utils';
 
-// Streamed spans arrive across several envelopes (a child can flush before its segment),
-// so accumulate until the segment span has arrived and filter by its trace.
 async function collectStorageSpans(route: string) {
-  const spans = await collectStreamedSpans('nitro-3', spans =>
-    spans.some(span => span.is_segment && span.attributes['url.path']?.value === route),
-  );
-  const segmentSpan = spans.find(span => span.is_segment && span.attributes['url.path']?.value === route);
+  const spans = await collectStreamedSpansUntilSegment('nitro-3', span => span.attributes['url.path']?.value === route);
 
-  return spans.filter(
-    span => span.trace_id === segmentSpan?.trace_id && span.attributes['sentry.origin']?.value === 'auto.cache.nitro',
-  );
+  return spans.filter(span => span.attributes['sentry.origin']?.value === 'auto.cache.nitro');
 }
 
 test.describe('Storage Instrumentation - Aliases', () => {

dev-packages/e2e-tests/test-applications/nitro-3/tests/storage.test.ts

@@ -1,17 +1,10 @@
 import { expect, test } from '@playwright/test';
-import { collectStreamedSpans } from '@sentry-internal/test-utils';
+import { collectStreamedSpansUntilSegment } from '@sentry-internal/test-utils';
 
-// Streamed spans arrive across several envelopes (a child can flush before its segment),
-// so accumulate until the segment span has arrived and filter by its trace.
 async function collectStorageSpans(route: string) {
-  const spans = await collectStreamedSpans('nitro-3', spans =>
-    spans.some(span => span.is_segment && span.attributes['url.path']?.value === route),
-  );
-  const segmentSpan = spans.find(span => span.is_segment && span.attributes['url.path']?.value === route);
-
-  return spans.filter(
-    span => span.trace_id === segmentSpan?.trace_id && span.attributes['sentry.origin']?.value === 'auto.cache.nitro',
-  );
+  const spans = await collectStreamedSpansUntilSegment('nitro-3', span => span.attributes['url.path']?.value === route);
+
+  return spans.filter(span => span.attributes['sentry.origin']?.value === 'auto.cache.nitro');
 }
 
 test.describe('Storage Instrumentation', () => {