diff --git a/packages/vercel-edge/src/sdk.ts b/packages/vercel-edge/src/sdk.ts index bebce0935adf..12485a6c6579 100644 --- a/packages/vercel-edge/src/sdk.ts +++ b/packages/vercel-edge/src/sdk.ts @@ -10,6 +10,7 @@ import type { Client, Integration, Options } from '@sentry/core'; import { consoleIntegration, createStackParser, + debug, dedupeIntegration, functionToStringIntegration, getCurrentScope, @@ -18,7 +19,6 @@ import { hasSpansEnabled, inboundFiltersIntegration, linkedErrorsIntegration, - logger, nodeStackLineParser, requestDataIntegration, SDK_VERSION, @@ -135,14 +135,14 @@ function validateOpenTelemetrySetup(): void { for (const k of required) { if (!setup.includes(k)) { - logger.error( + debug.error( `You have to set up the ${k}. Without this, the OpenTelemetry & Sentry integration will not work properly.`, ); } } if (!setup.includes('SentrySampler')) { - logger.warn( + debug.warn( 'You have to set up the SentrySampler. Without this, the OpenTelemetry & Sentry integration may still work, but sample rates set for the Sentry SDK will not be respected. If you use a custom sampler, make sure to use `wrapSamplingDecision`.', ); } @@ -182,19 +182,21 @@ export function setupOtel(client: VercelEdgeClient): void { } /** - * Setup the OTEL logger to use our own logger. + * Setup the OTEL logger to use our own debug logger. */ function setupOpenTelemetryLogger(): void { - const otelLogger = new Proxy(logger as typeof logger & { verbose: (typeof logger)['debug'] }, { - get(target, prop, receiver) { - const actualProp = prop === 'verbose' ? 'debug' : prop; - return Reflect.get(target, actualProp, receiver); - }, - }); - // Disable diag, to ensure this works even if called multiple times diag.disable(); - diag.setLogger(otelLogger, DiagLogLevel.DEBUG); + diag.setLogger( + { + error: debug.error, + warn: debug.warn, + info: debug.log, + debug: debug.log, + verbose: debug.log, + }, + DiagLogLevel.DEBUG, + ); } /** diff --git a/packages/vercel-edge/src/vendored/async-local-storage-context-manager.ts b/packages/vercel-edge/src/vendored/async-local-storage-context-manager.ts index a6a5328565f5..3fd89f28af7c 100644 --- a/packages/vercel-edge/src/vendored/async-local-storage-context-manager.ts +++ b/packages/vercel-edge/src/vendored/async-local-storage-context-manager.ts @@ -27,7 +27,7 @@ import type { Context } from '@opentelemetry/api'; import { ROOT_CONTEXT } from '@opentelemetry/api'; -import { GLOBAL_OBJ, logger } from '@sentry/core'; +import { debug, GLOBAL_OBJ } from '@sentry/core'; import type { AsyncLocalStorage } from 'async_hooks'; import { DEBUG_BUILD } from '../debug-build'; import { AbstractAsyncHooksContextManager } from './abstract-async-hooks-context-manager'; @@ -42,7 +42,7 @@ export class AsyncLocalStorageContextManager extends AbstractAsyncHooksContextMa if (!MaybeGlobalAsyncLocalStorageConstructor) { DEBUG_BUILD && - logger.warn( + debug.warn( "Tried to register AsyncLocalStorage async context strategy in a runtime that doesn't support AsyncLocalStorage.", );