From 3454a5a89473baba49daa9850338b44ae8d871bf Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Fri, 17 Jan 2025 13:56:21 +0100 Subject: [PATCH 1/2] test(browser): Test `moduleMetadataIntegration` in CDN bundle integration tests --- .../integrations/moduleMetadata/appliesMetadata/init.js | 4 +++- .../integrations/moduleMetadata/appliesMetadata/test.ts | 5 ----- .../appliesMetadataWithRewriteFrames/init.js | 7 +++++-- .../appliesMetadataWithRewriteFrames/test.ts | 5 ----- .../suites/tracing/request/fetch/test.ts | 8 ++++++-- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/init.js b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/init.js index 7484c4a339e9..966bcff4925e 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/init.js +++ b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/init.js @@ -1,8 +1,10 @@ import * as Sentry from '@sentry/browser'; +import { moduleMetadataIntegration } from '@sentry/browser'; + Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', - integrations: [Sentry.moduleMetadataIntegration()], + integrations: [moduleMetadataIntegration()], beforeSend(event) { const moduleMetadataEntries = []; diff --git a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/test.ts b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/test.ts index 271314220f7a..986f379345d5 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/test.ts @@ -5,11 +5,6 @@ import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; sentryTest('should provide module_metadata on stack frames in beforeSend', async ({ getLocalTestUrl, page }) => { - // moduleMetadataIntegration is not included in any CDN bundles - if (process.env.PW_BUNDLE?.startsWith('bundle')) { - sentryTest.skip(); - } - const url = await getLocalTestUrl({ testDir: __dirname }); const errorEvent = await getFirstSentryEnvelopeRequest(page, url); diff --git a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/init.js b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/init.js index 885b1d2da2c1..5c5998839754 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/init.js +++ b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/init.js @@ -1,10 +1,13 @@ import * as Sentry from '@sentry/browser'; +import { moduleMetadataIntegration } from '@sentry/browser'; +import { rewriteFramesIntegration } from '@sentry/browser'; + Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', integrations: [ - Sentry.moduleMetadataIntegration(), - Sentry.rewriteFramesIntegration({ + moduleMetadataIntegration(), + rewriteFramesIntegration({ iteratee: frame => { return { ...frame, diff --git a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/test.ts b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/test.ts index bdabe0d63680..765bf7c21126 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/test.ts @@ -7,11 +7,6 @@ import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; sentryTest( 'should provide module_metadata on stack frames in beforeSend even though an event processor (rewriteFramesIntegration) modified the filename', async ({ getLocalTestUrl, page }) => { - // moduleMetadataIntegration is not included in any CDN bundles - if (process.env.PW_BUNDLE?.startsWith('bundle')) { - sentryTest.skip(); - } - const url = await getLocalTestUrl({ testDir: __dirname }); const errorEvent = await getFirstSentryEnvelopeRequest(page, url); diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts index bcbfa1890cdd..88ac7f85ec31 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts @@ -17,8 +17,12 @@ sentryTest('should create spans for fetch requests', async ({ getLocalTestUrl, p // We will wait 500ms for all envelopes to be sent. Generally, in all browsers, the last sent // envelope contains tracing data. - const envelopes = await getMultipleSentryEnvelopeRequests(page, 4, { url, timeout: 10000 }); - const tracingEvent = envelopes.find(event => event.type === 'transaction')!; // last envelope contains tracing data on all browsers + const events = await getMultipleSentryEnvelopeRequests(page, 1, { + url, + timeout: 10000, + envelopeType: 'transaction', + }); + const tracingEvent = events[0]; const requestSpans = tracingEvent.spans?.filter(({ op }) => op === 'http.client'); From bc16291b824b47ebe2557de2982d5d033c9e71e7 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Fri, 17 Jan 2025 14:01:37 +0100 Subject: [PATCH 2/2] restore unrelated file --- .../suites/tracing/request/fetch/test.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts index 88ac7f85ec31..bcbfa1890cdd 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts @@ -17,12 +17,8 @@ sentryTest('should create spans for fetch requests', async ({ getLocalTestUrl, p // We will wait 500ms for all envelopes to be sent. Generally, in all browsers, the last sent // envelope contains tracing data. - const events = await getMultipleSentryEnvelopeRequests(page, 1, { - url, - timeout: 10000, - envelopeType: 'transaction', - }); - const tracingEvent = events[0]; + const envelopes = await getMultipleSentryEnvelopeRequests(page, 4, { url, timeout: 10000 }); + const tracingEvent = envelopes.find(event => event.type === 'transaction')!; // last envelope contains tracing data on all browsers const requestSpans = tracingEvent.spans?.filter(({ op }) => op === 'http.client');