From 51944427fe873440cf202fec5a6e40cfa66aa84d Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Mon, 12 Feb 2024 12:21:12 +0100 Subject: [PATCH 1/2] ref(node-experimental): Remove custom `isInitialized` We have this in core now, and align the implementation there to work consistently (and also in a future where a client may not be undefined). --- packages/core/src/exports.ts | 3 ++- packages/node-experimental/src/index.ts | 2 +- packages/node-experimental/src/sdk/api.ts | 4 ++-- packages/node-experimental/src/sdk/scope.ts | 5 ----- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/core/src/exports.ts b/packages/core/src/exports.ts index 56d64e2a64e9..ffbf5f0089dd 100644 --- a/packages/core/src/exports.ts +++ b/packages/core/src/exports.ts @@ -357,7 +357,8 @@ export function getClient(): C | undefined { * Returns true if Sentry has been properly initialized. */ export function isInitialized(): boolean { - return !!getClient(); + const client = getClient(); + return !!client && !!client.getDsn(); } /** diff --git a/packages/node-experimental/src/index.ts b/packages/node-experimental/src/index.ts index 76f096900e49..f7ae1ad2f04d 100644 --- a/packages/node-experimental/src/index.ts +++ b/packages/node-experimental/src/index.ts @@ -29,7 +29,6 @@ export type { Span } from './types'; export { startSpan, startSpanManual, startInactiveSpan, getActiveSpan } from '@sentry/opentelemetry'; export { getClient, - isInitialized, captureException, captureEvent, captureMessage, @@ -52,6 +51,7 @@ export { getCurrentHub, makeMain } from './sdk/hub'; export { addBreadcrumb, + isInitialized, makeNodeTransport, defaultStackParser, getSentryRelease, diff --git a/packages/node-experimental/src/sdk/api.ts b/packages/node-experimental/src/sdk/api.ts index 253f14aa103d..017bcdf31df7 100644 --- a/packages/node-experimental/src/sdk/api.ts +++ b/packages/node-experimental/src/sdk/api.ts @@ -18,9 +18,9 @@ import { getContextFromScope, getScopesFromContext, setScopesOnContext } from '. import type { ExclusiveEventHintOrCaptureContext } from '../utils/prepareEvent'; import { parseEventHintOrCaptureContext } from '../utils/prepareEvent'; -import { getClient, getCurrentScope, getIsolationScope, isInitialized } from './scope'; +import { getClient, getCurrentScope, getIsolationScope } from './scope'; -export { getCurrentScope, getIsolationScope, getClient, isInitialized }; +export { getCurrentScope, getIsolationScope, getClient }; export { setCurrentScope, setIsolationScope } from './scope'; /** diff --git a/packages/node-experimental/src/sdk/scope.ts b/packages/node-experimental/src/sdk/scope.ts index 80764261f1e7..f5a44652f884 100644 --- a/packages/node-experimental/src/sdk/scope.ts +++ b/packages/node-experimental/src/sdk/scope.ts @@ -46,11 +46,6 @@ export function getClient(): C { return {} as C; } -/** If the SDK was initialized. */ -export function isInitialized(): boolean { - return !!getClient().getDsn(); -} - function getScopes(): CurrentScopes { const carrier = getGlobalCarrier(); From 008d47f9a48ed5776029d8a458d01ca5ec9b6f93 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Mon, 12 Feb 2024 13:59:02 +0100 Subject: [PATCH 2/2] Update packages/core/src/exports.ts --- packages/core/src/exports.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/core/src/exports.ts b/packages/core/src/exports.ts index ffbf5f0089dd..56d64e2a64e9 100644 --- a/packages/core/src/exports.ts +++ b/packages/core/src/exports.ts @@ -357,8 +357,7 @@ export function getClient(): C | undefined { * Returns true if Sentry has been properly initialized. */ export function isInitialized(): boolean { - const client = getClient(); - return !!client && !!client.getDsn(); + return !!getClient(); } /**