feat(v8): Remove deprecated integration methods on client

Author: AbhiPrasad

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

@@ -31,7 +31,7 @@ sentryTest('can manually snapshot canvas', async ({ getLocalTestUrl, page, brows
   expect(incrementalSnapshots).toEqual([]);
 
   await page.evaluate(() => {
-    (window as any).Sentry.getClient().getIntegrationById('ReplayCanvas').snapshot();
+    (window as any).Sentry.getClient().getIntegrationByName('ReplayCanvas').snapshot();
   });
 
   const { incrementalSnapshots: incrementalSnapshotsManual } = getReplayRecordingContent(await reqPromise3);

packages/core/src/baseclient.ts

@@ -15,7 +15,6 @@ import type {
   EventProcessor,
   FeedbackEvent,
   Integration,
-  IntegrationClass,
   Outcome,
   ParameterizedString,
   SdkMetadata,
@@ -317,16 +316,6 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
     }
   }
 
-  /**
-   * Gets an installed integration by its `id`.
-   *
-   * @returns The installed integration or `undefined` if no integration with that `id` was installed.
-   * @deprecated Use `getIntegrationByName()` instead.
-   */
-  public getIntegrationById(integrationId: string): Integration | undefined {
-    return this.getIntegrationByName(integrationId);
-  }
-
   /**
    * Gets an installed integration by its name.
    *
@@ -336,19 +325,6 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
     return this._integrations[integrationName] as T | undefined;
   }
 
-  /**
-   * Returns the client's instance of the given integration class, it any.
-   * @deprecated Use `getIntegrationByName()` instead.
-   */
-  public getIntegration<T extends Integration>(integration: IntegrationClass<T>): T | null {
-    try {
-      return (this._integrations[integration.id] as T) || null;
-    } catch (_oO) {
-      DEBUG_BUILD && logger.warn(`Cannot retrieve integration ${integration.id} from the current Client`);
-      return null;
-    }
-  }
-
   /**
    * @inheritDoc
    */

packages/core/src/hub.ts

@@ -428,8 +428,7 @@ export class Hub implements HubInterface {
     const client = this.getClient();
     if (!client) return null;
     try {
-      // eslint-disable-next-line deprecation/deprecation
-      return client.getIntegration(integration);
+      return client.getIntegrationByName<T>(integration.id) || null;
     } catch (_oO) {
       DEBUG_BUILD && logger.warn(`Cannot retrieve integration ${integration.id} from the current Hub`);
       return null;

packages/node-experimental/src/sdk/hub.ts

@@ -0,0 +1,102 @@
+import type { Client, EventHint, Hub, Integration, IntegrationClass, Scope, SeverityLevel } from '@sentry/types';
+
+import {
+  addBreadcrumb,
+  captureEvent,
+  endSession,
+  getCurrentScope,
+  getIsolationScope,
+  setContext,
+  setExtra,
+  setExtras,
+  setTag,
+  setTags,
+  setUser,
+  startSession,
+  withScope,
+} from '@sentry/core';
+import { getClient } from './api';
+
+/**
+ * This is for legacy reasons, and returns a proxy object instead of a hub to be used.
+ * @deprecated Use the methods directly.
+ */
+export function getCurrentHub(): Hub {
+  return {
+    isOlderThan(_version: number): boolean {
+      return false;
+    },
+
+    bindClient(client: Client): void {
+      const scope = getCurrentScope();
+      scope.setClient(client);
+    },
+
+    pushScope(): Scope {
+      // TODO: This does not work and is actually deprecated
+      return getCurrentScope();
+    },
+
+    popScope(): boolean {
+      // TODO: This does not work and is actually deprecated
+      return false;
+    },
+
+    withScope,
+    getClient: <C extends Client>() => getClient() as C | undefined,
+    getScope: getCurrentScope,
+    getIsolationScope,
+    captureException: (exception: unknown, hint?: EventHint) => {
+      return getCurrentScope().captureException(exception, hint);
+    },
+    captureMessage: (message: string, level?: SeverityLevel, hint?: EventHint) => {
+      return getCurrentScope().captureMessage(message, level, hint);
+    },
+    captureEvent,
+    addBreadcrumb,
+    setUser,
+    setTags,
+    setTag,
+    setExtra,
+    setExtras,
+    setContext,
+
+    getIntegration<T extends Integration>(integration: IntegrationClass<T>): T | null {
+      return getClient().getIntegrationByName<T>(integration.id) || null;
+    },
+
+    startSession,
+
+    endSession,
+
+    captureSession(endSession?: boolean): void {
+      // both send the update and pull the session from the scope
+      if (endSession) {
+        // eslint-disable-next-line deprecation/deprecation
+        return this.endSession();
+      }
+
+      // only send the update
+      _sendSessionUpdate();
+    },
+
+    shouldSendDefaultPii(): boolean {
+      const client = getClient();
+      const options = client.getOptions();
+      return Boolean(options.sendDefaultPii);
+    },
+  };
+}
+
+/**
+ * Sends the current Session on the scope
+ */
+function _sendSessionUpdate(): void {
+  const scope = getCurrentScope();
+  const client = getClient();
+
+  const session = scope.getSession();
+  if (session) {
+    client.captureSession(session);
+  }
+}

packages/node/src/integrations/undici/index.ts

@@ -170,8 +170,7 @@ export class Undici implements Integration {
   }
 
   private _onRequestCreate = (message: unknown): void => {
-    // eslint-disable-next-line deprecation/deprecation
-    if (!getClient()?.getIntegration(Undici)) {
+    if (!getClient()?.getIntegrationByName('Undici')) {
       return;
     }
 
@@ -229,8 +228,7 @@ export class Undici implements Integration {
   };
 
   private _onRequestEnd = (message: unknown): void => {
-    // eslint-disable-next-line deprecation/deprecation
-    if (!getClient()?.getIntegration(Undici)) {
+    if (!getClient()?.getIntegrationByName('Undici')) {
       return;
     }
 
@@ -269,8 +267,7 @@ export class Undici implements Integration {
   };
 
   private _onRequestError = (message: unknown): void => {
-    // eslint-disable-next-line deprecation/deprecation
-    if (!getClient()?.getIntegration(Undici)) {
+    if (!getClient()?.getIntegrationByName('Undici')) {
       return;
     }
 

packages/opentelemetry/src/custom/getCurrentHub.ts

@@ -62,8 +62,7 @@ export function getCurrentHub(): Hub {
     setContext,
 
     getIntegration<T extends Integration>(integration: IntegrationClass<T>): T | null {
-      // eslint-disable-next-line deprecation/deprecation
-      return getClient()?.getIntegration(integration) || null;
+      return getClient()?.getIntegrationByName<T>(integration) || null;
     },
 
     startSession,