Random removals

Author: Luca Forstner

dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customBrowserTracing/test.ts

@@ -7,7 +7,7 @@ import {
   waitForTransactionRequestOnUrl,
 } from '../../../../utils/helpers';
 
-sentryTest('should handle custom added BrowserTracing integration', async ({ getLocalTestUrl, page }) => {
+sentryTest('should handle custom added browserTracingIntegration instances', async ({ getLocalTestUrl, page }) => {
   if (shouldSkipTracingTest()) {
     sentryTest.skip();
   }

dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts

@@ -21,7 +21,7 @@ sentryTest(
 
     // In this test, we don't expect trace.transaction to be present because without a custom routing instrumentation
     // we for now don't have parameterization. This might change in the future but for now the only way of having
-    // transaction in DSC with the default BrowserTracing integration is when the transaction name is set manually.
+    // transaction in DSC with the default browserTracingIntegration is when the transaction name is set manually.
     // This scenario is covered in another integration test (envelope-header-transaction-name).
     expect(envHeader.trace).toBeDefined();
     expect(envHeader.trace).toEqual({

packages/angular/src/tracing.ts

@@ -67,7 +67,7 @@ export function routingInstrumentation(
 export const instrumentAngularRouting = routingInstrumentation;
 
 /**
- * A custom BrowserTracing integration for Angular.
+ * A custom browser tracing integration for Angular.
  *
  * Use this integration in combination with `TraceService`
  */

packages/astro/test/client/sdk.test.ts

@@ -56,7 +56,7 @@ describe('Sentry client SDK', () => {
         ['tracesSampleRate', { tracesSampleRate: 0 }],
         ['tracesSampler', { tracesSampler: () => 1.0 }],
         ['enableTracing', { enableTracing: true }],
-      ])('adds the BrowserTracing integration if tracing is enabled via %s', (_, tracingOptions) => {
+      ])('adds browserTracingIntegration if tracing is enabled via %s', (_, tracingOptions) => {
         init({
           dsn: 'https://[email protected]/1337',
           ...tracingOptions,
@@ -72,7 +72,7 @@ describe('Sentry client SDK', () => {
       it.each([
         ['enableTracing', { enableTracing: false }],
         ['no tracing option set', {}],
-      ])("doesn't add the BrowserTracing integration if tracing is disabled via %s", (_, tracingOptions) => {
+      ])("doesn't add browserTracingIntegration if tracing is disabled via %s", (_, tracingOptions) => {
         init({
           dsn: 'https://[email protected]/1337',
           ...tracingOptions,
@@ -85,7 +85,7 @@ describe('Sentry client SDK', () => {
         expect(browserTracing).toBeUndefined();
       });
 
-      it("doesn't add the BrowserTracing integration if `__SENTRY_TRACING__` is set to false", () => {
+      it("doesn't add browserTracingIntegration if `__SENTRY_TRACING__` is set to false", () => {
         globalThis.__SENTRY_TRACING__ = false;
 
         init({
@@ -102,7 +102,7 @@ describe('Sentry client SDK', () => {
         delete globalThis.__SENTRY_TRACING__;
       });
 
-      it('Overrides the automatically default BrowserTracing instance with a a user-provided browserTracingIntegration instance', () => {
+      it('Overrides the automatically default browserTracingIntegration instance with a a user-provided browserTracingIntegration instance', () => {
         init({
           dsn: 'https://[email protected]/1337',
           integrations: [

packages/astro/test/integration/snippets.test.ts

@@ -50,7 +50,7 @@ describe('buildClientSnippet', () => {
     `);
   });
 
-  it('does not include BrowserTracing if tracesSampleRate is 0', () => {
+  it('does not include browserTracingIntegration if tracesSampleRate is 0', () => {
     const snippet = buildClientSnippet({ tracesSampleRate: 0 });
     expect(snippet).toMatchInlineSnapshot(`
       "import * as Sentry from \\"@sentry/astro\\";

packages/browser/src/helpers.ts

@@ -1,7 +1,5 @@
-import type { browserTracingIntegration } from '@sentry-internal/tracing';
-import { BrowserTracing } from '@sentry-internal/tracing';
 import { captureException, withScope } from '@sentry/core';
-import type { Integration, Mechanism, WrappedFunction } from '@sentry/types';
+import type { Mechanism, WrappedFunction } from '@sentry/types';
 import {
   GLOBAL_OBJ,
   addExceptionMechanism,
@@ -155,35 +153,3 @@ export function wrap(
 
   return sentryWrapped;
 }
-
-/**
- * This is a slim shim of `browserTracingIntegration` for the CDN bundles.
- * Since the actual functional integration uses a different code from `BrowserTracing`,
- * we want to avoid shipping both of them in the CDN bundles, as that would blow up the size.
- * Instead, we provide a functional integration with the same API, but the old implementation.
- * This means that it's not possible to register custom routing instrumentation, but that's OK for now.
- * We also don't expose the utilities for this anyhow in the CDN bundles.
- * For users that need custom routing in CDN bundles, they have to continue using `new BrowserTracing()` until v8.
- */
-export function bundleBrowserTracingIntegration(
-  options: Parameters<typeof browserTracingIntegration>[0] = {},
-): Integration {
-  // Migrate some options from the old integration to the new one
-  // eslint-disable-next-line deprecation/deprecation
-  const opts: ConstructorParameters<typeof BrowserTracing>[0] = options;
-
-  if (typeof options.markBackgroundSpan === 'boolean') {
-    opts.markBackgroundTransactions = options.markBackgroundSpan;
-  }
-
-  if (typeof options.instrumentPageLoad === 'boolean') {
-    opts.startTransactionOnPageLoad = options.instrumentPageLoad;
-  }
-
-  if (typeof options.instrumentNavigation === 'boolean') {
-    opts.startTransactionOnLocationChange = options.instrumentNavigation;
-  }
-
-  // eslint-disable-next-line deprecation/deprecation
-  return new BrowserTracing(opts);
-}

packages/browser/src/index.bundle.feedback.ts

@@ -1,7 +1,6 @@
 // This is exported so the loader does not fail when switching off Replay/Tracing
 import { Feedback, feedbackIntegration } from '@sentry-internal/feedback';
 import {
-  BrowserTracing,
   Replay,
   addTracingExtensions,
   browserTracingIntegration,
@@ -14,13 +13,8 @@ import * as Sentry from './index.bundle.base';
 // eslint-disable-next-line deprecation/deprecation
 Sentry.Integrations.Replay = Replay;
 
-// eslint-disable-next-line deprecation/deprecation
-Sentry.Integrations.BrowserTracing = BrowserTracing;
-
 export * from './index.bundle.base';
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  BrowserTracing,
   browserTracingIntegration,
   addTracingExtensions,
   // eslint-disable-next-line deprecation/deprecation

packages/browser/src/index.bundle.replay.ts

@@ -1,6 +1,5 @@
 // This is exported so the loader does not fail when switching off Replay/Tracing
 import {
-  BrowserTracing,
   Feedback,
   addTracingExtensions,
   browserTracingIntegration,
@@ -14,13 +13,8 @@ import * as Sentry from './index.bundle.base';
 // eslint-disable-next-line deprecation/deprecation
 Sentry.Integrations.Replay = Replay;
 
-// eslint-disable-next-line deprecation/deprecation
-Sentry.Integrations.BrowserTracing = BrowserTracing;
-
 export * from './index.bundle.base';
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  BrowserTracing,
   browserTracingIntegration,
   addTracingExtensions,
   // eslint-disable-next-line deprecation/deprecation

packages/browser/src/index.bundle.tracing.replay.feedback.ts

@@ -1,7 +1,6 @@
 import { Feedback, feedbackIntegration } from '@sentry-internal/feedback';
-import { BrowserTracing, addExtensionMethods } from '@sentry-internal/tracing';
+import { addExtensionMethods, browserTracingIntegration } from '@sentry-internal/tracing';
 import { Replay, replayIntegration } from '@sentry/replay';
-import { bundleBrowserTracingIntegration as browserTracingIntegration } from './helpers';
 
 import * as Sentry from './index.bundle.base';
 
@@ -11,9 +10,6 @@ import * as Sentry from './index.bundle.base';
 // eslint-disable-next-line deprecation/deprecation
 Sentry.Integrations.Replay = Replay;
 
-// eslint-disable-next-line deprecation/deprecation
-Sentry.Integrations.BrowserTracing = BrowserTracing;
-
 // We are patching the global object with our hub extension methods
 addExtensionMethods();
 
@@ -24,8 +20,6 @@ export {
   Replay,
   feedbackIntegration,
   replayIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  BrowserTracing,
   browserTracingIntegration,
   addExtensionMethods,
 };

packages/browser/src/index.bundle.tracing.replay.ts

@@ -1,7 +1,6 @@
 import { Feedback, feedbackIntegration } from '@sentry-internal/integration-shims';
-import { BrowserTracing, addExtensionMethods } from '@sentry-internal/tracing';
+import { addExtensionMethods, browserTracingIntegration } from '@sentry-internal/tracing';
 import { Replay, replayIntegration } from '@sentry/replay';
-import { bundleBrowserTracingIntegration as browserTracingIntegration } from './helpers';
 
 import * as Sentry from './index.bundle.base';
 
@@ -11,9 +10,6 @@ import * as Sentry from './index.bundle.base';
 // eslint-disable-next-line deprecation/deprecation
 Sentry.Integrations.Replay = Replay;
 
-// eslint-disable-next-line deprecation/deprecation
-Sentry.Integrations.BrowserTracing = BrowserTracing;
-
 // We are patching the global object with our hub extension methods
 addExtensionMethods();
 
@@ -24,8 +20,6 @@ export {
   Replay,
   replayIntegration,
   feedbackIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  BrowserTracing,
   browserTracingIntegration,
   addExtensionMethods,
 };

packages/browser/src/index.bundle.tracing.ts

@@ -1,7 +1,6 @@
 // This is exported so the loader does not fail when switching off Replay
 import { Feedback, Replay, feedbackIntegration, replayIntegration } from '@sentry-internal/integration-shims';
-import { BrowserTracing, addExtensionMethods } from '@sentry-internal/tracing';
-import { bundleBrowserTracingIntegration as browserTracingIntegration } from './helpers';
+import { addExtensionMethods, browserTracingIntegration } from '@sentry-internal/tracing';
 
 import * as Sentry from './index.bundle.base';
 
@@ -11,9 +10,6 @@ import * as Sentry from './index.bundle.base';
 // eslint-disable-next-line deprecation/deprecation
 Sentry.Integrations.Replay = Replay;
 
-// eslint-disable-next-line deprecation/deprecation
-Sentry.Integrations.BrowserTracing = BrowserTracing;
-
 // We are patching the global object with our hub extension methods
 addExtensionMethods();
 
@@ -24,8 +20,6 @@ export {
   Replay,
   feedbackIntegration,
   replayIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  BrowserTracing,
   browserTracingIntegration,
   addExtensionMethods,
 };

packages/browser/src/index.bundle.ts

@@ -1,6 +1,5 @@
 // This is exported so the loader does not fail when switching off Replay/Tracing
 import {
-  BrowserTracing,
   Feedback,
   Replay,
   addTracingExtensions,
@@ -15,13 +14,8 @@ import * as Sentry from './index.bundle.base';
 // eslint-disable-next-line deprecation/deprecation
 Sentry.Integrations.Replay = Replay;
 
-// eslint-disable-next-line deprecation/deprecation
-Sentry.Integrations.BrowserTracing = BrowserTracing;
-
 export * from './index.bundle.base';
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  BrowserTracing,
   addTracingExtensions,
   // eslint-disable-next-line deprecation/deprecation
   Replay,

packages/browser/src/index.ts

@@ -55,8 +55,6 @@ export {
 } from '@sentry-internal/feedback';
 
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  BrowserTracing,
   defaultRequestInstrumentationOptions,
   instrumentOutgoingRequests,
   browserTracingIntegration,

packages/browser/test/unit/index.bundle.feedback.test.ts

@@ -11,20 +11,14 @@ import * as TracingReplayBundle from '../../src/index.bundle.feedback';
 describe('index.bundle.feedback', () => {
   it('has correct exports', () => {
     Object.keys(TracingReplayBundle.Integrations).forEach(key => {
-      // Skip BrowserTracing because it doesn't have a static id field.
-      if (key === 'BrowserTracing') {
-        return;
-      }
-
       expect((TracingReplayBundle.Integrations[key] as any).id).toStrictEqual(expect.any(String));
     });
 
     expect(TracingReplayBundle.Integrations.Replay).toBe(ReplayShim);
     expect(TracingReplayBundle.Replay).toBe(ReplayShim);
     expect(TracingReplayBundle.replayIntegration).toBe(replayIntegrationShim);
 
-    expect(TracingReplayBundle.Integrations.BrowserTracing).toBe(BrowserTracingShim);
-    expect(TracingReplayBundle.BrowserTracing).toBe(BrowserTracingShim);
+    expect(TracingReplayBundle.browserTracingIntegration).toBe(BrowserTracingShim);
 
     expect(TracingReplayBundle.Feedback).toBe(Feedback);
     expect(TracingReplayBundle.feedbackIntegration).toBe(feedbackIntegration);

packages/browser/test/unit/index.bundle.replay.test.ts

@@ -11,20 +11,14 @@ import * as TracingReplayBundle from '../../src/index.bundle.replay';
 describe('index.bundle.replay', () => {
   it('has correct exports', () => {
     Object.keys(TracingReplayBundle.Integrations).forEach(key => {
-      // Skip BrowserTracing because it doesn't have a static id field.
-      if (key === 'BrowserTracing') {
-        return;
-      }
-
       expect((TracingReplayBundle.Integrations[key] as any).id).toStrictEqual(expect.any(String));
     });
 
     expect(TracingReplayBundle.Integrations.Replay).toBe(Replay);
     expect(TracingReplayBundle.Replay).toBe(Replay);
     expect(TracingReplayBundle.replayIntegration).toBe(replayIntegration);
 
-    expect(TracingReplayBundle.Integrations.BrowserTracing).toBe(BrowserTracingShim);
-    expect(TracingReplayBundle.BrowserTracing).toBe(BrowserTracingShim);
+    expect(TracingReplayBundle.browserTracingIntegration).toBe(BrowserTracingShim);
 
     expect(TracingReplayBundle.Feedback).toBe(FeedbackShim);
     expect(TracingReplayBundle.feedbackIntegration).toBe(feedbackIntegrationShim);

packages/browser/test/unit/index.bundle.test.ts

@@ -12,20 +12,14 @@ import * as TracingBundle from '../../src/index.bundle';
 describe('index.bundle', () => {
   it('has correct exports', () => {
     Object.keys(TracingBundle.Integrations).forEach(key => {
-      // Skip BrowserTracing because it doesn't have a static id field.
-      if (key === 'BrowserTracing') {
-        return;
-      }
-
       expect((TracingBundle.Integrations[key] as any).id).toStrictEqual(expect.any(String));
     });
 
     expect(TracingBundle.Integrations.Replay).toBe(ReplayShim);
     expect(TracingBundle.Replay).toBe(ReplayShim);
     expect(TracingBundle.replayIntegration).toBe(replayIntegrationShim);
 
-    expect(TracingBundle.Integrations.BrowserTracing).toBe(BrowserTracingShim);
-    expect(TracingBundle.BrowserTracing).toBe(BrowserTracingShim);
+    expect(TracingBundle.browserTracingIntegration).toBe(BrowserTracingShim);
 
     expect(TracingBundle.Feedback).toBe(FeedbackShim);
     expect(TracingBundle.feedbackIntegration).toBe(feedbackIntegrationShim);

packages/browser/test/unit/index.bundle.tracing.replay.feedback.test.ts

@@ -1,26 +1,19 @@
-/* eslint-disable deprecation/deprecation */
-import { BrowserTracing } from '@sentry-internal/tracing';
+import { browserTracingIntegration } from '@sentry-internal/tracing';
 import { Feedback, Replay, feedbackIntegration, replayIntegration } from '@sentry/browser';
 
 import * as TracingReplayFeedbackBundle from '../../src/index.bundle.tracing.replay.feedback';
 
 describe('index.bundle.tracing.replay.feedback', () => {
   it('has correct exports', () => {
     Object.keys(TracingReplayFeedbackBundle.Integrations).forEach(key => {
-      // Skip BrowserTracing because it doesn't have a static id field.
-      if (key === 'BrowserTracing') {
-        return;
-      }
-
       expect((TracingReplayFeedbackBundle.Integrations[key] as any).id).toStrictEqual(expect.any(String));
     });
 
     expect(TracingReplayFeedbackBundle.Integrations.Replay).toBe(Replay);
     expect(TracingReplayFeedbackBundle.Replay).toBe(Replay);
     expect(TracingReplayFeedbackBundle.replayIntegration).toBe(replayIntegration);
 
-    expect(TracingReplayFeedbackBundle.Integrations.BrowserTracing).toBe(BrowserTracing);
-    expect(TracingReplayFeedbackBundle.BrowserTracing).toBe(BrowserTracing);
+    expect(TracingReplayFeedbackBundle.browserTracingIntegration).toBe(browserTracingIntegration);
 
     expect(TracingReplayFeedbackBundle.Feedback).toBe(Feedback);
     expect(TracingReplayFeedbackBundle.feedbackIntegration).toBe(feedbackIntegration);

packages/browser/test/unit/index.bundle.tracing.replay.test.ts

@@ -3,28 +3,22 @@ import {
   Feedback as FeedbackShim,
   feedbackIntegration as feedbackIntegrationShim,
 } from '@sentry-internal/integration-shims';
-import { BrowserTracing } from '@sentry-internal/tracing';
+import { browserTracingIntegration } from '@sentry-internal/tracing';
 import { Replay, replayIntegration } from '@sentry/browser';
 
 import * as TracingReplayBundle from '../../src/index.bundle.tracing.replay';
 
 describe('index.bundle.tracing.replay', () => {
   it('has correct exports', () => {
     Object.keys(TracingReplayBundle.Integrations).forEach(key => {
-      // Skip BrowserTracing because it doesn't have a static id field.
-      if (key === 'BrowserTracing') {
-        return;
-      }
-
       expect((TracingReplayBundle.Integrations[key] as any).id).toStrictEqual(expect.any(String));
     });
 
     expect(TracingReplayBundle.Integrations.Replay).toBe(Replay);
     expect(TracingReplayBundle.Replay).toBe(Replay);
     expect(TracingReplayBundle.replayIntegration).toBe(replayIntegration);
 
-    expect(TracingReplayBundle.Integrations.BrowserTracing).toBe(BrowserTracing);
-    expect(TracingReplayBundle.BrowserTracing).toBe(BrowserTracing);
+    expect(TracingReplayBundle.browserTracingIntegration).toBe(browserTracingIntegration);
 
     expect(TracingReplayBundle.Feedback).toBe(FeedbackShim);
     expect(TracingReplayBundle.feedbackIntegration).toBe(feedbackIntegrationShim);