Address PR review

Author: AbhiPrasad

packages/browser/src/sdk.ts

@@ -14,7 +14,7 @@ import { IS_DEBUG_BUILD } from './flags';
 import { ReportDialogOptions, wrap as internalWrap } from './helpers';
 import { Breadcrumbs, Dedupe, GlobalHandlers, LinkedErrors, TryCatch, UserAgent } from './integrations';
 import { defaultStackParsers } from './stack-parsers';
-import { makeNewFetchTransport, makeNewXHRTransport } from './transports';
+import { makeFetchTransport, makeXHRTransport } from './transports';
 
 export const defaultIntegrations = [
   new CoreIntegrations.InboundFilters(),
@@ -106,7 +106,7 @@ export function init(options: BrowserOptions = {}): void {
     ...options,
     stackParser: stackParserFromOptions(options.stackParser || defaultStackParsers),
     integrations: getIntegrationsToSetup(options),
-    transport: options.transport || (supportsFetch() ? makeNewFetchTransport : makeNewXHRTransport),
+    transport: options.transport || (supportsFetch() ? makeFetchTransport : makeXHRTransport),
   };
 
   initAndBind(BrowserClient, clientOptions);

packages/browser/src/transports/fetch.ts

@@ -10,7 +10,7 @@ export interface FetchTransportOptions extends BaseTransportOptions {
 /**
  * Creates a Transport that uses the Fetch API to send events to Sentry.
  */
-export function makeNewFetchTransport(
+export function makeFetchTransport(
   options: FetchTransportOptions,
   nativeFetch: FetchImpl = getNativeFetchImplementation(),
 ): Transport {

packages/browser/src/transports/index.ts

@@ -1,2 +1,2 @@
-export { makeNewFetchTransport } from './fetch';
-export { makeNewXHRTransport } from './xhr';
+export { makeFetchTransport } from './fetch';
+export { makeXHRTransport } from './xhr';

packages/browser/src/transports/xhr.ts

@@ -19,7 +19,7 @@ export interface XHRTransportOptions extends BaseTransportOptions {
 /**
  * Creates a Transport that uses the XMLHttpRequest API to send events to Sentry.
  */
-export function makeNewXHRTransport(options: XHRTransportOptions): Transport {
+export function makeXHRTransport(options: XHRTransportOptions): Transport {
   function makeRequest(request: TransportRequest): PromiseLike<TransportMakeRequestResponse> {
     return new SyncPromise<TransportMakeRequestResponse>((resolve, _reject) => {
       const xhr = new XMLHttpRequest();

packages/browser/test/unit/transports/fetch.test.ts

@@ -1,7 +1,7 @@
 import { EventEnvelope, EventItem } from '@sentry/types';
 import { createEnvelope, serializeEnvelope } from '@sentry/utils';
 
-import { FetchTransportOptions, makeNewFetchTransport } from '../../../src/transports/fetch';
+import { FetchTransportOptions, makeFetchTransport } from '../../../src/transports/fetch';
 import { FetchImpl } from '../../../src/transports/utils';
 
 const DEFAULT_FETCH_TRANSPORT_OPTIONS: FetchTransportOptions = {
@@ -31,7 +31,7 @@ describe('NewFetchTransport', () => {
         text: () => Promise.resolve({}),
       }),
     ) as unknown as FetchImpl;
-    const transport = makeNewFetchTransport(DEFAULT_FETCH_TRANSPORT_OPTIONS, mockFetch);
+    const transport = makeFetchTransport(DEFAULT_FETCH_TRANSPORT_OPTIONS, mockFetch);
 
     expect(mockFetch).toHaveBeenCalledTimes(0);
     const res = await transport.send(ERROR_ENVELOPE);
@@ -58,7 +58,7 @@ describe('NewFetchTransport', () => {
         text: () => Promise.resolve({}),
       }),
     ) as unknown as FetchImpl;
-    const transport = makeNewFetchTransport(DEFAULT_FETCH_TRANSPORT_OPTIONS, mockFetch);
+    const transport = makeFetchTransport(DEFAULT_FETCH_TRANSPORT_OPTIONS, mockFetch);
 
     expect(headers.get).toHaveBeenCalledTimes(0);
     await transport.send(ERROR_ENVELOPE);
@@ -83,7 +83,7 @@ describe('NewFetchTransport', () => {
       referrer: 'http://example.org',
     };
 
-    const transport = makeNewFetchTransport(
+    const transport = makeFetchTransport(
       { ...DEFAULT_FETCH_TRANSPORT_OPTIONS, requestOptions: REQUEST_OPTIONS },
       mockFetch,
     );

packages/browser/test/unit/transports/xhr.test.ts

@@ -1,7 +1,7 @@
 import { EventEnvelope, EventItem } from '@sentry/types';
 import { createEnvelope, serializeEnvelope } from '@sentry/utils';
 
-import { makeNewXHRTransport, XHRTransportOptions } from '../../../src/transports/xhr';
+import { makeXHRTransport, XHRTransportOptions } from '../../../src/transports/xhr';
 
 const DEFAULT_XHR_TRANSPORT_OPTIONS: XHRTransportOptions = {
   url: 'https://sentry.io/api/42/store/?sentry_key=123&sentry_version=7',
@@ -52,7 +52,7 @@ describe('NewXHRTransport', () => {
   });
 
   it('makes an XHR request to the given URL', async () => {
-    const transport = makeNewXHRTransport(DEFAULT_XHR_TRANSPORT_OPTIONS);
+    const transport = makeXHRTransport(DEFAULT_XHR_TRANSPORT_OPTIONS);
     expect(xhrMock.open).toHaveBeenCalledTimes(0);
     expect(xhrMock.setRequestHeader).toHaveBeenCalledTimes(0);
     expect(xhrMock.send).toHaveBeenCalledTimes(0);
@@ -66,7 +66,7 @@ describe('NewXHRTransport', () => {
   });
 
   it('returns the correct response', async () => {
-    const transport = makeNewXHRTransport(DEFAULT_XHR_TRANSPORT_OPTIONS);
+    const transport = makeXHRTransport(DEFAULT_XHR_TRANSPORT_OPTIONS);
 
     const [res] = await Promise.all([
       transport.send(ERROR_ENVELOPE),
@@ -78,7 +78,7 @@ describe('NewXHRTransport', () => {
   });
 
   it('sets rate limit response headers', async () => {
-    const transport = makeNewXHRTransport(DEFAULT_XHR_TRANSPORT_OPTIONS);
+    const transport = makeXHRTransport(DEFAULT_XHR_TRANSPORT_OPTIONS);
 
     await Promise.all([transport.send(ERROR_ENVELOPE), (xhrMock as XMLHttpRequest).onreadystatechange!({} as Event)]);
 
@@ -98,7 +98,7 @@ describe('NewXHRTransport', () => {
       headers,
     };
 
-    const transport = makeNewXHRTransport(options);
+    const transport = makeXHRTransport(options);
     await Promise.all([transport.send(ERROR_ENVELOPE), (xhrMock as XMLHttpRequest).onreadystatechange!({} as Event)]);
 
     expect(xhrMock.setRequestHeader).toHaveBeenCalledTimes(3);

packages/core/test/mocks/client.ts

@@ -6,6 +6,10 @@ import { BaseClient } from '../../src/baseclient';
 import { initAndBind } from '../../src/sdk';
 import { createTransport } from '../../src/transports/base';
 
+// TODO(v7): Add client reports tests to this file
+// See old tests in packages/browser/test/unit/transports/base.test.ts
+// from https://github.com/getsentry/sentry-javascript/pull/4967
+
 export function getDefaultTestClientOptions(options: Partial<TestClientOptions> = {}): TestClientOptions {
   return {
     integrations: [],

packages/node/src/transports/http.ts

@@ -13,13 +13,6 @@ import { URL } from 'url';
 
 import { HTTPModule } from './http-module';
 
-// TODO(v7):
-// - Rename this file "transport.ts"
-// - Move this file one folder upwards
-// - Delete "transports" folder
-// OR
-// - Split this file up and leave it in the transports folder
-
 export interface NodeTransportOptions extends BaseTransportOptions {
   /** Define custom headers */
   headers?: Record<string, string>;