Merge branch 'develop' into byk/fix/spotlight-dev-mode-warn

Author: BYK

.github/workflows/build.yml

@@ -886,7 +886,13 @@ jobs:
       - uses: pnpm/action-setup@v4
         with:
           version: 9.4.0
+      - name: Set up Node for Angular 20
+        if: matrix.test-application == 'angular-20'
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.19.2'
       - name: Set up Node
+        if: matrix.test-application != 'angular-20'
         uses: actions/setup-node@v4
         with:
           node-version-file: 'dev-packages/e2e-tests/package.json'

dev-packages/browser-integration-tests/suites/manual-client/skip-init-browser-extension/test.ts

@@ -18,7 +18,12 @@ sentryTest(
       return !!(window as any).Sentry.isInitialized();
     });
 
-    expect(isInitialized).toEqual(false);
+    const isEnabled = await page.evaluate(() => {
+      return !!(window as any).Sentry.getClient()?.getOptions().enabled;
+    });
+
+    expect(isInitialized).toEqual(true);
+    expect(isEnabled).toEqual(false);
 
     if (hasDebugLogs()) {
       expect(errorLogs.length).toEqual(1);

dev-packages/browser-integration-tests/suites/manual-client/skip-init-chrome-extension/test.ts

@@ -16,7 +16,12 @@ sentryTest('should not initialize when inside a Chrome browser extension', async
     return !!(window as any).Sentry.isInitialized();
   });
 
-  expect(isInitialized).toEqual(false);
+  const isEnabled = await page.evaluate(() => {
+    return !!(window as any).Sentry.getClient()?.getOptions().enabled;
+  });
+
+  expect(isInitialized).toEqual(true);
+  expect(isEnabled).toEqual(false);
 
   if (hasDebugLogs()) {
     expect(errorLogs.length).toEqual(1);

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/multiple-integrations/test.ts

@@ -0,0 +1,3 @@
+(() => {
+  // I do nothing.
+})();

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/resource-spans-ignored/assets/script.js

@@ -4,6 +4,11 @@ window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
-  integrations: [Sentry.browserTracingIntegration(), Sentry.browserTracingIntegration()],
+  integrations: [
+    Sentry.browserTracingIntegration({
+      ignoreResourceSpans: ['resource.script'],
+      idleTimeout: 9000,
+    }),
+  ],
   tracesSampleRate: 1,
 });

…ntegration/multiple-integrations/init.js …tegration/resource-spans-ignored/init.jsdev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/multiple-integrations/init.js renamed to dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/resource-spans-ignored/init.js dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/multiple-integrations/init.js renamed to dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/resource-spans-ignored/init.js

@@ -0,0 +1,20 @@
+import type { Route } from '@playwright/test';
+import { expect } from '@playwright/test';
+import type { Event } from '@sentry/core';
+import { sentryTest } from '../../../../utils/fixtures';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
+
+sentryTest('should allow specific types of resource spans to be ignored.', async ({ getLocalTestUrl, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
+  await page.route('**/path/to/script.js', (route: Route) => route.fulfill({ path: `${__dirname}/assets/script.js` }));
+
+  const url = await getLocalTestUrl({ testDir: __dirname });
+
+  const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
+  const allSpans = eventData.spans?.filter(({ op }) => op?.startsWith('resource.script'));
+
+  expect(allSpans?.length).toBe(0);
+});

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/resource-spans-ignored/test.ts

@@ -0,0 +1,14 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  integrations: [Sentry.browserTracingIntegration()],
+  tracePropagationTargets: ['http://sentry-test-site.example'],
+  tracesSampleRate: 1,
+  autoSessionTracking: false,
+});
+
+// fetch directly after init
+fetch('http://sentry-test-site.example/0');

dev-packages/browser-integration-tests/suites/tracing/request/fetch-immediate/init.js

@@ -0,0 +1,40 @@
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../../utils/fixtures';
+import {
+  envelopeRequestParser,
+  shouldSkipTracingTest,
+  waitForTransactionRequestOnUrl,
+} from '../../../../utils/helpers';
+
+sentryTest('should create spans for fetch requests called directly after init', async ({ getLocalTestUrl, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
+  await page.route('http://sentry-test-site.example/*', route => route.fulfill({ body: 'ok' }));
+
+  const url = await getLocalTestUrl({ testDir: __dirname });
+
+  const req = await waitForTransactionRequestOnUrl(page, url);
+  const tracingEvent = envelopeRequestParser(req);
+
+  const requestSpans = tracingEvent.spans?.filter(({ op }) => op === 'http.client');
+
+  expect(requestSpans).toHaveLength(1);
+
+  expect(requestSpans![0]).toMatchObject({
+    description: 'GET http://sentry-test-site.example/0',
+    parent_span_id: tracingEvent.contexts?.trace?.span_id,
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
+    start_timestamp: expect.any(Number),
+    timestamp: expect.any(Number),
+    trace_id: tracingEvent.contexts?.trace?.trace_id,
+    data: {
+      'http.method': 'GET',
+      'http.url': 'http://sentry-test-site.example/0',
+      url: 'http://sentry-test-site.example/0',
+      'server.address': 'sentry-test-site.example',
+      type: 'fetch',
+    },
+  });
+});

dev-packages/browser-integration-tests/suites/tracing/request/fetch-immediate/test.ts

@@ -0,0 +1,17 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.ts]
+quote_type = single
+ij_typescript_use_double_quotes = false
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false