Skip to content

Commit d77dec4

Browse files
authored
Merge branch 'develop' into lazarnikolov/js-2140-tanstack-start-tunnel-adapter
2 parents 52c33cb + 29604aa commit d77dec4

143 files changed

Lines changed: 2182 additions & 438 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.

.github/workflows/build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,9 @@ jobs:
930930
with:
931931
node-version-file: 'dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}/package.json'
932932
- name: Set up Bun
933-
if: contains(fromJSON('["node-exports-test-app","nextjs-16-bun", "elysia-bun"]'), matrix.test-application)
933+
if:
934+
contains(fromJSON('["node-exports-test-app","nextjs-16-bun", "elysia-bun", "hono-4"]'),
935+
matrix.test-application)
934936
uses: oven-sh/setup-bun@v2
935937
- name: Set up AWS SAM
936938
if: matrix.test-application == 'aws-serverless'

.size-limit.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ module.exports = [
191191
name: 'CDN Bundle (incl. Tracing)',
192192
path: createCDNPath('bundle.tracing.min.js'),
193193
gzip: true,
194-
limit: '45 KB',
194+
limit: '46.5 KB',
195195
},
196196
{
197197
name: 'CDN Bundle (incl. Logs, Metrics)',
@@ -203,7 +203,7 @@ module.exports = [
203203
name: 'CDN Bundle (incl. Tracing, Logs, Metrics)',
204204
path: createCDNPath('bundle.tracing.logs.metrics.min.js'),
205205
gzip: true,
206-
limit: '47 KB',
206+
limit: '47.5 KB',
207207
},
208208
{
209209
name: 'CDN Bundle (incl. Replay, Logs, Metrics)',
@@ -215,25 +215,25 @@ module.exports = [
215215
name: 'CDN Bundle (incl. Tracing, Replay)',
216216
path: createCDNPath('bundle.tracing.replay.min.js'),
217217
gzip: true,
218-
limit: '82 KB',
218+
limit: '83.5 KB',
219219
},
220220
{
221221
name: 'CDN Bundle (incl. Tracing, Replay, Logs, Metrics)',
222222
path: createCDNPath('bundle.tracing.replay.logs.metrics.min.js'),
223223
gzip: true,
224-
limit: '83 KB',
224+
limit: '84.5 KB',
225225
},
226226
{
227227
name: 'CDN Bundle (incl. Tracing, Replay, Feedback)',
228228
path: createCDNPath('bundle.tracing.replay.feedback.min.js'),
229229
gzip: true,
230-
limit: '88 KB',
230+
limit: '89 KB',
231231
},
232232
{
233233
name: 'CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)',
234234
path: createCDNPath('bundle.tracing.replay.feedback.logs.metrics.min.js'),
235235
gzip: true,
236-
limit: '89 KB',
236+
limit: '90 KB',
237237
},
238238
// browser CDN bundles (non-gzipped)
239239
{
@@ -248,7 +248,7 @@ module.exports = [
248248
path: createCDNPath('bundle.tracing.min.js'),
249249
gzip: false,
250250
brotli: false,
251-
limit: '135 KB',
251+
limit: '138 KB',
252252
},
253253
{
254254
name: 'CDN Bundle (incl. Logs, Metrics) - uncompressed',
@@ -262,7 +262,7 @@ module.exports = [
262262
path: createCDNPath('bundle.tracing.logs.metrics.min.js'),
263263
gzip: false,
264264
brotli: false,
265-
limit: '138 KB',
265+
limit: '141.5 KB',
266266
},
267267
{
268268
name: 'CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed',
@@ -276,28 +276,28 @@ module.exports = [
276276
path: createCDNPath('bundle.tracing.replay.min.js'),
277277
gzip: false,
278278
brotli: false,
279-
limit: '252 KB',
279+
limit: '255.5 KB',
280280
},
281281
{
282282
name: 'CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed',
283283
path: createCDNPath('bundle.tracing.replay.logs.metrics.min.js'),
284284
gzip: false,
285285
brotli: false,
286-
limit: '255 KB',
286+
limit: '258.5 KB',
287287
},
288288
{
289289
name: 'CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed',
290290
path: createCDNPath('bundle.tracing.replay.feedback.min.js'),
291291
gzip: false,
292292
brotli: false,
293-
limit: '265 KB',
293+
limit: '268 KB',
294294
},
295295
{
296296
name: 'CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed',
297297
path: createCDNPath('bundle.tracing.replay.feedback.logs.metrics.min.js'),
298298
gzip: false,
299299
brotli: false,
300-
limit: '268 KB',
300+
limit: '271.5 KB',
301301
},
302302
// Next.js SDK (ESM)
303303
{

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: 3 additions & 3 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 =>
@@ -99,7 +99,7 @@ sentryTest('captures streamed interaction span tree. @firefox', async ({ browser
9999
});
100100

101101
const loAFSpans = interactionSpanTree.filter(span => getSpanOp(span)?.startsWith('ui.long-animation-frame'));
102-
expect(loAFSpans).toHaveLength(1);
102+
expect(loAFSpans).toHaveLength(browserName === 'chromium' ? 1 : 0);
103103

104104
const interactionSpan = interactionSpanTree.find(span => getSpanOp(span) === 'ui.interaction.click');
105105
expect(interactionSpan).toEqual({

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

0 commit comments

Comments
 (0)