ref(browser): Move browserTracing into browser pkg (#11484)

This PR moves `browserTracingIntegration` into the browser package,
leaving `browser-utils` only existing purely for utils/instrumentation
(and our vendored web vitals implementation).

resolves #9885

Author: AbhiPrasad

dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-browser-spans/test.ts

@@ -14,10 +14,11 @@ sentryTest('should add browser-related spans to pageload transaction', async ({
   const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
   const browserSpans = eventData.spans?.filter(({ op }) => op === 'browser');
 
-  // Spans `connect`, `cache` and `DNS` are not always inside `pageload` transaction.
+  // Spans `domContentLoadedEvent`, `connect`, `cache` and `DNS` are not
+  // always inside `pageload` transaction.
   expect(browserSpans?.length).toBeGreaterThanOrEqual(4);
 
-  ['domContentLoadedEvent', 'loadEvent', 'request', 'response'].forEach(eventDesc =>
+  ['loadEvent', 'request', 'response'].forEach(eventDesc =>
     expect(browserSpans).toContainEqual(
       expect.objectContaining({
         description: eventDesc,

packages/browser-utils/.eslintrc.js

@@ -11,9 +11,10 @@ module.exports = {
       },
     },
     {
-      files: ['src/browser/web-vitals/**'],
+      files: ['src/metrics/**'],
       rules: {
         '@typescript-eslint/explicit-function-return-type': 'off',
+        '@typescript-eslint/no-non-null-assertion': 'off',
       },
     },
   ],

packages/browser-utils/src/browser/index.ts

@@ -1,16 +1,17 @@
 export {
-  browserTracingIntegration,
-  startBrowserTracingNavigationSpan,
-  startBrowserTracingPageLoadSpan,
-  BROWSER_TRACING_INTEGRATION_ID,
-  instrumentOutgoingRequests,
-  defaultRequestInstrumentationOptions,
   addPerformanceInstrumentationHandler,
   addClsInstrumentationHandler,
   addFidInstrumentationHandler,
   addTtfbInstrumentationHandler,
   addLcpInstrumentationHandler,
-} from './browser';
+} from './metrics/instrument';
+
+export {
+  addPerformanceEntries,
+  startTrackingInteractions,
+  startTrackingLongTasks,
+  startTrackingWebVitals,
+} from './metrics/browserMetrics';
 
 export { addClickKeypressInstrumentationHandler } from './instrument/dom';
 
@@ -20,5 +21,3 @@ export {
   addXhrInstrumentationHandler,
   SENTRY_XHR_DATA_KEY,
 } from './instrument/xhr';
-
-export type { RequestInstrumentationOptions } from './browser';

packages/browser-utils/src/index.ts

@@ -1,7 +1,7 @@
 import type { HandlerDataDom } from '@sentry/types';
 
 import { addHandler, addNonEnumerableProperty, fill, maybeInstrument, triggerHandlers, uuid4 } from '@sentry/utils';
-import { WINDOW } from '../browser/types';
+import { WINDOW } from '../metrics/types';
 
 type SentryWrappedTarget = HTMLElement & { _sentryId?: string };
 

packages/browser-utils/src/instrument/dom.ts

@@ -1,6 +1,6 @@
 import type { HandlerDataHistory } from '@sentry/types';
 import { addHandler, fill, maybeInstrument, supportsHistory, triggerHandlers } from '@sentry/utils';
-import { WINDOW } from '../browser/types';
+import { WINDOW } from '../metrics/types';
 
 let lastHref: string | undefined;
 

packages/browser-utils/src/instrument/history.ts

@@ -1,7 +1,7 @@
 import type { HandlerDataXhr, SentryWrappedXMLHttpRequest, WrappedFunction } from '@sentry/types';
 
 import { addHandler, fill, isString, maybeInstrument, triggerHandlers } from '@sentry/utils';
-import { WINDOW } from '../browser/types';
+import { WINDOW } from '../metrics/types';
 
 export const SENTRY_XHR_DATA_KEY = '__sentry_xhr_v3__';
 

packages/browser-utils/src/instrument/xhr.ts

@@ -5,18 +5,18 @@ import type { Measurements, Span, SpanAttributes, StartSpanOptions } from '@sent
 import { browserPerformanceTimeOrigin, getComponentName, htmlTreeAsString, logger, parseUrl } from '@sentry/utils';
 
 import { spanToJSON } from '@sentry/core';
-import { DEBUG_BUILD } from '../../debug-build';
+import { DEBUG_BUILD } from '../debug-build';
 import {
   addClsInstrumentationHandler,
   addFidInstrumentationHandler,
   addLcpInstrumentationHandler,
   addPerformanceInstrumentationHandler,
   addTtfbInstrumentationHandler,
-} from '../instrument';
-import { WINDOW } from '../types';
-import { getNavigationEntry } from '../web-vitals/lib/getNavigationEntry';
-import { getVisibilityWatcher } from '../web-vitals/lib/getVisibilityWatcher';
+} from './instrument';
+import { WINDOW } from './types';
 import { isMeasurementValue, startAndEndSpan } from './utils';
+import { getNavigationEntry } from './web-vitals/lib/getNavigationEntry';
+import { getVisibilityWatcher } from './web-vitals/lib/getVisibilityWatcher';
 
 interface NavigatorNetworkInformation {
   readonly connection?: NetworkInformation;