Skip to content

Commit 4064ff1

Browse files
committed
PR feedback
1 parent bd324af commit 4064ff1

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

MIGRATION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ These docs walk through how to migrate our JavaScript SDKs through different maj
1111

1212
## Deprecated `@sentry/core` SDK internal `logger` export
1313

14-
The `logger` export from `@sentry/core` has been deprecated in favor of the `debug` export. `debug` only exposes `log`, `warn`, and `error` methods but is otherwise identical to `logger`.
14+
The internal SDK `logger` export from `@sentry/core` has been deprecated in favor of the `debug` export. `debug` only exposes `log`, `warn`, and `error` methods but is otherwise identical to `logger`. Note that this deprecation does not affect the `logger` export from other packages (like `@sentry/browser` or `@sentry/node`) which is used for Sentry Logging.
1515

1616
```js
1717
import { logger, debug } from '@sentry/core';

dev-packages/opentelemetry-v2-tests/test/helpers/initOtel.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
ATTR_SERVICE_VERSION,
88
SEMRESATTRS_SERVICE_NAMESPACE,
99
} from '@opentelemetry/semantic-conventions';
10-
import { getClient, logger, SDK_VERSION } from '@sentry/core';
10+
import { debug as debugLogger, getClient, SDK_VERSION } from '@sentry/core';
1111
import { wrapContextManagerClass } from '../../../../packages/opentelemetry/src/contextManager';
1212
import { DEBUG_BUILD } from '../../../../packages/opentelemetry/src/debug-build';
1313
import { SentryPropagator } from '../../../../packages/opentelemetry/src/propagator';
@@ -25,21 +25,23 @@ export function initOtel(): void {
2525

2626
if (!client) {
2727
DEBUG_BUILD &&
28-
logger.warn(
28+
debugLogger.warn(
2929
'No client available, skipping OpenTelemetry setup. This probably means that `Sentry.init()` was not called before `initOtel()`.',
3030
);
3131
return;
3232
}
3333

3434
if (client.getOptions().debug) {
35-
const otelLogger = new Proxy(logger as typeof logger & { verbose: (typeof logger)['debug'] }, {
36-
get(target, prop, receiver) {
37-
const actualProp = prop === 'verbose' ? 'debug' : prop;
38-
return Reflect.get(target, actualProp, receiver);
35+
diag.setLogger(
36+
{
37+
error: debugLogger.error,
38+
warn: debugLogger.warn,
39+
info: debugLogger.log,
40+
debug: debugLogger.log,
41+
verbose: debugLogger.log,
3942
},
40-
});
41-
42-
diag.setLogger(otelLogger, DiagLogLevel.DEBUG);
43+
DiagLogLevel.DEBUG,
44+
);
4345
}
4446

4547
setupEventContextTrace(client);

dev-packages/opentelemetry-v2-tests/test/integration/transactions.test.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66
addBreadcrumb,
77
debug,
88
getClient,
9-
logger,
109
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
1110
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
1211
setTag,
@@ -503,7 +502,7 @@ describe('Integration | Transactions', () => {
503502
vi.setSystemTime(now);
504503

505504
const logs: unknown[] = [];
506-
vi.spyOn(logger, 'log').mockImplementation(msg => logs.push(msg));
505+
vi.spyOn(debug, 'log').mockImplementation(msg => logs.push(msg));
507506

508507
const transactions: Event[] = [];
509508

@@ -555,7 +554,7 @@ describe('Integration | Transactions', () => {
555554
vi.setSystemTime(now);
556555

557556
const logs: unknown[] = [];
558-
vi.spyOn(logger, 'log').mockImplementation(msg => logs.push(msg));
557+
vi.spyOn(debug, 'log').mockImplementation(msg => logs.push(msg));
559558

560559
const transactions: Event[] = [];
561560

@@ -606,7 +605,7 @@ describe('Integration | Transactions', () => {
606605
vi.setSystemTime(now);
607606

608607
const logs: unknown[] = [];
609-
vi.spyOn(logger, 'log').mockImplementation(msg => logs.push(msg));
608+
vi.spyOn(debug, 'log').mockImplementation(msg => logs.push(msg));
610609

611610
const transactions: Event[] = [];
612611

0 commit comments

Comments
 (0)