[v7] Change getDsn() method to regular client attribute

Author: kamilogorek

packages/browser/src/sdk.ts

@@ -139,7 +139,7 @@ export function showReportDialog(
   }
 
   options.eventId = options.eventId ?? client.lastEventId();
-  options.dsn = options.dsn ?? client.getDsn()?.toString();
+  options.dsn = options.dsn ?? client.options.dsn;
 
   if (client.options.enabled === false) {
     logger.error(`${errPrefix} disabled client`);

packages/core/src/baseclient.ts

@@ -67,7 +67,7 @@ export abstract class BaseClient<O extends Options> implements ClientLike<O> {
   public readonly options: O;
 
   /** The client Dsn, if specified in options. Without this Dsn, the SDK will be disabled. */
-  protected readonly _dsn?: Dsn;
+  public readonly dsn?: Dsn;
 
   /** Array of used integrations. */
   protected _integrations: IntegrationIndex = {};
@@ -94,7 +94,7 @@ export abstract class BaseClient<O extends Options> implements ClientLike<O> {
     this.options = options;
 
     if (options.dsn) {
-      this._dsn = new Dsn(options.dsn);
+      this.dsn = new Dsn(options.dsn);
     }
 
     this._transport = this._setupTransport();
@@ -118,11 +118,6 @@ export abstract class BaseClient<O extends Options> implements ClientLike<O> {
     this._eventProcessors.push(callback);
   }
 
-  // TODO: To be removed? Can be obtained from options
-  public getDsn(): Dsn | undefined {
-    return this._dsn;
-  }
-
   /**
    * @inheritDoc
    */

packages/integration-node-breadcrumbs/src/http.ts

@@ -94,10 +94,9 @@ function _createWrappedRequestMethodFactory(
       const requestArgs = normalizeRequestArgs(args);
       const requestOptions = requestArgs[0];
       const requestUrl = extractUrl(requestOptions);
-      const dsn = client.getDsn();
 
       // we don't want to record requests to Sentry as either breadcrumbs or spans, so just use the original method
-      if (!dsn || requestUrl.includes(dsn.host)) {
+      if (!client.dsn || requestUrl.includes(client.dsn?.host)) {
         return originalRequestMethod.apply(httpModule, requestArgs);
       }
 

packages/types/src/client.ts

@@ -16,12 +16,11 @@ import { Session } from './session';
  */
 export interface ClientLike<O extends Options = Options> {
   options: O;
+  dsn?: Dsn;
 
   getScope(): ScopeLike;
   setScope(scope: ScopeLike): void;
   addEventProcessor(callback: EventProcessor): void;
-  // TODO: To be removed? Can be obtained from options
-  getDsn(): Dsn | undefined;
   lastEventId(): string | undefined;
 
   captureException(exception: unknown, captureContext?: CaptureContext): string | undefined;