From f8ed063f816ba56ee831bb4956905021b6d759ee Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Tue, 14 Nov 2023 14:17:07 +0100 Subject: [PATCH] fix circular dependency check --- packages/core/src/baseclient.ts | 15 +++++++++++++++ packages/core/src/eventProcessors.ts | 16 ---------------- packages/core/src/index.ts | 3 +-- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/packages/core/src/baseclient.ts b/packages/core/src/baseclient.ts index c811c4f827a3..88f8ec8183c0 100644 --- a/packages/core/src/baseclient.ts +++ b/packages/core/src/baseclient.ts @@ -44,6 +44,7 @@ import { import { getEnvelopeEndpointWithUrlEncodedAuth } from './api'; import { createEventEnvelope, createSessionEnvelope } from './envelope'; +import { getCurrentHub } from './hub'; import type { IntegrationIndex } from './integration'; import { setupIntegration, setupIntegrations } from './integration'; import type { Scope } from './scope'; @@ -823,3 +824,17 @@ function isErrorEvent(event: Event): event is ErrorEvent { function isTransactionEvent(event: Event): event is TransactionEvent { return event.type === 'transaction'; } + +/** + * Add an event processor to the current client. + * This event processor will run for all events processed by this client. + */ +export function addEventProcessor(callback: EventProcessor): void { + const client = getCurrentHub().getClient(); + + if (!client || !client.addEventProcessor) { + return; + } + + client.addEventProcessor(callback); +} diff --git a/packages/core/src/eventProcessors.ts b/packages/core/src/eventProcessors.ts index 658ac3d6109b..da383c0e650c 100644 --- a/packages/core/src/eventProcessors.ts +++ b/packages/core/src/eventProcessors.ts @@ -1,8 +1,6 @@ import type { Event, EventHint, EventProcessor } from '@sentry/types'; import { getGlobalSingleton, isThenable, logger, SyncPromise } from '@sentry/utils'; -import { getCurrentHub } from './hub'; - /** * Returns the global event processors. * @deprecated Global event processors will be removed in v8. @@ -20,20 +18,6 @@ export function addGlobalEventProcessor(callback: EventProcessor): void { getGlobalEventProcessors().push(callback); } -/** - * Add an event processor to the current client. - * This event processor will run for all events processed by this client. - */ -export function addEventProcessor(callback: EventProcessor): void { - const client = getCurrentHub().getClient(); - - if (!client || !client.addEventProcessor) { - return; - } - - client.addEventProcessor(callback); -} - /** * Process an array of event processors, returning the processed event (or `null` if the event was dropped). */ diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 159fc5325704..19cbdf65ead9 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -42,10 +42,9 @@ export { Scope } from './scope'; export { // eslint-disable-next-line deprecation/deprecation addGlobalEventProcessor, - addEventProcessor, } from './eventProcessors'; export { getEnvelopeEndpointWithUrlEncodedAuth, getReportDialogEndpoint } from './api'; -export { BaseClient } from './baseclient'; +export { BaseClient, addEventProcessor } from './baseclient'; export { ServerRuntimeClient } from './server-runtime-client'; export { initAndBind } from './sdk'; export { createTransport } from './transports/base';