feat(browser): Add option to ignore mark and measure spans

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

@@ -0,0 +1,19 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  integrations: [
+    Sentry.browserTracingIntegration({
+      ignoreMeasureSpans: ['measure-ignore', /mark-i/],
+      idleTimeout: 9000,
+    }),
+  ],
+  tracesSampleRate: 1,
+});
+
+performance.mark('mark-pass');
+performance.mark('mark-ignore');
+performance.measure('measure-pass');
+performance.measure('measure-ignore');

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

@@ -0,0 +1,47 @@
+import type { Route } from '@playwright/test';
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../../utils/fixtures';
+import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../utils/helpers';
+
+sentryTest(
+  'should ignore mark and measure spans that match `ignoreMeasureSpans`',
+  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 transactionRequestPromise = waitForTransactionRequest(
+      page,
+      evt => evt.type === 'transaction' && evt.contexts?.trace?.op === 'pageload',
+    );
+
+    await page.goto(url);
+
+    const transactionEvent = envelopeRequestParser(await transactionRequestPromise);
+    const markAndMeasureSpans = transactionEvent.spans?.filter(({ op }) => op && ['mark', 'measure'].includes(op));
+
+    expect(markAndMeasureSpans?.length).toBe(3);
+    expect(markAndMeasureSpans).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          description: 'mark-pass',
+          op: 'mark',
+        }),
+        expect.objectContaining({
+          description: 'measure-pass',
+          op: 'measure',
+        }),
+        expect.objectContaining({
+          description: 'sentry-tracing-init',
+          op: 'mark',
+        }),
+      ]),
+    );
+  },
+);

packages/browser-utils/src/metrics/browserMetrics.ts

@@ -9,6 +9,7 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   setMeasurement,
   spanToJSON,
+  stringMatchesSomePattern,
 } from '@sentry/core';
 import { WINDOW } from '../types';
 import { trackClsAsStandaloneSpan } from './cls';
@@ -307,6 +308,14 @@ interface AddPerformanceEntriesOptions {
    * Default: []
    */
   ignoreResourceSpans: Array<'resouce.script' | 'resource.css' | 'resource.img' | 'resource.other' | string>;
+
+  /**
+   * Performance spans created from `performance.mark(...)` or `performance.measure(...)`
+   * with `name`s matching strings in the array will not be emitted.
+   *
+   * Default: []
+   */
+  ignoreMeasureSpans: Array<string | RegExp>;
 }
 
 /** Add performance related spans to a transaction */
@@ -346,7 +355,7 @@ export function addPerformanceEntries(span: Span, options: AddPerformanceEntries
       case 'mark':
       case 'paint':
       case 'measure': {
-        _addMeasureSpans(span, entry, startTime, duration, timeOrigin);
+        _addMeasureSpans(span, entry, startTime, duration, timeOrigin, options.ignoreMeasureSpans);
 
         // capture web vitals
         const firstHidden = getVisibilityWatcher();
@@ -440,7 +449,12 @@ export function _addMeasureSpans(
   startTime: number,
   duration: number,
   timeOrigin: number,
+  ignoreMeasureSpans: AddPerformanceEntriesOptions['ignoreMeasureSpans'],
 ): void {
+  if (['mark', 'measure'].includes(entry.entryType) && stringMatchesSomePattern(entry.name, ignoreMeasureSpans)) {
+    return;
+  }
+
   const navEntry = getNavigationEntry(false);
   const requestTime = msToSec(navEntry ? navEntry.requestStart : 0);
   // Because performance.measure accepts arbitrary timestamps it can produce

packages/browser-utils/test/browser/browserMetrics.test.ts

@@ -10,7 +10,12 @@ import {
   spanToJSON,
 } from '@sentry/core';
 import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest';
-import { _addMeasureSpans, _addNavigationSpans, _addResourceSpans } from '../../src/metrics/browserMetrics';
+import {
+  _addMeasureSpans,
+  _addNavigationSpans,
+  _addResourceSpans,
+  addPerformanceEntries,
+} from '../../src/metrics/browserMetrics';
 import { WINDOW } from '../../src/types';
 import { getDefaultClientOptions, TestClient } from '../utils/TestClient';
 
@@ -76,7 +81,7 @@ describe('_addMeasureSpans', () => {
     const startTime = 23;
     const duration = 356;
 
-    _addMeasureSpans(span, entry, startTime, duration, timeOrigin);
+    _addMeasureSpans(span, entry, startTime, duration, timeOrigin, []);
 
     expect(spans).toHaveLength(1);
     expect(spanToJSON(spans[0]!)).toEqual(
@@ -112,10 +117,75 @@ describe('_addMeasureSpans', () => {
     const startTime = 23;
     const duration = -50;
 
-    _addMeasureSpans(span, entry, startTime, duration, timeOrigin);
+    _addMeasureSpans(span, entry, startTime, duration, timeOrigin, []);
 
     expect(spans).toHaveLength(0);
   });
+
+  it('ignores performance spans that match ignoreMeasureSpans', () => {
+    const pageloadSpan = new SentrySpan({ op: 'pageload', name: '/', sampled: true });
+    const spans: Span[] = [];
+
+    getClient()?.on('spanEnd', span => {
+      spans.push(span);
+    });
+
+    const entries: PerformanceEntry[] = [
+      {
+        entryType: 'measure',
+        name: 'measure-pass',
+        duration: 10,
+        startTime: 12,
+        toJSON: () => ({}),
+      },
+      {
+        entryType: 'measure',
+        name: 'measure-ignore',
+        duration: 10,
+        startTime: 12,
+        toJSON: () => ({}),
+      },
+      {
+        entryType: 'mark',
+        name: 'mark-pass',
+        duration: 0,
+        startTime: 12,
+        toJSON: () => ({}),
+      },
+      {
+        entryType: 'mark',
+        name: 'mark-ignore',
+        duration: 0,
+        startTime: 12,
+        toJSON: () => ({}),
+      },
+      {
+        entryType: 'paint',
+        name: 'mark-ignore',
+        duration: 0,
+        startTime: 12,
+        toJSON: () => ({}),
+      },
+    ];
+
+    const timeOrigin = 100;
+    const startTime = 23;
+    const duration = 356;
+
+    entries.forEach(e => {
+      _addMeasureSpans(pageloadSpan, e, startTime, duration, timeOrigin, ['measure-i', /mark-ign/]);
+    });
+
+    expect(spans).toHaveLength(3);
+    expect(spans.map(spanToJSON)).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ description: 'measure-pass', op: 'measure' }),
+        expect.objectContaining({ description: 'mark-pass', op: 'mark' }),
+        // name matches but type is not (mark|measure) => should not be ignored
+        expect.objectContaining({ description: 'mark-ignore', op: 'paint' }),
+      ]),
+    );
+  });
 });
 
 describe('_addResourceSpans', () => {

packages/browser/src/tracing/browserTracingIntegration.ts

@@ -149,7 +149,22 @@ export interface BrowserTracingOptions {
    *
    * Default: []
    */
-  ignoreResourceSpans: Array<string>;
+  ignoreResourceSpans: Array<'resouce.script' | 'resource.css' | 'resource.img' | 'resource.other' | string>;
+
+  /**
+   * Spans created from
+   * [`performance.mark(...)`](https://developer.mozilla.org/en-US/docs/Web/API/Performance/mark)
+   * and
+   * [`performance.measure(...)`](https://developer.mozilla.org/en-US/docs/Web/API/Performance/measure)
+   * calls will not be emitted if their names match strings in this array.
+   *
+   * This is useful, if you come across `mark` or `measure` spans in your Sentry traces
+   * that you want to ignore. For example, sometimes, browser extensions or libraries
+   * emit these entries on their own, which might not be relevant to your application.
+   *
+   * Default: [] - By default, all `mark` and `measure` entries are sent as spans.
+   */
+  ignoreMeasureSpans: Array<string | RegExp>;
 
   /**
    * Link the currently started trace to a previous trace (e.g. a prior pageload, navigation or
@@ -234,6 +249,7 @@ const DEFAULT_BROWSER_TRACING_OPTIONS: BrowserTracingOptions = {
   enableLongAnimationFrame: true,
   enableInp: true,
   ignoreResourceSpans: [],
+  ignoreMeasureSpans: [],
   linkPreviousTrace: 'in-memory',
   consistentTraceSampling: false,
   _experiments: {},
@@ -277,6 +293,7 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
     shouldCreateSpanForRequest,
     enableHTTPTimings,
     ignoreResourceSpans,
+    ignoreMeasureSpans,
     instrumentPageLoad,
     instrumentNavigation,
     linkPreviousTrace,
@@ -319,7 +336,11 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
         // This will generally always be defined here, because it is set in `setup()` of the integration
         // but technically, it is optional, so we guard here to be extra safe
         _collectWebVitals?.();
-        addPerformanceEntries(span, { recordClsOnPageloadSpan: !enableStandaloneClsSpans, ignoreResourceSpans });
+        addPerformanceEntries(span, {
+          recordClsOnPageloadSpan: !enableStandaloneClsSpans,
+          ignoreResourceSpans,
+          ignoreMeasureSpans,
+        });
         setActiveIdleSpan(client, undefined);
 
         // A trace should stay consistent over the entire timespan of one route - even after the pageload/navigation ended.