adjust transport constructors

Author: AbhiPrasad

packages/browser/src/sdk.ts

@@ -98,8 +98,7 @@ export function init(options: BrowserOptions = {}): void {
     options.stackParser = defaultStackParsers;
   }
 
-  const { transport, newTransport } = setupBrowserTransport(options);
-  initAndBind(BrowserClient, options, transport, newTransport);
+  initAndBind(BrowserClient, options, setupBrowserTransport(options));
 
   if (options.autoSessionTracking) {
     startSessionTracking();

packages/browser/src/transports/new-fetch.ts

@@ -1,10 +1,5 @@
-import {
-  BaseTransportOptions,
-  createTransport,
-  NewTransport,
-  TransportMakeRequestResponse,
-  TransportRequest,
-} from '@sentry/core';
+import { BaseTransportOptions, NewTransport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
+import { createTransport } from '@sentry/core';
 
 import { FetchImpl, getNativeFetchImplementation } from './utils';
 

packages/browser/src/transports/new-xhr.ts

@@ -1,10 +1,5 @@
-import {
-  BaseTransportOptions,
-  createTransport,
-  NewTransport,
-  TransportMakeRequestResponse,
-  TransportRequest,
-} from '@sentry/core';
+import { createTransport } from '@sentry/core';
+import { BaseTransportOptions, NewTransport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
 import { SyncPromise } from '@sentry/utils';
 
 /**

packages/browser/src/transports/setup.ts

@@ -1,18 +1,10 @@
-import {
-  BaseTransportOptions,
-  getEnvelopeEndpointWithUrlEncodedAuth,
-  initAPIDetails,
-  NewTransport,
-  NoopTransport,
-} from '@sentry/core';
-import { Transport, TransportOptions } from '@sentry/types';
+import { getEnvelopeEndpointWithUrlEncodedAuth, initAPIDetails } from '@sentry/core';
+import { BaseTransportOptions, NewTransport, TransportOptions } from '@sentry/types';
 import { supportsFetch } from '@sentry/utils';
 
 import { BrowserOptions } from '../client';
-import { FetchTransport } from './fetch';
 import { makeNewFetchTransport } from './new-fetch';
 import { makeNewXHRTransport } from './new-xhr';
-import { XHRTransport } from './xhr';
 
 export interface BrowserTransportOptions extends BaseTransportOptions {
   // options to pass into fetch request
@@ -25,20 +17,11 @@ export interface BrowserTransportOptions extends BaseTransportOptions {
  * Sets up Browser transports based on the passed `options`. If available, the returned
  * transport will use the fetch API. In case fetch is not supported, an XMLHttpRequest
  * based transport is created.
- *
- * @returns an object currently still containing both, the old `Transport` and
- * `NewTransport` which will eventually replace `Transport`. Once this is replaced,
- * this function will return a ready to use `NewTransport`.
  */
-// TODO(v7): Adjust return value when NewTransport is the default
-export function setupBrowserTransport(options: BrowserOptions): { transport: Transport; newTransport?: NewTransport } {
-  if (!options.dsn) {
-    // We return the noop transport here in case there is no Dsn.
-    return { transport: new NoopTransport() };
-  }
-
+export function setupBrowserTransport(options: BrowserOptions): NewTransport {
   const transportOptions: TransportOptions = {
     ...options.transportOptions,
+    // @ts-ignore figure out dsn stuff
     dsn: options.dsn,
     tunnel: options.tunnel,
     sendClientReports: options.sendClientReports,
@@ -49,20 +32,16 @@ export function setupBrowserTransport(options: BrowserOptions): { transport: Tra
   const url = getEnvelopeEndpointWithUrlEncodedAuth(api.dsn, api.tunnel);
 
   if (options.transport) {
-    return { transport: new options.transport(transportOptions) };
+    return options.transport;
   }
 
   if (supportsFetch()) {
     const requestOptions: RequestInit = { ...transportOptions.fetchParameters };
-    const newTransport = makeNewFetchTransport({ requestOptions, url });
-    const fetchTransport = new FetchTransport(transportOptions);
-    return { transport: fetchTransport, newTransport };
+    return makeNewFetchTransport({ requestOptions, url });
   }
 
-  const newTransport = makeNewXHRTransport({
+  return makeNewXHRTransport({
     url,
     headers: transportOptions.headers,
   });
-  const transport = new XHRTransport(transportOptions);
-  return { transport, newTransport };
 }

packages/node/src/sdk.ts

@@ -131,8 +131,7 @@ export function init(options: NodeOptions = {}): void {
     setHubOnCarrier(carrier, getCurrentHub());
   }
 
-  const { transport } = setupNodeTransport(options);
-  initAndBind(NodeClient, options, transport);
+  initAndBind(NodeClient, options, setupNodeTransport(options));
 
   if (options.autoSessionTracking) {
     startSessionTracking();

packages/node/src/transports/setup.ts

@@ -16,7 +16,7 @@ export function setupNodeTransport(options: NodeOptions): NewTransport {
     ...(options.caCerts && { caCerts: options.caCerts }),
     // @ts-ignore Come back to this
     // TODO(v7): Figure out how to enforce dsn
-    dsn: options.dsn === undefined ? undefined : makeDsn(options.dsn),
+    dsn: options.dsn,
     tunnel: options.tunnel,
     _metadata: options._metadata,
   };