remove more instances

Author: AbhiPrasad

dev-packages/browser-integration-tests/suites/replay/errors/errorModeCustomTransport/init.js

@@ -14,10 +14,6 @@ Sentry.init({
   replaysOnErrorSampleRate: 1.0,
   integrations: [window.Replay],
   transport: options => {
-    const transport = new Sentry.makeFetchTransport(options);
-
-    delete transport.send.__sentry__baseTransport__;
-
-    return transport;
+    return new Sentry.makeFetchTransport(options);
   },
 });

packages/core/src/baseclient.ts

@@ -432,10 +432,7 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
   public on(hook: 'preprocessEvent', callback: (event: Event, hint?: EventHint) => void): void;
 
   /** @inheritdoc */
-  public on(
-    hook: 'afterSendEvent',
-    callback: (event: Event, sendResponse: TransportMakeRequestResponse | void) => void,
-  ): void;
+  public on(hook: 'afterSendEvent', callback: (event: Event, sendResponse: TransportMakeRequestResponse) => void): void;
 
   /** @inheritdoc */
   public on(hook: 'beforeAddBreadcrumb', callback: (breadcrumb: Breadcrumb, hint?: BreadcrumbHint) => void): void;
@@ -488,7 +485,7 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
   public emit(hook: 'preprocessEvent', event: Event, hint?: EventHint): void;
 
   /** @inheritdoc */
-  public emit(hook: 'afterSendEvent', event: Event, sendResponse: TransportMakeRequestResponse | void): void;
+  public emit(hook: 'afterSendEvent', event: Event, sendResponse: TransportMakeRequestResponse): void;
 
   /** @inheritdoc */
   public emit(hook: 'beforeAddBreadcrumb', breadcrumb: Breadcrumb, hint?: BreadcrumbHint): void;

packages/core/src/transports/base.ts

@@ -105,10 +105,6 @@ export function createTransport(
     );
   }
 
-  // We use this to identifify if the transport is the base transport
-  // TODO (v8): Remove this again as we'll no longer need it
-  send.__sentry__baseTransport__ = true;
-
   return {
     send,
     flush,

packages/feedback/src/util/handleFeedbackSubmit.ts

@@ -1,5 +1,5 @@
 import type { TransportMakeRequestResponse } from '@sentry/types';
-import { logger } from '@sentry/utils';
+import { logger, resolvedSyncPromise } from '@sentry/utils';
 
 import { FEEDBACK_WIDGET_SOURCE } from '../constants';
 import { DEBUG_BUILD } from '../debug-build';
@@ -15,10 +15,10 @@ export async function handleFeedbackSubmit(
   dialog: DialogComponent | null,
   feedback: FeedbackFormData,
   options?: SendFeedbackOptions,
-): Promise<TransportMakeRequestResponse | void> {
+): Promise<TransportMakeRequestResponse> {
   if (!dialog) {
     // Not sure when this would happen
-    return;
+    return resolvedSyncPromise({});
   }
 
   const showFetchError = (): void => {
@@ -39,4 +39,6 @@ export async function handleFeedbackSubmit(
     DEBUG_BUILD && logger.error(err);
     showFetchError();
   }
+
+  return resolvedSyncPromise({});
 }

packages/feedback/test/utils/mockSdk.ts

@@ -11,16 +11,11 @@ class MockTransport implements Transport {
   send: (request: Envelope) => PromiseLike<TransportMakeRequestResponse>;
 
   constructor() {
-    const send: ((request: Envelope) => PromiseLike<TransportMakeRequestResponse>) & {
-      __sentry__baseTransport__?: boolean;
-    } = jest.fn(async () => {
+    this.send = jest.fn(async () => {
       return {
         statusCode: 200,
       };
     });
-
-    send.__sentry__baseTransport__ = true;
-    this.send = send;
   }
 
   async flush() {

packages/replay/src/coreHandlers/handleAfterSendEvent.ts

@@ -1,20 +1,15 @@
-import { getClient } from '@sentry/core';
-import type { ErrorEvent, Event, TransactionEvent, Transport, TransportMakeRequestResponse } from '@sentry/types';
+import type { ErrorEvent, Event, TransactionEvent, TransportMakeRequestResponse } from '@sentry/types';
 
 import type { ReplayContainer } from '../types';
 import { isErrorEvent, isTransactionEvent } from '../util/eventUtils';
 
-type AfterSendEventCallback = (event: Event, sendResponse: TransportMakeRequestResponse | void) => void;
+type AfterSendEventCallback = (event: Event, sendResponse: TransportMakeRequestResponse) => void;
 
 /**
  * Returns a listener to be added to `client.on('afterSendErrorEvent, listener)`.
  */
 export function handleAfterSendEvent(replay: ReplayContainer): AfterSendEventCallback {
-  // Custom transports may still be returning `Promise<void>`, which means we cannot expect the status code to be available there
-  // TODO (v8): remove this check as it will no longer be necessary
-  const enforceStatusCode = isBaseTransportSend();
-
-  return (event: Event, sendResponse: TransportMakeRequestResponse | void) => {
+  return (event: Event, sendResponse: TransportMakeRequestResponse) => {
     if (!replay.isEnabled() || (!isErrorEvent(event) && !isTransactionEvent(event))) {
       return;
     }
@@ -24,7 +19,7 @@ export function handleAfterSendEvent(replay: ReplayContainer): AfterSendEventCal
     // We only want to do stuff on successful error sending, otherwise you get error replays without errors attached
     // If not using the base transport, we allow `undefined` response (as a custom transport may not implement this correctly yet)
     // If we do use the base transport, we skip if we encountered an non-OK status code
-    if (enforceStatusCode && (!statusCode || statusCode < 200 || statusCode >= 300)) {
+    if (!statusCode || statusCode < 200 || statusCode >= 300) {
       return;
     }
 
@@ -79,19 +74,3 @@ function handleErrorEvent(replay: ReplayContainer, event: ErrorEvent): void {
     replay.sendBufferedReplayOrFlush();
   });
 }
-
-function isBaseTransportSend(): boolean {
-  const client = getClient();
-  if (!client) {
-    return false;
-  }
-
-  const transport = client.getTransport();
-  if (!transport) {
-    return false;
-  }
-
-  return (
-    (transport.send as Transport['send'] & { __sentry__baseTransport__?: true }).__sentry__baseTransport__ || false
-  );
-}

packages/replay/test/integration/coreHandlers/handleAfterSendEvent.test.ts

@@ -152,10 +152,6 @@ describe('Integration | coreHandlers | handleAfterSendEvent', () => {
       },
     }));
 
-    const client = getClient()!;
-    // @ts-expect-error make sure to remove this
-    delete client.getTransport()!.send.__sentry__baseTransport__;
-
     const error1 = Error({ event_id: 'err1' });
     const error2 = Error({ event_id: 'err2' });
     const error3 = Error({ event_id: 'err3' });

packages/replay/test/mocks/mockSdk.ts

@@ -16,16 +16,11 @@ class MockTransport implements Transport {
   send: (request: Envelope) => PromiseLike<TransportMakeRequestResponse>;
 
   constructor() {
-    const send: ((request: Envelope) => PromiseLike<TransportMakeRequestResponse>) & {
-      __sentry__baseTransport__?: boolean;
-    } = jest.fn(async () => {
+    this.send = jest.fn(async () => {
       return {
         statusCode: 200,
       };
     });
-
-    send.__sentry__baseTransport__ = true;
-    this.send = send;
   }
 
   async flush() {

packages/types/src/client.ts

@@ -216,7 +216,7 @@ export interface Client<O extends ClientOptions = ClientOptions> {
   /**
    * Register a callback for when an event has been sent.
    */
-  on(hook: 'afterSendEvent', callback: (event: Event, sendResponse: TransportMakeRequestResponse | void) => void): void;
+  on(hook: 'afterSendEvent', callback: (event: Event, sendResponse: TransportMakeRequestResponse) => void): void;
 
   /**
    * Register a callback before a breadcrumb is added.
@@ -299,7 +299,7 @@ export interface Client<O extends ClientOptions = ClientOptions> {
    * Fire a hook event after sending an event. Expects to be given an Event as the
    * second argument.
    */
-  emit(hook: 'afterSendEvent', event: Event, sendResponse: TransportMakeRequestResponse | void): void;
+  emit(hook: 'afterSendEvent', event: Event, sendResponse: TransportMakeRequestResponse): void;
 
   /**
    * Fire a hook for when a breadcrumb is added. Expects the breadcrumb as second argument.