feat: Hoist getCurrentHub shim to core as getCurrentHubShim

packages/opentelemetry/src/custom/getCurrentHub.ts → packages/core/src/getCurrentHubShim.ts

@@ -1,27 +1,24 @@
 import type { Client, EventHint, Hub, Integration, IntegrationClass, SeverityLevel } from '@sentry/types';
-
+import { addBreadcrumb } from './breadcrumbs';
+import { getClient, getCurrentScope, getIsolationScope, withScope } from './currentScopes';
 import {
-  addBreadcrumb,
   captureEvent,
   endSession,
-  getClient,
-  getCurrentScope,
-  getIsolationScope,
   setContext,
   setExtra,
   setExtras,
   setTag,
   setTags,
   setUser,
   startSession,
-  withScope,
-} from '@sentry/core';
+} from './exports';
 
 /**
  * This is for legacy reasons, and returns a proxy object instead of a hub to be used.
+ *
  * @deprecated Use the methods directly.
  */
-export function getCurrentHub(): Hub {
+export function getCurrentHubShim(): Hub {
   return {
     bindClient(client: Client): void {
       const scope = getCurrentScope();
@@ -48,7 +45,8 @@ export function getCurrentHub(): Hub {
     setContext,
 
     getIntegration<T extends Integration>(integration: IntegrationClass<T>): T | null {
-      return getClient()?.getIntegrationByName<T>(integration.id) || null;
+      const client = getClient();
+      return (client && client.getIntegrationByName<T>(integration.id)) || null;
     },
 
     startSession,

packages/core/src/index.ts

@@ -106,3 +106,6 @@ export { BrowserMetricsAggregator } from './metrics/browser-aggregator';
 export { getMetricSummaryJsonForSpan } from './metrics/metric-summary';
 export { addTracingHeadersToFetchRequest, instrumentFetchRequest } from './fetch';
 export { trpcMiddleware } from './trpc';
+
+// eslint-disable-next-line deprecation/deprecation
+export { getCurrentHubShim } from './getCurrentHubShim';

packages/opentelemetry/src/asyncContextStrategy.ts

@@ -1,5 +1,10 @@
 import * as api from '@opentelemetry/api';
-import { getDefaultCurrentScope, getDefaultIsolationScope, setAsyncContextStrategy } from '@sentry/core';
+import {
+  getCurrentHubShim,
+  getDefaultCurrentScope,
+  getDefaultIsolationScope,
+  setAsyncContextStrategy,
+} from '@sentry/core';
 import type { withActiveSpan as defaultWithActiveSpan } from '@sentry/core';
 import type { Hub, Scope } from '@sentry/types';
 
@@ -8,7 +13,6 @@ import {
   SENTRY_FORK_SET_ISOLATION_SCOPE_CONTEXT_KEY,
   SENTRY_FORK_SET_SCOPE_CONTEXT_KEY,
 } from './constants';
-import { getCurrentHub as _getCurrentHub } from './custom/getCurrentHub';
 import { startInactiveSpan, startSpan, startSpanManual, withActiveSpan } from './trace';
 import type { CurrentScopes } from './types';
 import { getScopesFromContext } from './utils/contextData';
@@ -38,7 +42,7 @@ export function setOpenTelemetryContextAsyncContextStrategy(): void {
 
   function getCurrentHub(): Hub {
     // eslint-disable-next-line deprecation/deprecation
-    const hub = _getCurrentHub();
+    const hub = getCurrentHubShim();
     return {
       ...hub,
       getScope: () => {

packages/opentelemetry/src/index.ts

@@ -28,7 +28,7 @@ export { suppressTracing } from './utils/suppressTracing';
 // eslint-disable-next-line deprecation/deprecation
 export { setupGlobalHub } from './custom/hub';
 // eslint-disable-next-line deprecation/deprecation
-export { getCurrentHub } from './custom/getCurrentHub';
+export { getCurrentHubShim } from '@sentry/core';
 export { setupEventContextTrace } from './setupEventContextTrace';
 
 export { setOpenTelemetryContextAsyncContextStrategy } from './asyncContextStrategy';