Skip to content

Commit 7c7d53d

Browse files
nicohrubecnicohrubec
committed
export span streaming from cdn bundles
1 parent be13537 commit 7c7d53d

71 files changed

Lines changed: 178 additions & 115 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dev-packages/browser-integration-tests/suites/integrations/cultureContext-streamed/test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { expect } from '@playwright/test';
22
import { sentryTest } from '../../../utils/fixtures';
33
import { getSpanOp, waitForStreamedSpans } from '../../../utils/spanUtils';
4-
import { shouldSkipTracingTest, testingCdnBundle } from '../../../utils/helpers';
4+
import { shouldSkipTracingTest } from '../../../utils/helpers';
55

66
sentryTest('cultureContextIntegration captures locale, timezone, and calendar', async ({ getLocalTestUrl, page }) => {
7-
sentryTest.skip(shouldSkipTracingTest() || testingCdnBundle());
7+
sentryTest.skip(shouldSkipTracingTest());
88
const url = await getLocalTestUrl({ testDir: __dirname });
99

1010
const spansPromise = waitForStreamedSpans(page, spans => spans.some(s => getSpanOp(s) === 'pageload'));

‎dev-packages/browser-integration-tests/suites/public-api/beforeSendSpan-streamed/test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { expect } from '@playwright/test';
22
import { sentryTest } from '../../../utils/fixtures';
3-
import { shouldSkipTracingTest, testingCdnBundle } from '../../../utils/helpers';
3+
import { shouldSkipTracingTest } from '../../../utils/helpers';
44
import { getSpanOp, waitForStreamedSpan } from '../../../utils/spanUtils';
55

66
sentryTest('beforeSendSpan applies changes to streamed span', async ({ getLocalTestUrl, page }) => {
7-
sentryTest.skip(shouldSkipTracingTest() || testingCdnBundle());
7+
sentryTest.skip(shouldSkipTracingTest());
88

99
const url = await getLocalTestUrl({ testDir: __dirname });
1010

‎dev-packages/browser-integration-tests/suites/public-api/startSpan/streamed/test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import {
1111
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
1212
} from '@sentry/core';
1313
import { sentryTest } from '../../../../utils/fixtures';
14-
import { shouldSkipTracingTest, testingCdnBundle } from '../../../../utils/helpers';
14+
import { shouldSkipTracingTest } from '../../../../utils/helpers';
1515
import { waitForStreamedSpanEnvelope } from '../../../../utils/spanUtils';
1616

1717
sentryTest(
1818
'sends a streamed span envelope if spanStreamingIntegration is enabled',
1919
async ({ getLocalTestUrl, page }) => {
20-
sentryTest.skip(shouldSkipTracingTest() || testingCdnBundle());
20+
sentryTest.skip(shouldSkipTracingTest());
2121

2222
const spanEnvelopePromise = waitForStreamedSpanEnvelope(page);
2323

‎dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-pageload-streamed/test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { expect } from '@playwright/test';
22
import { sentryTest } from '../../../../utils/fixtures';
3-
import { shouldSkipTracingTest, testingCdnBundle } from '../../../../utils/helpers';
3+
import { shouldSkipTracingTest } from '../../../../utils/helpers';
44
import { getSpanOp, waitForStreamedSpan } from '../../../../utils/spanUtils';
55

66
sentryTest('finishes streamed pageload span when the page goes background', async ({ getLocalTestUrl, page }) => {
7-
sentryTest.skip(shouldSkipTracingTest() || testingCdnBundle());
7+
sentryTest.skip(shouldSkipTracingTest());
88
const url = await getLocalTestUrl({ testDir: __dirname });
99
const pageloadSpanPromise = waitForStreamedSpan(page, span => getSpanOp(span) === 'pageload');
1010

‎dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/http-timings-streamed/test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { expect } from '@playwright/test';
22
import { sentryTest } from '../../../../utils/fixtures';
3-
import { shouldSkipTracingTest, testingCdnBundle } from '../../../../utils/helpers';
3+
import { shouldSkipTracingTest } from '../../../../utils/helpers';
44
import { getSpanOp, waitForStreamedSpans } from '../../../../utils/spanUtils';
55

66
sentryTest(
77
'adds http timing to http.client spans in span streaming mode',
88
async ({ browserName, getLocalTestUrl, page }) => {
99
const supportedBrowsers = ['chromium', 'firefox'];
1010

11-
sentryTest.skip(shouldSkipTracingTest() || !supportedBrowsers.includes(browserName) || testingCdnBundle());
11+
sentryTest.skip(shouldSkipTracingTest() || !supportedBrowsers.includes(browserName));
1212

1313
await page.route('http://sentry-test-site.example/*', async route => {
1414
const request = route.request();

‎dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/interactions-streamed/test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import {
1111
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
1212
} from '@sentry/core';
1313
import { sentryTest } from '../../../../utils/fixtures';
14-
import { shouldSkipTracingTest, testingCdnBundle } from '../../../../utils/helpers';
14+
import { shouldSkipTracingTest } from '../../../../utils/helpers';
1515
import { getSpanOp, waitForStreamedSpan, waitForStreamedSpans } from '../../../../utils/spanUtils';
1616

1717
sentryTest('captures streamed interaction span tree. @firefox', async ({ browserName, getLocalTestUrl, page }) => {
1818
const supportedBrowsers = ['chromium', 'firefox'];
1919

20-
sentryTest.skip(shouldSkipTracingTest() || !supportedBrowsers.includes(browserName) || testingCdnBundle());
20+
sentryTest.skip(shouldSkipTracingTest() || !supportedBrowsers.includes(browserName));
2121
const url = await getLocalTestUrl({ testDir: __dirname });
2222

2323
const interactionSpansPromise = waitForStreamedSpans(page, spans =>

‎dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces-streamed/consistent-sampling/default/test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { expect } from '@playwright/test';
22
import { extractTraceparentData, parseBaggageHeader, SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
33
import { sentryTest } from '../../../../../../utils/fixtures';
4-
import { shouldSkipTracingTest, testingCdnBundle, waitForTracingHeadersOnUrl } from '../../../../../../utils/helpers';
4+
import { shouldSkipTracingTest, waitForTracingHeadersOnUrl } from '../../../../../../utils/helpers';
55
import { getSpanOp, waitForStreamedSpanEnvelope } from '../../../../../../utils/spanUtils';
66

77
sentryTest.describe('When `consistentTraceSampling` is `true`', () => {
88
sentryTest('continues sampling decision from initial pageload span', async ({ getLocalTestUrl, page }) => {
9-
sentryTest.skip(shouldSkipTracingTest() || testingCdnBundle());
9+
sentryTest.skip(shouldSkipTracingTest());
1010

1111
const url = await getLocalTestUrl({ testDir: __dirname });
1212

@@ -80,7 +80,7 @@ sentryTest.describe('When `consistentTraceSampling` is `true`', () => {
8080
});
8181

8282
sentryTest('Propagates continued sampling decision to outgoing requests', async ({ page, getLocalTestUrl }) => {
83-
sentryTest.skip(shouldSkipTracingTest() || testingCdnBundle());
83+
sentryTest.skip(shouldSkipTracingTest());
8484

8585
const url = await getLocalTestUrl({ testDir: __dirname });
8686

‎dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces-streamed/consistent-sampling/meta-negative/test.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
envelopeRequestParser,
88
hidePage,
99
shouldSkipTracingTest,
10-
testingCdnBundle,
1110
waitForClientReportRequest,
1211
waitForTracingHeadersOnUrl,
1312
} from '../../../../../../utils/helpers';
@@ -21,7 +20,7 @@ sentryTest.describe('When `consistentTraceSampling` is `true` and page contains
2120
sentryTest(
2221
'Continues negative sampling decision from meta tag across all traces and downstream propagations',
2322
async ({ getLocalTestUrl, page }) => {
24-
sentryTest.skip(shouldSkipTracingTest() || testingCdnBundle());
23+
sentryTest.skip(shouldSkipTracingTest());
2524

2625
const url = await getLocalTestUrl({ testDir: __dirname });
2726

‎dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces-streamed/consistent-sampling/meta-precedence/test.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66
envelopeRequestParser,
77
hidePage,
88
shouldSkipTracingTest,
9-
testingCdnBundle,
109
waitForClientReportRequest,
1110
waitForTracingHeadersOnUrl,
1211
} from '../../../../../../utils/helpers';
@@ -21,7 +20,7 @@ sentryTest.describe('When `consistentTraceSampling` is `true` and page contains
2120
sentryTest(
2221
'meta tag decision has precedence over sampling decision from previous trace in session storage',
2322
async ({ getLocalTestUrl, page }) => {
24-
sentryTest.skip(shouldSkipTracingTest() || testingCdnBundle());
23+
sentryTest.skip(shouldSkipTracingTest());
2524

2625
const url = await getLocalTestUrl({ testDir: __dirname });
2726

‎dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces-streamed/consistent-sampling/meta/test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import {
55
SEMANTIC_ATTRIBUTE_SENTRY_PREVIOUS_TRACE_SAMPLE_RATE,
66
} from '@sentry/core';
77
import { sentryTest } from '../../../../../../utils/fixtures';
8-
import { shouldSkipTracingTest, testingCdnBundle, waitForTracingHeadersOnUrl } from '../../../../../../utils/helpers';
8+
import { shouldSkipTracingTest, waitForTracingHeadersOnUrl } from '../../../../../../utils/helpers';
99
import { getSpanOp, waitForStreamedSpanEnvelope } from '../../../../../../utils/spanUtils';
1010

1111
const metaTagSampleRand = 0.051121;
1212
const metaTagSampleRate = 0.2;
1313

1414
sentryTest.describe('When `consistentTraceSampling` is `true` and page contains <meta> tags', () => {
1515
sentryTest('Continues sampling decision across all traces from meta tag', async ({ getLocalTestUrl, page }) => {
16-
sentryTest.skip(shouldSkipTracingTest() || testingCdnBundle());
16+
sentryTest.skip(shouldSkipTracingTest());
1717

1818
const url = await getLocalTestUrl({ testDir: __dirname });
1919

@@ -96,7 +96,7 @@ sentryTest.describe('When `consistentTraceSampling` is `true` and page contains
9696
sentryTest(
9797
'Propagates continued <meta> tag sampling decision to outgoing requests',
9898
async ({ page, getLocalTestUrl }) => {
99-
sentryTest.skip(shouldSkipTracingTest() || testingCdnBundle());
99+
sentryTest.skip(shouldSkipTracingTest());
100100

101101
const url = await getLocalTestUrl({ testDir: __dirname });
102102

0 commit comments

Comments
 (0)