[v7] Extract client creation to separate initClient function

Author: kamilogorek

packages/browser/src/client.ts

@@ -1,8 +1,5 @@
 import { BaseClient, SDK_VERSION } from '@sentry/core';
-import { CaptureContext, SentryEvent, Options } from '@sentry/types';
-import { supportsFetch } from '@sentry/utils';
-import { FetchTransport } from '@sentry/transport-fetch';
-import { XHRTransport } from '@sentry/transport-xhr';
+import { CaptureContext, ClientConfig, SentryEvent, Options } from '@sentry/types';
 import { eventFromException, eventFromMessage } from '@sentry/eventbuilder-browser';
 
 /**
@@ -55,7 +52,6 @@ export class BrowserClient extends BaseClient<BrowserOptions> {
       ],
       version: SDK_VERSION,
     };
-    options.transport = options.transport ?? (supportsFetch() ? FetchTransport : XHRTransport);
 
     super(options);
   }

packages/browser/src/sdk.ts

@@ -1,6 +1,6 @@
 import { ClientLike } from '@sentry/types';
 import { captureException, getCarrier, getCurrentClient } from '@sentry/minimal';
-import { addInstrumentationHandler, getGlobalObject, logger } from '@sentry/utils';
+import { addInstrumentationHandler, getGlobalObject, logger, supportsFetch } from '@sentry/utils';
 import { Dsn, getReportDialogEndpoint, ReportDialogOptions } from '@sentry/transport-base';
 import { InboundFilters } from '@sentry/integration-common-inboundfilters';
 import { UserAgent } from '@sentry/integration-browser-useragent';
@@ -16,6 +16,8 @@ import { LinkedErrors } from '@sentry/integration-browser-linkederrors';
 import { OnError, OnUnhandledRejection } from '@sentry/integration-browser-globalhandlers';
 
 import { BrowserClient, BrowserOptions } from './client';
+import { FetchTransport } from '@sentry/transport-fetch';
+import { XHRTransport } from '@sentry/transport-xhr';
 
 export const defaultIntegrations = [
   new EventTargetWrap(),
@@ -91,29 +93,37 @@ export const defaultIntegrations = [
  * @see {@link BrowserOptions} for documentation on configuration options.
  */
 export function init(options: BrowserOptions = {}): ClientLike {
+  const carrier = getCarrier();
+  const client = initClient(options);
+  carrier.client = client;
+
+  if (options.autoSessionTracking) {
+    startSessionTracking(client);
+  }
+
+  return client;
+}
+
+export function initClient(options: BrowserOptions = {}): ClientLike {
   if (options.defaultIntegrations === undefined) {
     options.defaultIntegrations = defaultIntegrations;
   }
+
   if (options.release === undefined) {
     const window = getGlobalObject<Window>();
     // This supports the variable that sentry-webpack-plugin injects
     if (window.SENTRY_RELEASE && window.SENTRY_RELEASE.id) {
       options.release = window.SENTRY_RELEASE.id;
     }
   }
+
   if (options.autoSessionTracking === undefined) {
     options.autoSessionTracking = true;
   }
 
-  const carrier = getCarrier();
-  const client = new BrowserClient(options);
-  carrier.client = client;
+  options.transport = options.transport ?? (supportsFetch() ? FetchTransport : XHRTransport);
 
-  if (options.autoSessionTracking) {
-    startSessionTracking(client);
-  }
-
-  return client;
+  return new BrowserClient(options);
 }
 
 /**

packages/node/src/client.ts

@@ -56,7 +56,6 @@ export class NodeClient extends BaseClient<NodeOptions> {
       ],
       version: SDK_VERSION,
     };
-    options.transport = options.transport ?? HTTPTransport;
 
     super(options);
   }

packages/node/src/sdk.ts

@@ -7,9 +7,10 @@ import { LinkedErrors } from '@sentry/integration-node-linkederrors';
 import { ContextLines } from '@sentry/integration-node-contextlines';
 import { OnUncaughtException, OnUnhandledRejection } from '@sentry/integration-node-globalhandlers';
 import { ConsoleBreadcrumbs, HTTPBreadcrumbs } from '@sentry/integration-node-breadcrumbs';
+import { HTTPTransport } from '@sentry/transport-http';
+import { ClientLike } from '@sentry/types';
 
 import { NodeClient, NodeOptions } from './client';
-import { ClientLike } from '@sentry/types';
 
 export const defaultIntegrations = [
   new ConsoleBreadcrumbs(),
@@ -77,6 +78,15 @@ export const defaultIntegrations = [
  * @see {@link NodeOptions} for documentation on configuration options.
  */
 export function init(options: NodeOptions = {}): ClientLike {
+  // TODO: Reevaluate whether stickin it on the domain is still necessary
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
+  const carrier = (domain as any).active ? getCarrier((domain as any).active) : getCarrier();
+  const client = initClient(options);
+  carrier.client = client;
+  return client;
+}
+
+export function initClient(options: NodeOptions = {}): ClientLike {
   if (options.defaultIntegrations === undefined) {
     options.defaultIntegrations = defaultIntegrations;
   }
@@ -108,10 +118,7 @@ export function init(options: NodeOptions = {}): ClientLike {
     options.environment = process.env.SENTRY_ENVIRONMENT;
   }
 
-  // TODO: Reevaluate whether stickin it on the domain is still necessary
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
-  const carrier = (domain as any).active ? getCarrier((domain as any).active) : getCarrier();
-  const client = new NodeClient(options);
-  carrier.client = client;
-  return client;
+  options.transport = options.transport ?? HTTPTransport;
+
+  return new NodeClient(options);
 }