From b6634c6b74392c2ba9585243a65bfb12edf6071e Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Mon, 14 Jul 2025 11:36:19 -0400 Subject: [PATCH] ref(react-router): Use `debug` instead of `logger` --- .../src/server/instrumentation/reactRouter.ts | 4 ++-- .../lowQualityTransactionsFilterIntegration.ts | 4 ++-- packages/react-router/src/server/sdk.ts | 6 +++--- .../test/server/instrumentation/reactRouterServer.test.ts | 8 +++----- .../lowQualityTransactionsFilterIntegration.test.ts | 4 ++-- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/packages/react-router/src/server/instrumentation/reactRouter.ts b/packages/react-router/src/server/instrumentation/reactRouter.ts index 74d3775b9d4c..5b7b001e4de5 100644 --- a/packages/react-router/src/server/instrumentation/reactRouter.ts +++ b/packages/react-router/src/server/instrumentation/reactRouter.ts @@ -2,9 +2,9 @@ import type { InstrumentationConfig } from '@opentelemetry/instrumentation'; import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation'; import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions'; import { + debug, getActiveSpan, getRootSpan, - logger, SDK_VERSION, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, @@ -80,7 +80,7 @@ export class ReactRouterInstrumentation extends InstrumentationBase transaction.match(regex))) { - options.debug && logger.log('[ReactRouter] Filtered node_modules transaction:', event.transaction); + options.debug && debug.log('[ReactRouter] Filtered node_modules transaction:', event.transaction); return null; } diff --git a/packages/react-router/src/server/sdk.ts b/packages/react-router/src/server/sdk.ts index 9d8a22862a11..8c3954e4a418 100644 --- a/packages/react-router/src/server/sdk.ts +++ b/packages/react-router/src/server/sdk.ts @@ -1,5 +1,5 @@ import type { Integration } from '@sentry/core'; -import { applySdkMetadata, logger, setTag } from '@sentry/core'; +import { applySdkMetadata, debug, setTag } from '@sentry/core'; import type { NodeClient, NodeOptions } from '@sentry/node'; import { getDefaultIntegrations as getNodeDefaultIntegrations, init as initNodeSdk } from '@sentry/node'; import { DEBUG_BUILD } from '../common/debug-build'; @@ -27,7 +27,7 @@ export function init(options: NodeOptions): NodeClient | undefined { defaultIntegrations: getDefaultReactRouterServerIntegrations(options), }; - DEBUG_BUILD && logger.log('Initializing SDK...'); + DEBUG_BUILD && debug.log('Initializing SDK...'); applySdkMetadata(opts, 'react-router', ['react-router', 'node']); @@ -35,7 +35,7 @@ export function init(options: NodeOptions): NodeClient | undefined { setTag('runtime', 'node'); - DEBUG_BUILD && logger.log('SDK successfully initialized'); + DEBUG_BUILD && debug.log('SDK successfully initialized'); return client; } diff --git a/packages/react-router/test/server/instrumentation/reactRouterServer.test.ts b/packages/react-router/test/server/instrumentation/reactRouterServer.test.ts index d89fdf624294..473ad1272ca4 100644 --- a/packages/react-router/test/server/instrumentation/reactRouterServer.test.ts +++ b/packages/react-router/test/server/instrumentation/reactRouterServer.test.ts @@ -10,8 +10,8 @@ vi.mock('@sentry/core', async () => { getRootSpan: vi.fn(), spanToJSON: vi.fn(), updateSpanName: vi.fn(), - logger: { - debug: vi.fn(), + debug: { + log: vi.fn(), }, SDK_VERSION: '1.0.0', SEMANTIC_ATTRIBUTE_SENTRY_OP: 'sentry.op', @@ -82,9 +82,7 @@ describe('ReactRouterInstrumentation', () => { const req = createRequest('https://test.com/data'); await wrappedHandler(req); - expect(SentryCore.logger.debug).toHaveBeenCalledWith( - 'No active root span found, skipping tracing for data request', - ); + expect(SentryCore.debug.log).toHaveBeenCalledWith('No active root span found, skipping tracing for data request'); expect(originalHandler).toHaveBeenCalledWith(req, undefined); }); diff --git a/packages/react-router/test/server/lowQualityTransactionsFilterIntegration.test.ts b/packages/react-router/test/server/lowQualityTransactionsFilterIntegration.test.ts index 3aac16d0d05d..4f43b48dcad9 100644 --- a/packages/react-router/test/server/lowQualityTransactionsFilterIntegration.test.ts +++ b/packages/react-router/test/server/lowQualityTransactionsFilterIntegration.test.ts @@ -4,7 +4,7 @@ import * as SentryNode from '@sentry/node'; import { afterEach, describe, expect, it, vi } from 'vitest'; import { lowQualityTransactionsFilterIntegration } from '../../src/server/integration/lowQualityTransactionsFilterIntegration'; -const loggerLog = vi.spyOn(SentryCore.logger, 'log').mockImplementation(() => {}); +const debugLoggerLogSpy = vi.spyOn(SentryCore.debug, 'log').mockImplementation(() => {}); describe('Low Quality Transactions Filter Integration', () => { afterEach(() => { @@ -30,7 +30,7 @@ describe('Low Quality Transactions Filter Integration', () => { expect(result).toBeNull(); - expect(loggerLog).toHaveBeenCalledWith('[ReactRouter] Filtered node_modules transaction:', transaction); + expect(debugLoggerLogSpy).toHaveBeenCalledWith('[ReactRouter] Filtered node_modules transaction:', transaction); }); });