Skip to content

Commit 907082e

Browse files
msonnbcodex
msonnb
and
codex
committed
test(e2e): Use shared span collection helper
Co-Authored-By: OpenAI Codex <codex@openai.com>
1 parent ca36ff0 commit 907082e

13 files changed

Lines changed: 66 additions & 70 deletions

File tree

‎dev-packages/e2e-tests/test-applications/sveltekit-2-kit-tracing/tests/tracing.client.test.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expect, test } from '@playwright/test';
2-
import { collectStreamedSpans, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
2+
import { collectStreamedSpansUntilSegment, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
33
import { waitForInitialPageload } from './utils';
44

55
test.describe('client-specific performance events', () => {
@@ -53,9 +53,7 @@ test.describe('client-specific performance events', () => {
5353
});
5454

5555
test('records manually added component tracking spans', async ({ page }) => {
56-
const componentTraceSpansPromise = collectStreamedSpans('sveltekit-2-kit-tracing', spansOfTrace =>
57-
spansOfTrace.some(span => span.name === '/components' && span.is_segment),
58-
);
56+
const componentTraceSpansPromise = collectStreamedSpansUntilSegment('sveltekit-2-kit-tracing', '/components');
5957

6058
await waitForInitialPageload(page);
6159

‎dev-packages/e2e-tests/test-applications/sveltekit-2-kit-tracing/tests/tracing.server.test.ts‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import { expect, test } from '@playwright/test';
2-
import { collectStreamedSpans } from '@sentry-internal/test-utils';
2+
import { collectStreamedSpansUntilSegment } from '@sentry-internal/test-utils';
33
import { getSegmentChildSpans } from './utils';
44

55
test('server pageload request span has nested request span for sub request', async ({ page }) => {
6-
const serverTraceSpansPromise = collectStreamedSpans('sveltekit-2-kit-tracing', spansOfTrace =>
7-
spansOfTrace.some(span => span.name === 'GET /server-load-fetch' && span.is_segment),
8-
);
6+
const serverTraceSpansPromise = collectStreamedSpansUntilSegment('sveltekit-2-kit-tracing', 'GET /server-load-fetch');
97

108
await page.goto('/server-load-fetch');
119

@@ -109,9 +107,7 @@ test('server pageload request span has nested request span for sub request', asy
109107
});
110108

111109
test('server trace includes form action span', async ({ page }) => {
112-
const serverTraceSpansPromise = collectStreamedSpans('sveltekit-2-kit-tracing', spansOfTrace =>
113-
spansOfTrace.some(span => span.name === 'POST /form-action' && span.is_segment),
114-
);
110+
const serverTraceSpansPromise = collectStreamedSpansUntilSegment('sveltekit-2-kit-tracing', 'POST /form-action');
115111

116112
await page.goto('/form-action');
117113

‎dev-packages/e2e-tests/test-applications/sveltekit-2-kit-tracing/tests/tracing.test.ts‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import { expect, test } from '@playwright/test';
2-
import { collectStreamedSpans, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
2+
import {
3+
collectStreamedSpans,
4+
collectStreamedSpansUntilSegment,
5+
getSpanOp,
6+
waitForStreamedSpan,
7+
} from '@sentry-internal/test-utils';
38
import { waitForInitialPageload } from './utils';
49

510
test('capture a distributed pageload trace', async ({ page }) => {
@@ -163,8 +168,9 @@ test('captures a navigation span directly after pageload', async ({ page }) => {
163168
return getSpanOp(span) === 'pageload' && span.is_segment;
164169
});
165170

166-
const navigationTraceSpansPromise = collectStreamedSpans('sveltekit-2-kit-tracing', spansOfTrace =>
167-
spansOfTrace.some(span => getSpanOp(span) === 'navigation' && span.is_segment),
171+
const navigationTraceSpansPromise = collectStreamedSpansUntilSegment(
172+
'sveltekit-2-kit-tracing',
173+
span => getSpanOp(span) === 'navigation',
168174
);
169175

170176
await waitForInitialPageload(page, { route: '/' });
@@ -219,8 +225,9 @@ test('captures a navigation span directly after pageload', async ({ page }) => {
219225

220226
test('captures one navigation span per redirect', async ({ page }) => {
221227
const collectNavigationTrace = (route: string) =>
222-
collectStreamedSpans('sveltekit-2-kit-tracing', spansOfTrace =>
223-
spansOfTrace.some(span => getSpanOp(span) === 'navigation' && span.name === route && span.is_segment),
228+
collectStreamedSpansUntilSegment(
229+
'sveltekit-2-kit-tracing',
230+
span => getSpanOp(span) === 'navigation' && span.name === route,
224231
);
225232

226233
const redirect1TraceSpansPromise = collectNavigationTrace('/redirect1');

‎dev-packages/e2e-tests/test-applications/sveltekit-2-svelte-5/tests/performance.client.test.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expect, test } from '@playwright/test';
2-
import { collectStreamedSpans, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
2+
import { collectStreamedSpansUntilSegment, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
33
import { waitForInitialPageload } from './utils';
44

55
test.describe('client-specific performance events', () => {
@@ -53,9 +53,7 @@ test.describe('client-specific performance events', () => {
5353
});
5454

5555
test('records manually added component tracking spans', async ({ page }) => {
56-
const componentTraceSpansPromise = collectStreamedSpans('sveltekit-2-svelte-5', spansOfTrace =>
57-
spansOfTrace.some(span => span.name === '/components' && span.is_segment),
58-
);
56+
const componentTraceSpansPromise = collectStreamedSpansUntilSegment('sveltekit-2-svelte-5', '/components');
5957

6058
await waitForInitialPageload(page);
6159

‎dev-packages/e2e-tests/test-applications/sveltekit-2-svelte-5/tests/performance.server.test.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import { expect, test } from '@playwright/test';
2-
import { collectStreamedSpans } from '@sentry-internal/test-utils';
2+
import { collectStreamedSpansUntilSegment } from '@sentry-internal/test-utils';
33

44
test('server pageload request span has nested request span for sub request', async ({ page }) => {
5-
const serverTraceSpansPromise = collectStreamedSpans('sveltekit-2-svelte-5', spansOfTrace =>
6-
spansOfTrace.some(span => span.name === 'GET /server-load-fetch' && span.is_segment),
7-
);
5+
const serverTraceSpansPromise = collectStreamedSpansUntilSegment('sveltekit-2-svelte-5', 'GET /server-load-fetch');
86

97
await page.goto('/server-load-fetch');
108

‎dev-packages/e2e-tests/test-applications/sveltekit-2-svelte-5/tests/performance.test.ts‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import { expect, test } from '@playwright/test';
2-
import { collectStreamedSpans, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
2+
import {
3+
collectStreamedSpans,
4+
collectStreamedSpansUntilSegment,
5+
getSpanOp,
6+
waitForStreamedSpan,
7+
} from '@sentry-internal/test-utils';
38
import { waitForInitialPageload } from './utils';
49

510
test.describe('performance events', () => {
@@ -157,8 +162,9 @@ test.describe('performance events', () => {
157162
return getSpanOp(span) === 'pageload' && span.is_segment;
158163
});
159164

160-
const navigationTraceSpansPromise = collectStreamedSpans('sveltekit-2-svelte-5', spansOfTrace =>
161-
spansOfTrace.some(span => getSpanOp(span) === 'navigation' && span.is_segment),
165+
const navigationTraceSpansPromise = collectStreamedSpansUntilSegment(
166+
'sveltekit-2-svelte-5',
167+
span => getSpanOp(span) === 'navigation',
162168
);
163169

164170
await waitForInitialPageload(page, { route: '/' });
@@ -213,8 +219,9 @@ test.describe('performance events', () => {
213219

214220
test('captures one navigation span per redirect', async ({ page }) => {
215221
const collectNavigationTrace = (route: string) =>
216-
collectStreamedSpans('sveltekit-2-svelte-5', spansOfTrace =>
217-
spansOfTrace.some(span => getSpanOp(span) === 'navigation' && span.name === route && span.is_segment),
222+
collectStreamedSpansUntilSegment(
223+
'sveltekit-2-svelte-5',
224+
span => getSpanOp(span) === 'navigation' && span.name === route,
218225
);
219226

220227
const redirect1TraceSpansPromise = collectNavigationTrace('/redirect1');

‎dev-packages/e2e-tests/test-applications/sveltekit-2/tests/db.test.ts‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import { expect, test } from '@playwright/test';
2-
import { collectStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';
2+
import { collectStreamedSpansUntilSegment, getSpanOp } from '@sentry-internal/test-utils';
33

44
test('Instruments ioredis automatically', async ({ baseURL }) => {
5-
const traceSpansPromise = collectStreamedSpans('sveltekit-2', spansOfTrace =>
6-
spansOfTrace.some(span => getSpanOp(span) === 'http.server' && span.name === 'GET /db-ioredis' && span.is_segment),
7-
);
5+
const traceSpansPromise = collectStreamedSpansUntilSegment('sveltekit-2', 'GET /db-ioredis');
86

97
await fetch(`${baseURL}/db-ioredis`);
108

@@ -39,9 +37,7 @@ test('Instruments ioredis automatically', async ({ baseURL }) => {
3937
});
4038

4139
test('Instruments mysql automatically', async ({ baseURL }) => {
42-
const traceSpansPromise = collectStreamedSpans('sveltekit-2', spansOfTrace =>
43-
spansOfTrace.some(span => getSpanOp(span) === 'http.server' && span.name === 'GET /db-mysql' && span.is_segment),
44-
);
40+
const traceSpansPromise = collectStreamedSpansUntilSegment('sveltekit-2', 'GET /db-mysql');
4541

4642
await fetch(`${baseURL}/db-mysql`);
4743

‎dev-packages/e2e-tests/test-applications/sveltekit-2/tests/performance.client.test.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expect, test } from '@playwright/test';
2-
import { collectStreamedSpans, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
2+
import { collectStreamedSpansUntilSegment, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
33
import { waitForInitialPageload } from './utils';
44

55
test.describe('client-specific performance events', () => {
@@ -48,9 +48,7 @@ test.describe('client-specific performance events', () => {
4848
});
4949

5050
test('records manually added component tracking spans', async ({ page }) => {
51-
const componentTraceSpansPromise = collectStreamedSpans('sveltekit-2', spansOfTrace =>
52-
spansOfTrace.some(span => span.name === '/components' && span.is_segment),
53-
);
51+
const componentTraceSpansPromise = collectStreamedSpansUntilSegment('sveltekit-2', '/components');
5452

5553
await waitForInitialPageload(page);
5654

‎dev-packages/e2e-tests/test-applications/sveltekit-2/tests/performance.server.test.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import { expect, test } from '@playwright/test';
2-
import { collectStreamedSpans, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
2+
import { collectStreamedSpansUntilSegment, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
33

44
test('server pageload request span has nested request span for sub request', async ({ page }) => {
5-
const serverTraceSpansPromise = collectStreamedSpans('sveltekit-2', spansOfTrace =>
6-
spansOfTrace.some(span => span.name === 'GET /server-load-fetch' && span.is_segment),
7-
);
5+
const serverTraceSpansPromise = collectStreamedSpansUntilSegment('sveltekit-2', 'GET /server-load-fetch');
86

97
await page.goto('/server-load-fetch');
108

‎dev-packages/e2e-tests/test-applications/sveltekit-2/tests/performance.test.ts‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import { expect, test } from '@playwright/test';
2-
import { collectStreamedSpans, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
2+
import {
3+
collectStreamedSpans,
4+
collectStreamedSpansUntilSegment,
5+
getSpanOp,
6+
waitForStreamedSpan,
7+
} from '@sentry-internal/test-utils';
38
import { waitForInitialPageload } from './utils';
49

510
test.describe('performance events', () => {
@@ -157,8 +162,9 @@ test.describe('performance events', () => {
157162
return getSpanOp(span) === 'pageload' && span.is_segment;
158163
});
159164

160-
const navigationTraceSpansPromise = collectStreamedSpans('sveltekit-2', spansOfTrace =>
161-
spansOfTrace.some(span => getSpanOp(span) === 'navigation' && span.is_segment),
165+
const navigationTraceSpansPromise = collectStreamedSpansUntilSegment(
166+
'sveltekit-2',
167+
span => getSpanOp(span) === 'navigation',
162168
);
163169

164170
await waitForInitialPageload(page, { route: '/' });
@@ -213,9 +219,7 @@ test.describe('performance events', () => {
213219

214220
test('captures one navigation span per redirect', async ({ page }) => {
215221
const collectNavigationTrace = (route: string) =>
216-
collectStreamedSpans('sveltekit-2', spansOfTrace =>
217-
spansOfTrace.some(span => getSpanOp(span) === 'navigation' && span.name === route && span.is_segment),
218-
);
222+
collectStreamedSpansUntilSegment('sveltekit-2', span => getSpanOp(span) === 'navigation' && span.name === route);
219223

220224
const redirect1TraceSpansPromise = collectNavigationTrace('/redirect1');
221225
const redirect2TraceSpansPromise = collectNavigationTrace('/redirect2');

0 commit comments

Comments
 (0)