fixes

Author: mydea

Diff for: packages/core/src/client.ts

@@ -81,25 +81,27 @@ interface DoNotSendEventError {
   [DO_NOT_SEND_EVENT_SYMBOL]: true;
 }
 
-function makeInternalError(message: string): InternalError {
+/** Exported for tests only. */
+export function _makeInternalError(message: string): InternalError {
   return {
     message,
     [INTERNAL_ERROR_SYMBOL]: true,
   };
 }
 
-function makeDoNotSendEventError(message: string): DoNotSendEventError {
+/** Exported for tests only. */
+export function _makeDoNotSendEventError(message: string): DoNotSendEventError {
   return {
     message,
     [DO_NOT_SEND_EVENT_SYMBOL]: true,
   };
 }
 
-function isInternalError(error: unknown): error is InternalError {
+function _isInternalError(error: unknown): error is InternalError {
   return !!error && typeof error === 'object' && INTERNAL_ERROR_SYMBOL in error;
 }
 
-function isDoNotSendEventError(error: unknown): error is DoNotSendEventError {
+function _isDoNotSendEventError(error: unknown): error is DoNotSendEventError {
   return !!error && typeof error === 'object' && DO_NOT_SEND_EVENT_SYMBOL in error;
 }
 
@@ -1009,9 +1011,9 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
       },
       reason => {
         if (DEBUG_BUILD) {
-          if (isDoNotSendEventError(reason)) {
+          if (_isDoNotSendEventError(reason)) {
             logger.log(reason.message);
-          } else if (isInternalError(reason)) {
+          } else if (_isInternalError(reason)) {
             logger.warn(reason.message);
           } else {
             logger.warn(reason);
@@ -1056,7 +1058,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
     if (isError && typeof parsedSampleRate === 'number' && Math.random() > parsedSampleRate) {
       this.recordDroppedEvent('sample_rate', 'error');
       return rejectedSyncPromise(
-        makeDoNotSendEventError(
+        _makeDoNotSendEventError(
           `Discarding event because it's not included in the random sample (sampling rate = ${sampleRate})`,
         ),
       );
@@ -1068,7 +1070,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
       .then(prepared => {
         if (prepared === null) {
           this.recordDroppedEvent('event_processor', dataCategory);
-          throw makeDoNotSendEventError('An event processor returned `null`, will not send event.');
+          throw _makeDoNotSendEventError('An event processor returned `null`, will not send event.');
         }
 
         const isInternalException = hint.data && (hint.data as { __sentry__: boolean }).__sentry__ === true;
@@ -1088,7 +1090,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
             const spanCount = 1 + spans.length;
             this.recordDroppedEvent('before_send', 'span', spanCount);
           }
-          throw makeDoNotSendEventError(`${beforeSendLabel} returned \`null\`, will not send event.`);
+          throw _makeDoNotSendEventError(`${beforeSendLabel} returned \`null\`, will not send event.`);
         }
 
         const session = currentScope.getSession() || isolationScope.getSession();
@@ -1122,7 +1124,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
         return processedEvent;
       })
       .then(null, reason => {
-        if (isDoNotSendEventError(reason) || isInternalError(reason)) {
+        if (_isDoNotSendEventError(reason) || _isInternalError(reason)) {
           throw reason;
         }
 
@@ -1132,7 +1134,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
           },
           originalException: reason,
         });
-        throw makeInternalError(
+        throw _makeInternalError(
           `Event processing pipeline threw an error, original event will not be sent. Details have been sent as a new event.\nReason: ${reason}`,
         );
       });
@@ -1237,17 +1239,17 @@ function _validateBeforeSendResult(
   if (isThenable(beforeSendResult)) {
     return beforeSendResult.then(
       event => {
-        if (!isPlainObject(event) && event) {
-          throw makeInternalError(invalidValueError);
+        if (!isPlainObject(event) && event !== null) {
+          throw _makeInternalError(invalidValueError);
         }
         return event;
       },
       e => {
-        throw makeInternalError(`${beforeSendLabel} rejected with ${e}`);
+        throw _makeInternalError(`${beforeSendLabel} rejected with ${e}`);
       },
     );
-  } else if (!isPlainObject(beforeSendResult) && beforeSendResult) {
-    throw makeInternalError(invalidValueError);
+  } else if (!isPlainObject(beforeSendResult) && beforeSendResult !== null) {
+    throw _makeInternalError(invalidValueError);
   }
   return beforeSendResult;
 }

Diff for: packages/core/src/utils-hoist/error.ts

@@ -1,6 +1,9 @@
 import type { ConsoleLevel } from '../types-hoist';
 
-/** An error emitted by Sentry SDKs and related utilities. */
+/**
+ * An error emitted by Sentry SDKs and related utilities.
+ * @deprecated This class is no longer used and will be removed in a future version. Use `Error` instead.
+ */
 export class SentryError extends Error {
   public logLevel: ConsoleLevel;
 

Diff for: packages/core/src/utils-hoist/index.ts

@@ -2,6 +2,7 @@ export { applyAggregateErrorsToEvent } from './aggregate-errors';
 export { getBreadcrumbLogLevelFromHttpStatusCode } from './breadcrumb-log-level';
 export { getComponentName, getLocationHref, htmlTreeAsString } from './browser';
 export { dsnFromString, dsnToString, makeDsn } from './dsn';
+// eslint-disable-next-line deprecation/deprecation
 export { SentryError } from './error';
 export { GLOBAL_OBJ } from './worldwide';
 export type { InternalGlobal } from './worldwide';

Diff for: packages/core/test/lib/client.test.ts

@@ -1,7 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, test, vi } from 'vitest';
 import {
   Scope,
-  SentryError,
   SyncPromise,
   addBreadcrumb,
   dsnToString,
@@ -13,6 +12,7 @@ import {
   withMonitor,
 } from '../../src';
 import type { BaseClient, Client } from '../../src/client';
+import { _makeInternalError } from '../../src/client';
 import * as integrationModule from '../../src/integration';
 import type { Envelope, ErrorEvent, Event, SpanJSON, TransactionEvent } from '../../src/types-hoist';
 import * as loggerModule from '../../src/utils-hoist/logger';
@@ -533,7 +533,7 @@ describe('Client', () => {
       );
     });
 
-    test('it adds a trace context to all events xxx', () => {
+    test('it adds a trace context to all events', () => {
       expect.assertions(1);
 
       const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
@@ -1206,7 +1206,7 @@ describe('Client', () => {
       const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, beforeSend });
       const client = new TestClient(options);
       const captureExceptionSpy = vi.spyOn(client, 'captureException');
-      const loggerWarnSpy = vi.spyOn(loggerModule.logger, 'log');
+      const loggerLogSpy = vi.spyOn(loggerModule.logger, 'log');
 
       client.captureEvent({ message: 'hello' });
 
@@ -1215,7 +1215,7 @@ describe('Client', () => {
       // This proves that the reason the event didn't send/didn't get set on the test client is not because there was an
       // error, but because `beforeSend` returned `null`
       expect(captureExceptionSpy).not.toBeCalled();
-      expect(loggerWarnSpy).toBeCalledWith('before send for type `error` returned `null`, will not send event.');
+      expect(loggerLogSpy).toBeCalledWith('before send for type `error` returned `null`, will not send event.');
     });
 
     test('calls `beforeSendTransaction` and discards the event', () => {
@@ -1225,7 +1225,7 @@ describe('Client', () => {
       const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, beforeSendTransaction });
       const client = new TestClient(options);
       const captureExceptionSpy = vi.spyOn(client, 'captureException');
-      const loggerWarnSpy = vi.spyOn(loggerModule.logger, 'log');
+      const loggerLogSpy = vi.spyOn(loggerModule.logger, 'log');
 
       client.captureEvent({ transaction: '/dogs/are/great', type: 'transaction' });
 
@@ -1234,7 +1234,7 @@ describe('Client', () => {
       // This proves that the reason the event didn't send/didn't get set on the test client is not because there was an
       // error, but because `beforeSendTransaction` returned `null`
       expect(captureExceptionSpy).not.toBeCalled();
-      expect(loggerWarnSpy).toBeCalledWith('before send for type `transaction` returned `null`, will not send event.');
+      expect(loggerLogSpy).toBeCalledWith('before send for type `transaction` returned `null`, will not send event.');
     });
 
     test('does not discard span and warn when returning null from `beforeSendSpan', () => {
@@ -1294,7 +1294,7 @@ describe('Client', () => {
         expect(beforeSend).toHaveBeenCalled();
         expect(TestClient.instance!.event).toBeUndefined();
         expect(loggerWarnSpy).toBeCalledWith(
-          new SentryError('before send for type `error` must return `null` or a valid event.'),
+          _makeInternalError('before send for type `error` must return `null` or a valid event.').message,
         );
       }
     });
@@ -1315,7 +1315,7 @@ describe('Client', () => {
         expect(beforeSendTransaction).toHaveBeenCalled();
         expect(TestClient.instance!.event).toBeUndefined();
         expect(loggerWarnSpy).toBeCalledWith(
-          new SentryError('before send for type `transaction` must return `null` or a valid event.'),
+          _makeInternalError('before send for type `transaction` must return `null` or a valid event.').message,
         );
       }
     });
@@ -1688,9 +1688,9 @@ describe('Client', () => {
         originalException: exception,
       });
       expect(loggerWarnSpy).toBeCalledWith(
-        new SentryError(
+        _makeInternalError(
           `Event processing pipeline threw an error, original event will not be sent. Details have been sent as a new event.\nReason: ${exception}`,
-        ),
+        ).message,
       );
     });
 

Diff for: packages/core/test/utils-hoist/is.test.ts

@@ -14,16 +14,6 @@ import { supportsDOMError, supportsDOMException, supportsErrorEvent } from '../.
 import { resolvedSyncPromise } from '../../src/utils-hoist/syncpromise';
 import { testOnlyIfNodeVersionAtLeast } from './testutils';
 
-class SentryError extends Error {
-  public name: string;
-
-  public constructor(public message: string) {
-    super(message);
-    this.name = new.target.prototype.constructor.name;
-    Object.setPrototypeOf(this, new.target.prototype);
-  }
-}
-
 if (supportsDOMError()) {
   describe('isDOMError()', () => {
     test('should work as advertised', () => {
@@ -47,7 +37,6 @@ describe('isError()', () => {
   test('should work as advertised', () => {
     expect(isError(new Error())).toEqual(true);
     expect(isError(new ReferenceError())).toEqual(true);
-    expect(isError(new SentryError('message'))).toEqual(true);
     expect(isError({})).toEqual(false);
     expect(
       isError({

Diff for: packages/opentelemetry/test/utils/mapStatus.test.ts

@@ -81,7 +81,7 @@ describe('mapStatus', () => {
     expect(actual).toEqual(expected);
   });
 
-  it('works with string SEMATTRS_HTTP_STATUS_CODE xxx', () => {
+  it('works with string SEMATTRS_HTTP_STATUS_CODE', () => {
     const span = createSpan('test-span');
 
     span.setStatus({ code: 0 }); // UNSET