adjust setupNodeTransport for new transport

Author: AbhiPrasad

packages/core/src/index.ts

@@ -1,12 +1,5 @@
 export type { APIDetails } from './api';
 export type { ClientClass } from './sdk';
-export type {
-  BaseTransportOptions,
-  NewTransport,
-  TransportMakeRequestResponse,
-  TransportRequest,
-  TransportRequestExecutor,
-} from './transports/base';
 
 export {
   addBreadcrumb,

packages/node/src/sdk.ts

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

packages/node/src/transports/new.ts

@@ -1,11 +1,11 @@
+import { createTransport } from '@sentry/core';
 import {
   BaseTransportOptions,
-  createTransport,
   NewTransport,
   TransportMakeRequestResponse,
   TransportRequest,
   TransportRequestExecutor,
-} from '@sentry/core';
+} from '@sentry/types';
 import { eventStatusFromHttpCode } from '@sentry/utils';
 import * as http from 'http';
 import * as https from 'https';

packages/node/src/transports/setup.ts

@@ -1,52 +1,37 @@
-import { getEnvelopeEndpointWithUrlEncodedAuth, initAPIDetails, NewTransport, NoopTransport } from '@sentry/core';
-import { Transport, TransportOptions } from '@sentry/types';
+import { getEnvelopeEndpointWithUrlEncodedAuth, initAPIDetails } from '@sentry/core';
+import { NewTransport, TransportOptions } from '@sentry/types';
 import { makeDsn } from '@sentry/utils';
 
 import { NodeOptions } from '../types';
-import { HTTPSTransport, HTTPTransport, makeNodeTransport } from '.';
+import { makeNodeTransport } from './new';
 
 /**
  * Sets up Node transport based on the passed `options`.
- *
- * @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 setupNodeTransport(options: NodeOptions): { transport: Transport; newTransport?: NewTransport } {
-  if (!options.dsn) {
-    // We return the noop transport here in case there is no Dsn.
-    return { transport: new NoopTransport() };
-  }
-
-  const dsn = makeDsn(options.dsn);
-
+export function setupNodeTransport(options: NodeOptions): NewTransport {
   const transportOptions: TransportOptions = {
     ...options.transportOptions,
     ...(options.httpProxy && { httpProxy: options.httpProxy }),
     ...(options.httpsProxy && { httpsProxy: options.httpsProxy }),
     ...(options.caCerts && { caCerts: options.caCerts }),
-    dsn: options.dsn,
+    // @ts-ignore Come back to this
+    // TODO(v7): Figure out how to enforce dsn
+    dsn: options.dsn === undefined ? undefined : makeDsn(options.dsn),
     tunnel: options.tunnel,
     _metadata: options._metadata,
   };
 
   if (options.transport) {
-    return { transport: new options.transport(transportOptions) };
+    return options.transport;
   }
 
   const api = initAPIDetails(transportOptions.dsn, transportOptions._metadata, transportOptions.tunnel);
   const url = getEnvelopeEndpointWithUrlEncodedAuth(api.dsn, api.tunnel);
 
-  const newTransport = makeNodeTransport({
+  return makeNodeTransport({
     url,
     headers: transportOptions.headers,
     proxy: transportOptions.httpProxy,
     caCerts: transportOptions.caCerts,
   });
-
-  if (dsn.protocol === 'http') {
-    return { transport: new HTTPTransport(transportOptions), newTransport };
-  }
-  return { transport: new HTTPSTransport(transportOptions), newTransport };
 }

packages/types/src/options.ts

@@ -5,7 +5,7 @@ import { CaptureContext } from './scope';
 import { SdkMetadata } from './sdkmetadata';
 import { StackLineParser, StackParser } from './stacktrace';
 import { SamplingContext } from './transaction';
-import { Transport, TransportClass, TransportOptions } from './transport';
+import { NewTransport, TransportOptions } from './transport';
 
 /** Base configuration options for every SDK. */
 export interface Options {
@@ -49,7 +49,7 @@ export interface Options {
   /**
    * Transport object that should be used to send events to Sentry
    */
-  transport?: TransportClass<Transport>;
+  transport?: NewTransport;
 
   /**
    * Options for the default transport that the SDK uses.