Merge branch 'develop' into develop

dev-packages/browser-integration-tests/suites/public-api/instrumentation/xhr/onreadystatechange/subject.js

@@ -1,6 +1,6 @@
 window.calls = {};
 const xhr = new XMLHttpRequest();
-xhr.open('GET', 'http://example.com');
+xhr.open('GET', 'http://sentry-test-site.example');
 xhr.onreadystatechange = function wat() {
   window.calls[xhr.readyState] = window.calls[xhr.readyState] ? window.calls[xhr.readyState] + 1 : 1;
 };

dev-packages/browser-integration-tests/suites/public-api/instrumentation/xhr/onreadystatechange/test.ts

@@ -7,7 +7,7 @@ sentryTest(
   async ({ getLocalTestUrl, page }) => {
     const url = await getLocalTestUrl({ testDir: __dirname });
 
-    await page.route('http://example.com/', route => {
+    await page.route('http://sentry-test-site.example/', route => {
       return route.fulfill({
         status: 200,
         contentType: 'application/json',

dev-packages/browser-integration-tests/suites/replay/requests/subject.js

@@ -6,11 +6,11 @@ document.getElementById('go-background').addEventListener('click', () => {
 });
 
 document.getElementById('fetch').addEventListener('click', () => {
-  fetch('https://example.com', { method: 'POST', body: 'foo' });
+  fetch('https://sentry-test-site.example', { method: 'POST', body: 'foo' });
 });
 
 document.getElementById('xhr').addEventListener('click', () => {
   const xhr = new XMLHttpRequest();
-  xhr.open('GET', 'https://example.com');
+  xhr.open('GET', 'https://sentry-test-site.example');
   xhr.send();
 });

dev-packages/browser-integration-tests/suites/replay/requests/test.ts

@@ -10,7 +10,7 @@ sentryTest('replay recording should contain fetch request span', async ({ getLoc
     sentryTest.skip();
   }
 
-  await page.route('https://example.com', route => {
+  await page.route('https://sentry-test-site.example', route => {
     return route.fulfill({
       status: 200,
       contentType: 'application/json',
@@ -27,7 +27,7 @@ sentryTest('replay recording should contain fetch request span', async ({ getLoc
 
   const { performanceSpans: spans0 } = getReplayRecordingContent(req0);
 
-  await Promise.all([page.waitForResponse('https://example.com'), page.locator('#fetch').click()]);
+  await Promise.all([page.waitForResponse('https://sentry-test-site.example'), page.locator('#fetch').click()]);
 
   const { performanceSpans: spans1 } = getReplayRecordingContent(await reqPromise1);
 
@@ -40,7 +40,7 @@ sentryTest('replay recording should contain XHR request span', async ({ getLocal
     sentryTest.skip();
   }
 
-  await page.route('https://example.com', route => {
+  await page.route('https://sentry-test-site.example', route => {
     return route.fulfill({
       status: 200,
       contentType: 'application/json',
@@ -57,7 +57,7 @@ sentryTest('replay recording should contain XHR request span', async ({ getLocal
 
   const { performanceSpans: spans0 } = getReplayRecordingContent(req0);
 
-  await Promise.all([page.waitForResponse('https://example.com'), page.locator('#xhr').click()]);
+  await Promise.all([page.waitForResponse('https://sentry-test-site.example'), page.locator('#xhr').click()]);
 
   const { performanceSpans: spans1 } = getReplayRecordingContent(await reqPromise1);
 

dev-packages/browser-integration-tests/suites/replay/slowClick/template.html

@@ -76,7 +76,7 @@ <h1 id="h2">Bottom</h1>
         document.getElementById('out').innerHTML += 'mutationButton clicked<br>';
       });
       document.getElementById('windowOpenButton').addEventListener('click', () => {
-        window.open('https://example.com/', '_blank');
+        window.open('https://github.com/', '_blank');
       });
 
       // Do nothing on these elements

dev-packages/browser-integration-tests/suites/replay/slowClick/windowOpen/test.ts

@@ -8,14 +8,6 @@ sentryTest('window.open() is considered for slow click', async ({ getLocalTestUr
     sentryTest.skip();
   }
 
-  await page.route('http://example.com/', route => {
-    return route.fulfill({
-      status: 200,
-      contentType: 'application/json',
-      body: JSON.stringify({}),
-    });
-  });
-
   const url = await getLocalTestUrl({ testDir: __dirname });
 
   await Promise.all([waitForReplayRequest(page, 0), page.goto(url)]);
@@ -63,5 +55,5 @@ sentryTest('window.open() is considered for slow click', async ({ getLocalTestUr
   const pages = context.pages();
 
   expect(pages.length).toBe(2);
-  expect(pages[1].url()).toBe('https://example.com/');
+  expect(pages[1].url()).toBe('https://github.com/');
 });

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/http-timings/subject.js

@@ -1 +1,3 @@
-fetch('http://example.com/0').then(fetch('http://example.com/1').then(fetch('http://example.com/2')));
+fetch('http://sentry-test-site.example/0').then(
+  fetch('http://sentry-test-site.example/1').then(fetch('http://sentry-test-site.example/2')),
+);

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

@@ -10,7 +10,7 @@ sentryTest('should create fetch spans with http timing @firefox', async ({ brows
   if (shouldSkipTracingTest() || !supportedBrowsers.includes(browserName)) {
     sentryTest.skip();
   }
-  await page.route('http://example.com/*', async route => {
+  await page.route('http://sentry-test-site.example/*', async route => {
     const request = route.request();
     const postData = await request.postDataJSON();
 
@@ -33,7 +33,7 @@ sentryTest('should create fetch spans with http timing @firefox', async ({ brows
   await page.pause();
   requestSpans?.forEach((span, index) =>
     expect(span).toMatchObject({
-      description: `GET http://example.com/${index}`,
+      description: `GET http://sentry-test-site.example/${index}`,
       parent_span_id: tracingEvent.contexts?.trace?.span_id,
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
       start_timestamp: expect.any(Number),

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-disabled/template.html

@@ -5,6 +5,6 @@
   </head>
   <body>
     <div>Rendered Before Long Animation Frame</div>
-    <script src="https://example.com/path/to/script.js"></script>
+    <script src="https://sentry-test-site.example/path/to/script.js"></script>
   </body>
 </html>

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-enabled/template.html

@@ -8,6 +8,6 @@
     <button id="clickme">
       click me to start the long animation!
     </button>
-    <script src="https://example.com/path/to/script.js"></script>
+    <script src="https://sentry-test-site.example/path/to/script.js"></script>
   </body>
 </html>

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-enabled/test.ts

@@ -33,17 +33,17 @@ sentryTest(
     expect(uiSpans?.length).toBeGreaterThanOrEqual(1);
 
     const topLevelUISpan = (uiSpans || []).find(
-      span => span.data?.['browser.script.invoker'] === 'https://example.com/path/to/script.js',
+      span => span.data?.['browser.script.invoker'] === 'https://sentry-test-site.example/path/to/script.js',
     )!;
     expect(topLevelUISpan).toEqual(
       expect.objectContaining({
         op: 'ui.long-animation-frame',
         description: 'Main UI thread blocked',
         parent_span_id: eventData.contexts?.trace?.span_id,
         data: {
-          'code.filepath': 'https://example.com/path/to/script.js',
+          'code.filepath': 'https://sentry-test-site.example/path/to/script.js',
           'browser.script.source_char_position': 0,
-          'browser.script.invoker': 'https://example.com/path/to/script.js',
+          'browser.script.invoker': 'https://sentry-test-site.example/path/to/script.js',
           'browser.script.invoker_type': 'classic-script',
           [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'ui.long-animation-frame',
           [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.browser.metrics',
@@ -98,7 +98,7 @@ sentryTest(
         data: {
           'browser.script.invoker': 'BUTTON#clickme.onclick',
           'browser.script.invoker_type': 'event-listener',
-          'code.filepath': 'https://example.com/path/to/script.js',
+          'code.filepath': 'https://sentry-test-site.example/path/to/script.js',
           [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'ui.long-animation-frame',
           [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.browser.metrics',
         },

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-non-chromium/template.html

@@ -5,6 +5,6 @@
   </head>
   <body>
     <div>Rendered Before Long Task</div>
-    <script src="https://example.com/path/to/script.js"></script>
+    <script src="https://sentry-test-site.example/path/to/script.js"></script>
   </body>
 </html>

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-and-animation-frame-enabled/template.html

@@ -8,6 +8,6 @@
     <button id="clickme">
       click me to start the long animation!
     </button>
-    <script src="https://example.com/path/to/script.js"></script>
+    <script src="https://sentry-test-site.example/path/to/script.js"></script>
   </body>
 </html>

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-and-animation-frame-enabled/test.ts

@@ -35,17 +35,17 @@ sentryTest(
     expect(uiSpans?.length).toBeGreaterThanOrEqual(1);
 
     const topLevelUISpan = (uiSpans || []).find(
-      span => span.data?.['browser.script.invoker'] === 'https://example.com/path/to/script.js',
+      span => span.data?.['browser.script.invoker'] === 'https://sentry-test-site.example/path/to/script.js',
     )!;
     expect(topLevelUISpan).toEqual(
       expect.objectContaining({
         op: 'ui.long-animation-frame',
         description: 'Main UI thread blocked',
         parent_span_id: eventData.contexts?.trace?.span_id,
         data: {
-          'code.filepath': 'https://example.com/path/to/script.js',
+          'code.filepath': 'https://sentry-test-site.example/path/to/script.js',
           'browser.script.source_char_position': 0,
-          'browser.script.invoker': 'https://example.com/path/to/script.js',
+          'browser.script.invoker': 'https://sentry-test-site.example/path/to/script.js',
           'browser.script.invoker_type': 'classic-script',
           [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'ui.long-animation-frame',
           [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.browser.metrics',
@@ -100,7 +100,7 @@ sentryTest(
         data: {
           'browser.script.invoker': 'BUTTON#clickme.onclick',
           'browser.script.invoker_type': 'event-listener',
-          'code.filepath': 'https://example.com/path/to/script.js',
+          'code.filepath': 'https://sentry-test-site.example/path/to/script.js',
           [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'ui.long-animation-frame',
           [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.browser.metrics',
         },

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-before-navigation/template.html

@@ -5,7 +5,6 @@
   </head>
   <body>
     <div>Rendered Before Long Task</div>
-    <script src="https://example.com/path/to/script.js"></script>
 
     <button id="myButton">Start long task</button>
     <h1 id="myHeading">Heading</h1>

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-before-navigation/test.ts

@@ -13,6 +13,8 @@ sentryTest(
     }
     const url = await getLocalTestUrl({ testDir: __dirname });
 
+    await page.route('**/path/to/script.js', route => route.fulfill({ path: `${__dirname}/assets/script.js` }));
+
     await page.goto(url);
 
     const navigationTransactionEventPromise = getFirstSentryEnvelopeRequest<Event>(page);

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-disabled/template.html

@@ -5,6 +5,6 @@
   </head>
   <body>
     <div>Rendered Before Long Task</div>
-    <script src="https://example.com/path/to/script.js"></script>
+    <script src="https://sentry-test-site.example/path/to/script.js"></script>
   </body>
 </html>

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-enabled/template.html

@@ -5,6 +5,6 @@
   </head>
   <body>
     <div>Rendered Before Long Task</div>
-    <script src="https://example.com/path/to/script.js"></script>
+    <script src="https://sentry-test-site.example/path/to/script.js"></script>
   </body>
 </html>

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-no-animation-frame/template.html

@@ -5,6 +5,6 @@
   </head>
   <body>
     <div>Rendered Before Long Task</div>
-    <script src="https://example.com/path/to/script.js"></script>
+    <script src="https://sentry-test-site.example/path/to/script.js"></script>
   </body>
 </html>

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/customTargets/init.js

@@ -5,6 +5,6 @@ window.Sentry = Sentry;
 Sentry.init({
   dsn: 'https://[email protected]/1337',
   integrations: [Sentry.browserTracingIntegration()],
-  tracePropagationTargets: ['http://example.com'],
+  tracePropagationTargets: ['http://sentry-test-site.example'],
   tracesSampleRate: 1,
 });

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/customTargets/subject.js

@@ -1 +1,3 @@
-fetch('http://example.com/0').then(fetch('http://example.com/1').then(fetch('http://example.com/2')));
+fetch('http://sentry-test-site.example/0').then(
+  fetch('http://sentry-test-site.example/1').then(fetch('http://sentry-test-site.example/2')),
+);

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/customTargets/test.ts

@@ -15,7 +15,7 @@ sentryTest(
     const requests = (
       await Promise.all([
         page.goto(url),
-        Promise.all([0, 1, 2].map(idx => page.waitForRequest(`http://example.com/${idx}`))),
+        Promise.all([0, 1, 2].map(idx => page.waitForRequest(`http://sentry-test-site.example/${idx}`))),
       ])
     )[1];
 

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/defaultTargetsNoMatch/subject.js

@@ -1 +1,3 @@
-fetch('http://example.com/0').then(fetch('http://example.com/1').then(fetch('http://example.com/2')));
+fetch('http://sentry-test-site.example/0').then(
+  fetch('http://sentry-test-site.example/1').then(fetch('http://sentry-test-site.example/2')),
+);

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/defaultTargetsNoMatch/test.ts

@@ -15,7 +15,7 @@ sentryTest(
     const requests = (
       await Promise.all([
         page.goto(url),
-        Promise.all([0, 1, 2].map(idx => page.waitForRequest(`http://example.com/${idx}`))),
+        Promise.all([0, 1, 2].map(idx => page.waitForRequest(`http://sentry-test-site.example/${idx}`))),
       ])
     )[1];
 

dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/init.js

@@ -6,6 +6,6 @@ Sentry.init({
   dsn: 'https://[email protected]/1337',
   integrations: [Sentry.browserTracingIntegration({ instrumentNavigation: false, instrumentPageLoad: false })],
   tracesSampleRate: 1,
-  tracePropagationTargets: ['example.com'],
+  tracePropagationTargets: ['sentry-test-site.example'],
   release: '1.1.1',
 });

dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/subject.js

@@ -26,7 +26,7 @@ btnUpdateName.addEventListener('click', () => {
 });
 
 btnMakeRequest.addEventListener('click', () => {
-  fetch('https://example.com/api');
+  fetch('https://sentry-test-site.example/api');
 });
 
 btnCaptureError.addEventListener('click', () => {

dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/test.ts

@@ -16,6 +16,14 @@ sentryTest('updates the DSC when the txn name is updated and high-quality', asyn
 
   const url = await getLocalTestUrl({ testDir: __dirname });
 
+  await page.route('http://sentry-test-site.example/**/*', route => {
+    return route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify({}),
+    });
+  });
+
   await page.goto(url);
 
   /*
@@ -168,7 +176,7 @@ sentryTest('updates the DSC when the txn name is updated and high-quality', asyn
 });
 
 async function makeRequestAndGetBaggageItems(page: Page): Promise<string[]> {
-  const requestPromise = page.waitForRequest('https://example.com/*');
+  const requestPromise = page.waitForRequest('https://sentry-test-site.example/*');
   await page.locator('#btnMakeRequest').click();
   const request = await requestPromise;
 

dev-packages/browser-integration-tests/suites/tracing/metrics/handlers-lcp/template.html

@@ -5,7 +5,7 @@
   </head>
   <body>
     <div id="content"></div>
-    <img src="https://example.com/path/to/image.png" />
+    <img src="https://sentry-test-site.example/path/to/image.png" />
     <button type="button">Test button</button>
   </body>
 </html>

dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/template.html

@@ -4,9 +4,9 @@
     <meta charset="utf-8" />
   </head>
   <body>
-    <img src="https://example.com/path/to/image.svg" />
-    <script src="https://example.com/path/to/script.js"></script>
-    <link href="https://example.com/path/to/style.css" type="text/css" rel="stylesheet" />
+    <img src="https://sentry-test-site.example/path/to/image.svg" />
+    <script src="https://sentry-test-site.example/path/to/script.js"></script>
+    <link href="https://sentry-test-site.example/path/to/style.css" type="text/css" rel="stylesheet" />
     <span>Rendered</span>
   </body>
 </html>