@sentry/core - npm Package Compare versions

Comparing version 7.88.0 to 7.89.0

cjs/baseclient.js

@@ -7,3 +7,3 @@ Object.defineProperty(exports, '__esModule', { value: true });
 const envelope = require('./envelope.js');
-const hub = require('./hub.js');
+const exports$1 = require('./exports.js');
 const integration = require('./integration.js');
@@ -744,3 +744,3 @@ const envelope$1 = require('./metrics/envelope.js');
 function addEventProcessor(callback) {
-  const client = hub.getCurrentHub().getClient();
+  const client = exports$1.getClient();
 
@@ -747,0 +747,0 @@ if (!client || !client.addEventProcessor) {

cjs/exports.js

@@ -60,4 +60,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
  * @param callback Callback function that receives Scope.
+ *
+ * @deprecated Use getCurrentScope() directly.
  */
 function configureScope(callback) {
+  // eslint-disable-next-line deprecation/deprecation
   hub.getCurrentHub().configureScope(callback);
@@ -74,4 +77,4 @@ }
  */
-function addBreadcrumb(breadcrumb) {
-  hub.getCurrentHub().addBreadcrumb(breadcrumb);
+function addBreadcrumb(breadcrumb, hint) {
+  hub.getCurrentHub().addBreadcrumb(breadcrumb, hint);
 }
@@ -149,3 +152,3 @@
 function withScope(callback) {
-  hub.getCurrentHub().withScope(callback);
+  return hub.getCurrentHub().withScope(callback);
 }
@@ -188,5 +191,4 @@
 function captureCheckIn(checkIn, upsertMonitorConfig) {
-  const hub$1 = hub.getCurrentHub();
-  const scope = hub$1.getScope();
-  const client = hub$1.getClient();
+  const scope = getCurrentScope();
+  const client = getClient();
   if (!client) {
@@ -193,0 +195,0 @@ debugBuild.DEBUG_BUILD && utils.logger.warn('Cannot capture check-in. No client defined.');

cjs/hub.js

@@ -69,2 +69,4 @@ Object.defineProperty(exports, '__esModule', { value: true });
    * @inheritDoc
+   *
+   * @deprecated Use `withScope` instead.
    */
@@ -83,2 +85,4 @@ pushScope() {
    * @inheritDoc
+   *
+   * @deprecated Use `withScope` instead.
    */
@@ -94,6 +98,8 @@ popScope() {
    withScope(callback) {
+    // eslint-disable-next-line deprecation/deprecation
     const scope = this.pushScope();
     try {
-      callback(scope);
+      return callback(scope);
     } finally {
+      // eslint-disable-next-line deprecation/deprecation
       this.popScope();
@@ -268,2 +274,4 @@ }
    * @inheritDoc
+   *
+   * @deprecated Use `getScope()` directly.
    */
@@ -270,0 +278,0 @@ configureScope(callback) {

cjs/index.js

@@ -101,2 +101,3 @@ Object.defineProperty(exports, '__esModule', { value: true });
 exports.addGlobalEventProcessor = eventProcessors.addGlobalEventProcessor;
+exports.notifyEventProcessors = eventProcessors.notifyEventProcessors;
 exports.getEnvelopeEndpointWithUrlEncodedAuth = api.getEnvelopeEndpointWithUrlEncodedAuth;
@@ -113,2 +114,3 @@ exports.getReportDialogEndpoint = api.getReportDialogEndpoint;
 exports.addIntegration = integration.addIntegration;
+exports.convertIntegrationFnToClass = integration.convertIntegrationFnToClass;
 exports.getIntegrationsToSetup = integration.getIntegrationsToSetup;
@@ -115,0 +117,0 @@ exports.Integrations = index;

cjs/integration.js

@@ -150,3 +150,27 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
+/**
+ * Convert a new integration function to the legacy class syntax.
+ * In v8, we can remove this and instead export the integration functions directly.
+ *
+ * @deprecated This will be removed in v8!
+ */
+function convertIntegrationFnToClass(
+  name,
+  fn,
+) {
+  return Object.assign(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    function ConvertedIntegration(...rest) {
+      return {
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        setupOnce: () => {},
+        ...fn(...rest),
+      };
+    },
+    { id: name },
+  ) ;
+}
+
 exports.addIntegration = addIntegration;
+exports.convertIntegrationFnToClass = convertIntegrationFnToClass;
 exports.getIntegrationsToSetup = getIntegrationsToSetup;
@@ -153,0 +177,0 @@ exports.installedIntegrations = installedIntegrations;

cjs/integrations/inboundfilters.js

@@ -5,2 +5,3 @@ Object.defineProperty(exports, '__esModule', { value: true });
 const debugBuild = require('../debug-build.js');
+const integration = require('../integration.js');
 
@@ -23,34 +24,18 @@ // "Script error." is hard coded into browsers for errors that it can't read.
 
+const INTEGRATION_NAME = 'InboundFilters';
+const inboundFiltersIntegration = (options) => {
+  return {
+    name: INTEGRATION_NAME,
+    processEvent(event, _hint, client) {
+      const clientOptions = client.getOptions();
+      const mergedOptions = _mergeOptions(options, clientOptions);
+      return _shouldDropEvent(event, mergedOptions) ? null : event;
+    },
+  };
+};
+
 /** Inbound filters configurable by the user */
-class InboundFilters  {
-  /**
-   * @inheritDoc
-   */
-   static __initStatic() {this.id = 'InboundFilters';}
+// eslint-disable-next-line deprecation/deprecation
+const InboundFilters = integration.convertIntegrationFnToClass(INTEGRATION_NAME, inboundFiltersIntegration);
 
-  /**
-   * @inheritDoc
-   */
-
-   constructor(options = {}) {
-    this.name = InboundFilters.id;
-    this._options = options;
-  }
-
-  /**
-   * @inheritDoc
-   */
-   setupOnce(_addGlobalEventProcessor, _getCurrentHub) {
-    // noop
-  }
-
-  /** @inheritDoc */
-   processEvent(event, _eventHint, client) {
-    const clientOptions = client.getOptions();
-    const options = _mergeOptions(this._options, clientOptions);
-    return _shouldDropEvent(event, options) ? null : event;
-  }
-} InboundFilters.__initStatic();
-
-/** JSDoc */
 function _mergeOptions(
@@ -77,3 +62,2 @@ internalOptions = {},
 
-/** JSDoc */
 function _shouldDropEvent(event, options) {
@@ -228,4 +212,2 @@ if (options.ignoreInternal && _isSentryError(event)) {
 exports.InboundFilters = InboundFilters;
-exports._mergeOptions = _mergeOptions;
-exports._shouldDropEvent = _shouldDropEvent;
 //# sourceMappingURL=inboundfilters.js.map

cjs/metrics/exports.js

@@ -5,3 +5,3 @@ Object.defineProperty(exports, '__esModule', { value: true });
 const debugBuild = require('../debug-build.js');
-const hub = require('../hub.js');
+const exports$1 = require('../exports.js');
 const constants = require('./constants.js');
@@ -16,5 +16,4 @@ const integration = require('./integration.js');
 ) {
-  const hub$1 = hub.getCurrentHub();
-  const client = hub$1.getClient() ;
-  const scope = hub$1.getScope();
+  const client = exports$1.getClient();
+  const scope = exports$1.getCurrentScope();
   if (client) {
@@ -21,0 +20,0 @@ if (!client.metricsAggregator) {

cjs/server-runtime-client.js

@@ -7,3 +7,3 @@ Object.defineProperty(exports, '__esModule', { value: true });
 const debugBuild = require('./debug-build.js');
-const hub = require('./hub.js');
+const exports$1 = require('./exports.js');
 const sessionflusher = require('./sessionflusher.js');
@@ -36,3 +36,3 @@ const hubextensions = require('./tracing/hubextensions.js');
    eventFromException(exception, hint) {
-    return utils.resolvedSyncPromise(utils.eventFromUnknownInput(hub.getCurrentHub, this._options.stackParser, exception, hint));
+    return utils.resolvedSyncPromise(utils.eventFromUnknownInput(exports$1.getClient(), this._options.stackParser, exception, hint));
   }
@@ -39,0 +39,0 @@

cjs/sessionflusher.js

 Object.defineProperty(exports, '__esModule', { value: true });
 
 const utils = require('@sentry/utils');
-const hub = require('./hub.js');
+const exports$1 = require('./exports.js');
 
@@ -61,3 +61,3 @@ /**
     }
-    const scope = hub.getCurrentHub().getScope();
+    const scope = exports$1.getCurrentScope();
     const requestSession = scope.getRequestSession();
@@ -64,0 +64,0 @@

cjs/tracing/idletransaction.js

@@ -108,3 +108,3 @@ Object.defineProperty(exports, '__esModule', { value: true });
       debugBuild.DEBUG_BUILD && utils.logger.log(`Setting idle transaction on scope. Span ID: ${this.spanId}`);
-      _idleHub.configureScope(scope => scope.setSpan(this));
+      _idleHub.getScope().setSpan(this);
     }
@@ -111,0 +111,0 @@

cjs/tracing/trace.js

@@ -5,2 +5,3 @@ Object.defineProperty(exports, '__esModule', { value: true });
 const debugBuild = require('../debug-build.js');
+const exports$1 = require('../exports.js');
 const hub = require('../hub.js');
@@ -26,2 +27,4 @@ const hasTracingEnabled = require('../utils/hasTracingEnabled.js');
   onError = () => {},
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  afterFinish = () => {},
 ) {
@@ -31,3 +34,3 @@ const ctx = normalizeContext(context);
   const hub$1 = hub.getCurrentHub();
-  const scope = hub$1.getScope();
+  const scope = exports$1.getCurrentScope();
   const parentSpan = scope.getSpan();
@@ -41,3 +44,3 @@
     activeSpan && activeSpan.finish();
-    hub$1.getScope().setSpan(parentSpan);
+    scope.setSpan(parentSpan);
   }
@@ -50,4 +53,5 @@
     activeSpan && activeSpan.setStatus('internal_error');
-    onError(e);
+    onError(e, activeSpan);
     finishAndSetSpan();
+    afterFinish();
     throw e;
@@ -60,7 +64,9 @@ }
         finishAndSetSpan();
+        afterFinish();
       },
       e => {
         activeSpan && activeSpan.setStatus('internal_error');
-        onError(e);
+        onError(e, activeSpan);
         finishAndSetSpan();
+        afterFinish();
       },
@@ -70,2 +76,3 @@ );
     finishAndSetSpan();
+    afterFinish();
   }
@@ -91,3 +98,3 @@
   const hub$1 = hub.getCurrentHub();
-  const scope = hub$1.getScope();
+  const scope = exports$1.getCurrentScope();
   const parentSpan = scope.getSpan();
@@ -100,3 +107,3 @@
     activeSpan && activeSpan.finish();
-    hub$1.getScope().setSpan(parentSpan);
+    scope.setSpan(parentSpan);
   }
@@ -153,3 +160,3 @@
   const hub$1 = hub.getCurrentHub();
-  const scope = hub$1.getScope();
+  const scope = exports$1.getCurrentScope();
   const parentSpan = scope.getSpan();
@@ -162,3 +169,3 @@
     activeSpan && activeSpan.finish();
-    hub$1.getScope().setSpan(parentSpan);
+    scope.setSpan(parentSpan);
   }
@@ -213,3 +220,3 @@
 function getActiveSpan() {
-  return hub.getCurrentHub().getScope().getSpan();
+  return exports$1.getCurrentScope().getSpan();
 }
@@ -233,4 +240,3 @@
 ) {
-  const hub$1 = hub.getCurrentHub();
-  const currentScope = hub$1.getScope();
+  const currentScope = exports$1.getCurrentScope();
 
@@ -237,0 +243,0 @@ const { traceparentData, dynamicSamplingContext, propagationContext } = utils.tracingContextFromHeaders(

cjs/utils/isSentryRequestUrl.js

@@ -6,5 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
  * @param url url to verify
+ *
+ * TODO(v8): Remove Hub fallback type
  */
-function isSentryRequestUrl(url, hub) {
-  const client = hub.getClient();
+function isSentryRequestUrl(url, hubOrClient) {
+  const client = hubOrClient && isHub(hubOrClient) ? hubOrClient.getClient() : hubOrClient;
   const dsn = client && client.getDsn();
@@ -32,3 +34,7 @@ const tunnel = client && client.getOptions().tunnel;
 
+function isHub(hubOrClient) {
+  return (hubOrClient ).getClient !== undefined;
+}
+
 exports.isSentryRequestUrl = isSentryRequestUrl;
 //# sourceMappingURL=isSentryRequestUrl.js.map

cjs/version.js

 Object.defineProperty(exports, '__esModule', { value: true });
 
-const SDK_VERSION = '7.88.0';
+const SDK_VERSION = '7.89.0';
 
 exports.SDK_VERSION = SDK_VERSION;
 //# sourceMappingURL=version.js.map

esm/baseclient.js

@@ -5,3 +5,3 @@ import { makeDsn, logger, checkOrSetAlreadyCaught, isPrimitive, resolvedSyncPromise, addItemToEnvelope, createAttachmentEnvelopeItem, SyncPromise, rejectedSyncPromise, SentryError, isThenable, isPlainObject } from '@sentry/utils';
 import { createEventEnvelope, createSessionEnvelope } from './envelope.js';
-import { getCurrentHub } from './hub.js';
+import { getClient } from './exports.js';
 import { setupIntegrations, setupIntegration } from './integration.js';
@@ -742,3 +742,3 @@ import { createMetricEnvelope } from './metrics/envelope.js';
 function addEventProcessor(callback) {
-  const client = getCurrentHub().getClient();
+  const client = getClient();
 
@@ -745,0 +745,0 @@ if (!client || !client.addEventProcessor) {

esm/eventProcessors.js

@@ -1,2 +0,2 @@
-import { getGlobalSingleton, SyncPromise, logger, isThenable } from '@sentry/utils';
+import { SyncPromise, logger, isThenable, getGlobalSingleton } from '@sentry/utils';
 import { DEBUG_BUILD } from './debug-build.js';
@@ -3,0 +3,0 @@

esm/exports.js

@@ -58,4 +58,7 @@ import { logger, uuid4, timestampInSeconds, isThenable } from '@sentry/utils';
  * @param callback Callback function that receives Scope.
+ *
+ * @deprecated Use getCurrentScope() directly.
  */
 function configureScope(callback) {
+  // eslint-disable-next-line deprecation/deprecation
   getCurrentHub().configureScope(callback);
@@ -72,4 +75,4 @@ }
  */
-function addBreadcrumb(breadcrumb) {
-  getCurrentHub().addBreadcrumb(breadcrumb);
+function addBreadcrumb(breadcrumb, hint) {
+  getCurrentHub().addBreadcrumb(breadcrumb, hint);
 }
@@ -147,3 +150,3 @@
 function withScope(callback) {
-  getCurrentHub().withScope(callback);
+  return getCurrentHub().withScope(callback);
 }
@@ -186,5 +189,4 @@
 function captureCheckIn(checkIn, upsertMonitorConfig) {
-  const hub = getCurrentHub();
-  const scope = hub.getScope();
-  const client = hub.getClient();
+  const scope = getCurrentScope();
+  const client = getClient();
   if (!client) {
@@ -191,0 +193,0 @@ DEBUG_BUILD && logger.warn('Cannot capture check-in. No client defined.');

esm/hub.js

@@ -67,2 +67,4 @@ import { uuid4, dateTimestampInSeconds, consoleSandbox, logger, GLOBAL_OBJ, getGlobalSingleton } from '@sentry/utils';
    * @inheritDoc
+   *
+   * @deprecated Use `withScope` instead.
    */
@@ -81,2 +83,4 @@ pushScope() {
    * @inheritDoc
+   *
+   * @deprecated Use `withScope` instead.
    */
@@ -92,6 +96,8 @@ popScope() {
    withScope(callback) {
+    // eslint-disable-next-line deprecation/deprecation
     const scope = this.pushScope();
     try {
-      callback(scope);
+      return callback(scope);
     } finally {
+      // eslint-disable-next-line deprecation/deprecation
       this.popScope();
@@ -266,2 +272,4 @@ }
    * @inheritDoc
+   *
+   * @deprecated Use `getScope()` directly.
    */
@@ -268,0 +276,0 @@ configureScope(callback) {

esm/index.js

@@ -16,3 +16,3 @@ export { addTracingExtensions, startIdleTransaction } from './tracing/hubextensions.js';
 export { Scope } from './scope.js';
-export { addGlobalEventProcessor } from './eventProcessors.js';
+export { addGlobalEventProcessor, notifyEventProcessors } from './eventProcessors.js';
 export { getEnvelopeEndpointWithUrlEncodedAuth, getReportDialogEndpoint } from './api.js';
@@ -26,3 +26,3 @@ export { BaseClient, addEventProcessor } from './baseclient.js';
 export { SDK_VERSION } from './version.js';
-export { addIntegration, getIntegrationsToSetup } from './integration.js';
+export { addIntegration, convertIntegrationFnToClass, getIntegrationsToSetup } from './integration.js';
 import * as index from './integrations/index.js';
@@ -29,0 +29,0 @@ export { index as Integrations };

esm/integration.js

@@ -148,3 +148,26 @@ import { arrayify, logger } from '@sentry/utils';
 
-export { addIntegration, getIntegrationsToSetup, installedIntegrations, setupIntegration, setupIntegrations };
+/**
+ * Convert a new integration function to the legacy class syntax.
+ * In v8, we can remove this and instead export the integration functions directly.
+ *
+ * @deprecated This will be removed in v8!
+ */
+function convertIntegrationFnToClass(
+  name,
+  fn,
+) {
+  return Object.assign(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    function ConvertedIntegration(...rest) {
+      return {
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        setupOnce: () => {},
+        ...fn(...rest),
+      };
+    },
+    { id: name },
+  ) ;
+}
+
+export { addIntegration, convertIntegrationFnToClass, getIntegrationsToSetup, installedIntegrations, setupIntegration, setupIntegrations };
 //# sourceMappingURL=integration.js.map

esm/integrations/inboundfilters.js

 import { logger, getEventDescription, stringMatchesSomePattern } from '@sentry/utils';
 import { DEBUG_BUILD } from '../debug-build.js';
+import { convertIntegrationFnToClass } from '../integration.js';
 
@@ -20,34 +21,18 @@ // "Script error." is hard coded into browsers for errors that it can't read.
 
+const INTEGRATION_NAME = 'InboundFilters';
+const inboundFiltersIntegration = (options) => {
+  return {
+    name: INTEGRATION_NAME,
+    processEvent(event, _hint, client) {
+      const clientOptions = client.getOptions();
+      const mergedOptions = _mergeOptions(options, clientOptions);
+      return _shouldDropEvent(event, mergedOptions) ? null : event;
+    },
+  };
+};
+
 /** Inbound filters configurable by the user */
-class InboundFilters  {
-  /**
-   * @inheritDoc
-   */
-   static __initStatic() {this.id = 'InboundFilters';}
+// eslint-disable-next-line deprecation/deprecation
+const InboundFilters = convertIntegrationFnToClass(INTEGRATION_NAME, inboundFiltersIntegration);
 
-  /**
-   * @inheritDoc
-   */
-
-   constructor(options = {}) {
-    this.name = InboundFilters.id;
-    this._options = options;
-  }
-
-  /**
-   * @inheritDoc
-   */
-   setupOnce(_addGlobalEventProcessor, _getCurrentHub) {
-    // noop
-  }
-
-  /** @inheritDoc */
-   processEvent(event, _eventHint, client) {
-    const clientOptions = client.getOptions();
-    const options = _mergeOptions(this._options, clientOptions);
-    return _shouldDropEvent(event, options) ? null : event;
-  }
-} InboundFilters.__initStatic();
-
-/** JSDoc */
 function _mergeOptions(
@@ -74,3 +59,2 @@ internalOptions = {},
 
-/** JSDoc */
 function _shouldDropEvent(event, options) {
@@ -224,3 +208,3 @@ if (options.ignoreInternal && _isSentryError(event)) {
 
-export { InboundFilters, _mergeOptions, _shouldDropEvent };
+export { InboundFilters };
 //# sourceMappingURL=inboundfilters.js.map

esm/metrics/exports.js

 import { logger } from '@sentry/utils';
 import { DEBUG_BUILD } from '../debug-build.js';
-import { getCurrentHub } from '../hub.js';
+import { getClient, getCurrentScope } from '../exports.js';
 import { COUNTER_METRIC_TYPE, DISTRIBUTION_METRIC_TYPE, SET_METRIC_TYPE, GAUGE_METRIC_TYPE } from './constants.js';
@@ -13,5 +13,4 @@ import { MetricsAggregator } from './integration.js';
 ) {
-  const hub = getCurrentHub();
-  const client = hub.getClient() ;
-  const scope = hub.getScope();
+  const client = getClient();
+  const scope = getCurrentScope();
   if (client) {
@@ -18,0 +17,0 @@ if (!client.metricsAggregator) {

esm/server-runtime-client.js

@@ -5,3 +5,3 @@ import { resolvedSyncPromise, eventFromUnknownInput, eventFromMessage, logger, uuid4 } from '@sentry/utils';
 import { DEBUG_BUILD } from './debug-build.js';
-import { getCurrentHub } from './hub.js';
+import { getClient } from './exports.js';
 import { SessionFlusher } from './sessionflusher.js';
@@ -34,3 +34,3 @@ import { addTracingExtensions } from './tracing/hubextensions.js';
    eventFromException(exception, hint) {
-    return resolvedSyncPromise(eventFromUnknownInput(getCurrentHub, this._options.stackParser, exception, hint));
+    return resolvedSyncPromise(eventFromUnknownInput(getClient(), this._options.stackParser, exception, hint));
   }
@@ -37,0 +37,0 @@

esm/sessionflusher.js

 import { dropUndefinedKeys } from '@sentry/utils';
-import { getCurrentHub } from './hub.js';
+import { getCurrentScope } from './exports.js';
 
@@ -59,3 +59,3 @@ /**
     }
-    const scope = getCurrentHub().getScope();
+    const scope = getCurrentScope();
     const requestSession = scope.getRequestSession();
@@ -62,0 +62,0 @@

esm/tracing/idletransaction.js

@@ -106,3 +106,3 @@ import { logger, timestampInSeconds } from '@sentry/utils';
       DEBUG_BUILD && logger.log(`Setting idle transaction on scope. Span ID: ${this.spanId}`);
-      _idleHub.configureScope(scope => scope.setSpan(this));
+      _idleHub.getScope().setSpan(this);
     }
@@ -109,0 +109,0 @@

esm/tracing/trace.js

 import { isThenable, tracingContextFromHeaders, logger, dropUndefinedKeys } from '@sentry/utils';
 import { DEBUG_BUILD } from '../debug-build.js';
+import { getCurrentScope } from '../exports.js';
 import { getCurrentHub } from '../hub.js';
@@ -23,2 +24,4 @@ import { hasTracingEnabled } from '../utils/hasTracingEnabled.js';
   onError = () => {},
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  afterFinish = () => {},
 ) {
@@ -28,3 +31,3 @@ const ctx = normalizeContext(context);
   const hub = getCurrentHub();
-  const scope = hub.getScope();
+  const scope = getCurrentScope();
   const parentSpan = scope.getSpan();
@@ -38,3 +41,3 @@
     activeSpan && activeSpan.finish();
-    hub.getScope().setSpan(parentSpan);
+    scope.setSpan(parentSpan);
   }
@@ -47,4 +50,5 @@
     activeSpan && activeSpan.setStatus('internal_error');
-    onError(e);
+    onError(e, activeSpan);
     finishAndSetSpan();
+    afterFinish();
     throw e;
@@ -57,7 +61,9 @@ }
         finishAndSetSpan();
+        afterFinish();
       },
       e => {
         activeSpan && activeSpan.setStatus('internal_error');
-        onError(e);
+        onError(e, activeSpan);
         finishAndSetSpan();
+        afterFinish();
       },
@@ -67,2 +73,3 @@ );
     finishAndSetSpan();
+    afterFinish();
   }
@@ -88,3 +95,3 @@
   const hub = getCurrentHub();
-  const scope = hub.getScope();
+  const scope = getCurrentScope();
   const parentSpan = scope.getSpan();
@@ -97,3 +104,3 @@
     activeSpan && activeSpan.finish();
-    hub.getScope().setSpan(parentSpan);
+    scope.setSpan(parentSpan);
   }
@@ -150,3 +157,3 @@
   const hub = getCurrentHub();
-  const scope = hub.getScope();
+  const scope = getCurrentScope();
   const parentSpan = scope.getSpan();
@@ -159,3 +166,3 @@
     activeSpan && activeSpan.finish();
-    hub.getScope().setSpan(parentSpan);
+    scope.setSpan(parentSpan);
   }
@@ -210,3 +217,3 @@
 function getActiveSpan() {
-  return getCurrentHub().getScope().getSpan();
+  return getCurrentScope().getSpan();
 }
@@ -230,4 +237,3 @@
 ) {
-  const hub = getCurrentHub();
-  const currentScope = hub.getScope();
+  const currentScope = getCurrentScope();
 
@@ -234,0 +240,0 @@ const { traceparentData, dynamicSamplingContext, propagationContext } = tracingContextFromHeaders(

esm/utils/isSentryRequestUrl.js

 /**
  * Checks whether given url points to Sentry server
  * @param url url to verify
+ *
+ * TODO(v8): Remove Hub fallback type
  */
-function isSentryRequestUrl(url, hub) {
-  const client = hub.getClient();
+function isSentryRequestUrl(url, hubOrClient) {
+  const client = hubOrClient && isHub(hubOrClient) ? hubOrClient.getClient() : hubOrClient;
   const dsn = client && client.getDsn();
@@ -29,3 +31,7 @@ const tunnel = client && client.getOptions().tunnel;
 
+function isHub(hubOrClient) {
+  return (hubOrClient ).getClient !== undefined;
+}
+
 export { isSentryRequestUrl };
 //# sourceMappingURL=isSentryRequestUrl.js.map

esm/version.js

@@ -1,4 +0,4 @@
-const SDK_VERSION = '7.88.0';
+const SDK_VERSION = '7.89.0';
 
 export { SDK_VERSION };
 //# sourceMappingURL=version.js.map

package.json

 {
   "name": "@sentry/core",
-  "version": "7.88.0",
+  "version": "7.89.0",
   "description": "Base implementation for all Sentry JavaScript SDKs",
@@ -26,6 +26,6 @@ "repository": "git://github.com/getsentry/sentry-javascript.git",
   "dependencies": {
-    "@sentry/types": "7.88.0",
-    "@sentry/utils": "7.88.0"
+    "@sentry/types": "7.89.0",
+    "@sentry/utils": "7.89.0"
   },
   "sideEffects": false
 }

types-ts3.8/baseclient.d.ts

@@ -53,6 +53,6 @@ import { Breadcrumb, BreadcrumbHint, Client, ClientOptions, DataCategory, DsnComponents, DynamicSamplingContext, Envelope, Event, EventDropReason, EventHint, EventProcessor, FeedbackEvent, Integration, IntegrationClass, MetricBucketItem, MetricsAggregator, Outcome, SdkMetadata, Session, SessionAggregates, Severity, SeverityLevel, Transaction, Transport, TransportMakeRequestResponse } from '@sentry/types';
     protected _numProcessing: number;
+    protected _eventProcessors: EventProcessor[];
     /** Holds flushable  */
     private _outcomes;
     private _hooks;
-    private _eventProcessors;
     /**
@@ -59,0 +59,0 @@ * Initializes this client instance.

types-ts3.8/exports.d.ts

@@ -1,2 +0,2 @@
-import { Breadcrumb, CaptureContext, CheckIn, Client, CustomSamplingContext, Event, EventHint, Extra, Extras, MonitorConfig, Primitive, Severity, SeverityLevel, TransactionContext, User } from '@sentry/types';
+import { Breadcrumb, BreadcrumbHint, CaptureContext, CheckIn, Client, CustomSamplingContext, Event, EventHint, Extra, Extras, MonitorConfig, Primitive, Severity, SeverityLevel, TransactionContext, User } from '@sentry/types';
 import { Hub } from './hub';
@@ -29,2 +29,4 @@ import { Scope } from './scope';
  * @param callback Callback function that receives Scope.
+ *
+ * @deprecated Use getCurrentScope() directly.
  */
@@ -40,3 +42,3 @@ export declare function configureScope(callback: (scope: Scope) => void): ReturnType<Hub['configureScope']>;
  */
-export declare function addBreadcrumb(breadcrumb: Breadcrumb): ReturnType<Hub['addBreadcrumb']>;
+export declare function addBreadcrumb(breadcrumb: Breadcrumb, hint?: BreadcrumbHint): ReturnType<Hub['addBreadcrumb']>;
 /**
@@ -96,3 +98,3 @@ * Sets context data with the given name.
  */
-export declare function withScope(callback: (scope: Scope) => void): ReturnType<Hub['withScope']>;
+export declare function withScope<T>(callback: (scope: Scope) => T): T;
 /**
@@ -99,0 +101,0 @@ * Starts a new `Transaction` and returns it. This is the entry point to manual tracing instrumentation.

types-ts3.8/hub.d.ts

@@ -85,2 +85,4 @@ import { Breadcrumb, BreadcrumbHint, Client, CustomSamplingContext, Event, EventHint, Extra, Extras, Hub as HubInterface, Integration, IntegrationClass, Primitive, Session, SessionContext, Severity, SeverityLevel, Transaction, TransactionContext, User } from '@sentry/types';
      * @inheritDoc
+     *
+     * @deprecated Use `withScope` instead.
      */
@@ -90,2 +92,4 @@ pushScope(): Scope;
      * @inheritDoc
+     *
+     * @deprecated Use `withScope` instead.
      */
@@ -96,3 +100,3 @@ popScope(): boolean;
      */
-    withScope(callback: (scope: Scope) => void): void;
+    withScope<T>(callback: (scope: Scope) => T): T;
     /**
@@ -158,2 +162,4 @@ * @inheritDoc
      * @inheritDoc
+     *
+     * @deprecated Use `getScope()` directly.
      */
@@ -160,0 +166,0 @@ configureScope(callback: (scope: Scope) => void): void;

types-ts3.8/index.d.ts

@@ -13,3 +13,3 @@ export { ClientClass } from './sdk';
 export { Scope } from './scope';
-export { addGlobalEventProcessor, } from './eventProcessors';
+export { notifyEventProcessors, addGlobalEventProcessor, } from './eventProcessors';
 export { getEnvelopeEndpointWithUrlEncodedAuth, getReportDialogEndpoint } from './api';
@@ -23,3 +23,3 @@ export { BaseClient, addEventProcessor } from './baseclient';
 export { SDK_VERSION } from './version';
-export { getIntegrationsToSetup, addIntegration } from './integration';
+export { getIntegrationsToSetup, addIntegration, convertIntegrationFnToClass, } from './integration';
 export { FunctionToString, InboundFilters, LinkedErrors } from './integrations';
@@ -26,0 +26,0 @@ export { prepareEvent } from './utils/prepareEvent';

types-ts3.8/integration.d.ts

@@ -1,2 +0,2 @@
-import { Client, Integration, Options } from '@sentry/types';
+import { Client, Integration, IntegrationClass, IntegrationFn, Options } from '@sentry/types';
 declare module '@sentry/types' {
@@ -13,3 +13,3 @@ interface Integration {
 /** Gets integrations to install */
-export declare function getIntegrationsToSetup(options: Options): Integration[];
+export declare function getIntegrationsToSetup(options: Pick<Options, 'defaultIntegrations' | 'integrations'>): Integration[];
 /**
@@ -26,2 +26,9 @@ * Given a list of integration instances this installs them all. When `withDefaults` is set to `true` then all default
 export declare function addIntegration(integration: Integration): void;
+/**
+ * Convert a new integration function to the legacy class syntax.
+ * In v8, we can remove this and instead export the integration functions directly.
+ *
+ * @deprecated This will be removed in v8!
+ */
+export declare function convertIntegrationFnToClass<Fn extends IntegrationFn>(name: string, fn: Fn): IntegrationClass<Integration>;
 //# sourceMappingURL=integration.d.ts.map

types-ts3.8/integrations/inboundfilters.d.ts

@@ -1,2 +0,1 @@
-import { Client, Event, EventHint, Integration } from '@sentry/types';
 /** Options for the InboundFilters integration */
@@ -13,24 +12,3 @@ export interface InboundFiltersOptions {
 /** Inbound filters configurable by the user */
-export declare class InboundFilters implements Integration {
-    /**
-     * @inheritDoc
-     */
-    static id: string;
-    /**
-     * @inheritDoc
-     */
-    name: string;
-    private readonly _options;
-    constructor(options?: Partial<InboundFiltersOptions>);
-    /**
-     * @inheritDoc
-     */
-    setupOnce(_addGlobalEventProcessor: unknown, _getCurrentHub: unknown): void;
-    /** @inheritDoc */
-    processEvent(event: Event, _eventHint: EventHint, client: Client): Event | null;
-}
-/** JSDoc */
-export declare function _mergeOptions(internalOptions?: Partial<InboundFiltersOptions>, clientOptions?: Partial<InboundFiltersOptions>): Partial<InboundFiltersOptions>;
-/** JSDoc */
-export declare function _shouldDropEvent(event: Event, options: Partial<InboundFiltersOptions>): boolean;
+export declare const InboundFilters: import("@sentry/types").IntegrationClass<import("@sentry/types").Integration>;
 //# sourceMappingURL=inboundfilters.d.ts.map

types-ts3.8/tracing/trace.d.ts

@@ -16,3 +16,3 @@ import { TransactionContext } from '@sentry/types';
  */
-export declare function trace<T>(context: TransactionContext, callback: (span?: Span) => T, onError?: (error: unknown) => void): T;
+export declare function trace<T>(context: TransactionContext, callback: (span?: Span) => T, onError?: (error: unknown, span?: Span) => void, afterFinish?: () => void): T;
 /**
@@ -19,0 +19,0 @@ * Wraps a function with a transaction/span and finishes the span after the function is done.

types-ts3.8/utils/isSentryRequestUrl.d.ts

@@ -1,7 +0,9 @@
-import { Hub } from '@sentry/types';
+import { Client, Hub } from '@sentry/types';
 /**
  * Checks whether given url points to Sentry server
  * @param url url to verify
+ *
+ * TODO(v8): Remove Hub fallback type
  */
-export declare function isSentryRequestUrl(url: string, hub: Hub): boolean;
+export declare function isSentryRequestUrl(url: string, hubOrClient: Hub | Client | undefined): boolean;
 //# sourceMappingURL=isSentryRequestUrl.d.ts.map

types-ts3.8/version.d.ts

@@ -1,2 +0,2 @@
-export declare const SDK_VERSION = "7.88.0";
+export declare const SDK_VERSION = "7.89.0";
 //# sourceMappingURL=version.d.ts.map

types/baseclient.d.ts

@@ -53,6 +53,6 @@ import type { Breadcrumb, BreadcrumbHint, Client, ClientOptions, DataCategory, DsnComponents, DynamicSamplingContext, Envelope, Event, EventDropReason, EventHint, EventProcessor, FeedbackEvent, Integration, IntegrationClass, MetricBucketItem, MetricsAggregator, Outcome, SdkMetadata, Session, SessionAggregates, Severity, SeverityLevel, Transaction, Transport, TransportMakeRequestResponse } from '@sentry/types';
     protected _numProcessing: number;
+    protected _eventProcessors: EventProcessor[];
     /** Holds flushable  */
     private _outcomes;
     private _hooks;
-    private _eventProcessors;
     /**
@@ -59,0 +59,0 @@ * Initializes this client instance.

types/exports.d.ts

@@ -1,2 +0,2 @@
-import type { Breadcrumb, CaptureContext, CheckIn, Client, CustomSamplingContext, Event, EventHint, Extra, Extras, MonitorConfig, Primitive, Severity, SeverityLevel, TransactionContext, User } from '@sentry/types';
+import type { Breadcrumb, BreadcrumbHint, CaptureContext, CheckIn, Client, CustomSamplingContext, Event, EventHint, Extra, Extras, MonitorConfig, Primitive, Severity, SeverityLevel, TransactionContext, User } from '@sentry/types';
 import type { Hub } from './hub';
@@ -29,2 +29,4 @@ import type { Scope } from './scope';
  * @param callback Callback function that receives Scope.
+ *
+ * @deprecated Use getCurrentScope() directly.
  */
@@ -40,3 +42,3 @@ export declare function configureScope(callback: (scope: Scope) => void): ReturnType<Hub['configureScope']>;
  */
-export declare function addBreadcrumb(breadcrumb: Breadcrumb): ReturnType<Hub['addBreadcrumb']>;
+export declare function addBreadcrumb(breadcrumb: Breadcrumb, hint?: BreadcrumbHint): ReturnType<Hub['addBreadcrumb']>;
 /**
@@ -96,3 +98,3 @@ * Sets context data with the given name.
  */
-export declare function withScope(callback: (scope: Scope) => void): ReturnType<Hub['withScope']>;
+export declare function withScope<T>(callback: (scope: Scope) => T): T;
 /**
@@ -99,0 +101,0 @@ * Starts a new `Transaction` and returns it. This is the entry point to manual tracing instrumentation.

types/hub.d.ts

@@ -85,2 +85,4 @@ import type { Breadcrumb, BreadcrumbHint, Client, CustomSamplingContext, Event, EventHint, Extra, Extras, Hub as HubInterface, Integration, IntegrationClass, Primitive, Session, SessionContext, Severity, SeverityLevel, Transaction, TransactionContext, User } from '@sentry/types';
      * @inheritDoc
+     *
+     * @deprecated Use `withScope` instead.
      */
@@ -90,2 +92,4 @@ pushScope(): Scope;
      * @inheritDoc
+     *
+     * @deprecated Use `withScope` instead.
      */
@@ -96,3 +100,3 @@ popScope(): boolean;
      */
-    withScope(callback: (scope: Scope) => void): void;
+    withScope<T>(callback: (scope: Scope) => T): T;
     /**
@@ -158,2 +162,4 @@ * @inheritDoc
      * @inheritDoc
+     *
+     * @deprecated Use `getScope()` directly.
      */
@@ -160,0 +166,0 @@ configureScope(callback: (scope: Scope) => void): void;

types/index.d.ts

@@ -13,3 +13,3 @@ export type { ClientClass } from './sdk';
 export { Scope } from './scope';
-export { addGlobalEventProcessor, } from './eventProcessors';
+export { notifyEventProcessors, addGlobalEventProcessor, } from './eventProcessors';
 export { getEnvelopeEndpointWithUrlEncodedAuth, getReportDialogEndpoint } from './api';
@@ -23,3 +23,3 @@ export { BaseClient, addEventProcessor } from './baseclient';
 export { SDK_VERSION } from './version';
-export { getIntegrationsToSetup, addIntegration } from './integration';
+export { getIntegrationsToSetup, addIntegration, convertIntegrationFnToClass, } from './integration';
 export { FunctionToString, InboundFilters, LinkedErrors } from './integrations';
@@ -26,0 +26,0 @@ export { prepareEvent } from './utils/prepareEvent';

types/integration.d.ts

@@ -1,2 +0,2 @@
-import type { Client, Integration, Options } from '@sentry/types';
+import type { Client, Integration, IntegrationClass, IntegrationFn, Options } from '@sentry/types';
 declare module '@sentry/types' {
@@ -13,3 +13,3 @@ interface Integration {
 /** Gets integrations to install */
-export declare function getIntegrationsToSetup(options: Options): Integration[];
+export declare function getIntegrationsToSetup(options: Pick<Options, 'defaultIntegrations' | 'integrations'>): Integration[];
 /**
@@ -26,2 +26,9 @@ * Given a list of integration instances this installs them all. When `withDefaults` is set to `true` then all default
 export declare function addIntegration(integration: Integration): void;
+/**
+ * Convert a new integration function to the legacy class syntax.
+ * In v8, we can remove this and instead export the integration functions directly.
+ *
+ * @deprecated This will be removed in v8!
+ */
+export declare function convertIntegrationFnToClass<Fn extends IntegrationFn>(name: string, fn: Fn): IntegrationClass<Integration>;
 //# sourceMappingURL=integration.d.ts.map

types/integrations/inboundfilters.d.ts

@@ -1,2 +0,1 @@
-import type { Client, Event, EventHint, Integration } from '@sentry/types';
 /** Options for the InboundFilters integration */
@@ -13,24 +12,3 @@ export interface InboundFiltersOptions {
 /** Inbound filters configurable by the user */
-export declare class InboundFilters implements Integration {
-    /**
-     * @inheritDoc
-     */
-    static id: string;
-    /**
-     * @inheritDoc
-     */
-    name: string;
-    private readonly _options;
-    constructor(options?: Partial<InboundFiltersOptions>);
-    /**
-     * @inheritDoc
-     */
-    setupOnce(_addGlobalEventProcessor: unknown, _getCurrentHub: unknown): void;
-    /** @inheritDoc */
-    processEvent(event: Event, _eventHint: EventHint, client: Client): Event | null;
-}
-/** JSDoc */
-export declare function _mergeOptions(internalOptions?: Partial<InboundFiltersOptions>, clientOptions?: Partial<InboundFiltersOptions>): Partial<InboundFiltersOptions>;
-/** JSDoc */
-export declare function _shouldDropEvent(event: Event, options: Partial<InboundFiltersOptions>): boolean;
+export declare const InboundFilters: import("@sentry/types").IntegrationClass<import("@sentry/types").Integration>;
 //# sourceMappingURL=inboundfilters.d.ts.map

types/tracing/trace.d.ts

@@ -16,3 +16,3 @@ import type { TransactionContext } from '@sentry/types';
  */
-export declare function trace<T>(context: TransactionContext, callback: (span?: Span) => T, onError?: (error: unknown) => void): T;
+export declare function trace<T>(context: TransactionContext, callback: (span?: Span) => T, onError?: (error: unknown, span?: Span) => void, afterFinish?: () => void): T;
 /**
@@ -19,0 +19,0 @@ * Wraps a function with a transaction/span and finishes the span after the function is done.

types/utils/isSentryRequestUrl.d.ts

@@ -1,7 +0,9 @@
-import type { Hub } from '@sentry/types';
+import type { Client, Hub } from '@sentry/types';
 /**
  * Checks whether given url points to Sentry server
  * @param url url to verify
+ *
+ * TODO(v8): Remove Hub fallback type
  */
-export declare function isSentryRequestUrl(url: string, hub: Hub): boolean;
+export declare function isSentryRequestUrl(url: string, hubOrClient: Hub | Client | undefined): boolean;
 //# sourceMappingURL=isSentryRequestUrl.d.ts.map

types/version.d.ts

@@ -1,2 +0,2 @@
-export declare const SDK_VERSION = "7.88.0";
+export declare const SDK_VERSION = "7.89.0";
 //# sourceMappingURL=version.d.ts.map

No alert changes

Improved metrics

Total package byte prevSize

1416310

increased by0.41%

Lines of code

16629

increased by0.3%

Published versions last months

18

increased by12.5%

Published versions last two months

31

increased by19.23%

Published versions last week

5

increased by150%

Published versions last year

120

increased by4.35%

Dependency changes

• + Added@sentry/types@7.89.0(transitive)

• + Added@sentry/utils@7.89.0(transitive)

• - Removed@sentry/types@7.88.0(transitive)

• - Removed@sentry/utils@7.88.0(transitive)

• Updated@sentry/types@7.89.0

• Updated@sentry/utils@7.89.0