Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/browser/src/integrations/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,7 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
return {
name: INTEGRATION_NAME,
setup(client) {
// TODO(v10): Remove this functionality and use `consoleIntegration` from @sentry/core instead.
if (_options.console) {
addConsoleInstrumentationHandler(_getConsoleBreadcrumbHandler(client));
}
Expand Down
1 change: 1 addition & 0 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export {
captureConsoleIntegration,
moduleMetadataIntegration,
zodErrorsIntegration,
consoleIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
linkedErrorsIntegration,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import type { CloudflareClientOptions, CloudflareOptions } from './client';
import { CloudflareClient } from './client';
Expand All@@ -27,6 +28,7 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
linkedErrorsIntegration(),
fetchIntegration(),
requestDataIntegration(sendDefaultPii ? undefined : { include: { cookies: false } }),
consoleIntegration(),
];
}

Expand Down
2 changes: 2 additions & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,8 @@ export { extraErrorDataIntegration } from './integrations/extraerrordata';
export { rewriteFramesIntegration } from './integrations/rewriteframes';
export { zodErrorsIntegration } from './integrations/zoderrors';
export { thirdPartyErrorFilterIntegration } from './integrations/third-party-errors-filter';
export { consoleIntegration } from './integrations/console';

export { profiler } from './profiling';
export { instrumentFetchRequest } from './fetch';
export { trpcMiddleware } from './trpc';
Expand Down
95 changes: 95 additions & 0 deletions packages/core/src/integrations/console.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
import { addBreadcrumb } from '../breadcrumbs';
import { getClient } from '../currentScopes';
import { defineIntegration } from '../integration';
import type { ConsoleLevel } from '../types-hoist';
import {
CONSOLE_LEVELS,
GLOBAL_OBJ,
addConsoleInstrumentationHandler,
safeJoin,
severityLevelFromString,
} from '../utils-hoist';

interface ConsoleIntegrationOptions {
levels: ConsoleLevel[];
}

type GlobalObjectWithUtil = typeof GLOBAL_OBJ & {
util: {
format: (...args: unknown[]) => string;
};
};

const INTEGRATION_NAME = 'Console';

/**
* Captures calls to the `console` API as breadcrumbs in Sentry.
*
* By default the integration instruments `console.debug`, `console.info`, `console.warn`, `console.error`,
* `console.log`, `console.trace`, and `console.assert`. You can use the `levels` option to customize which
* levels are captured.
*
* @example
*
* ```js
* Sentry.init({
* integrations: [Sentry.consoleIntegration({ levels: ['error', 'warn'] })],
* });
* ```
*/
export const consoleIntegration = defineIntegration((options: Partial<ConsoleIntegrationOptions> = {}) => {
const levels = new Set(options.levels || CONSOLE_LEVELS);

return {
name: INTEGRATION_NAME,
setup(client) {
addConsoleInstrumentationHandler(({ args, level }) => {
if (getClient() !== client || !levels.has(level)) {
return;
}

addConsoleBreadcrumb(level, args);
});
},
};
});

/**
* Capture a console breadcrumb.
*
* Exported just for tests.
*/
export function addConsoleBreadcrumb(level: ConsoleLevel, args: unknown[]): void {
const breadcrumb = {
category: 'console',
data: {
arguments: args,
logger: 'console',
},
level: severityLevelFromString(level),
message: formatConsoleArgs(args),
};

if (level === 'assert') {
if (args[0] === false) {
const assertionArgs = args.slice(1);
breadcrumb.message =
assertionArgs.length > 0 ? `Assertion failed: ${formatConsoleArgs(assertionArgs)}` : 'Assertion failed';
breadcrumb.data.arguments = assertionArgs;
} else {
// Don't capture a breadcrumb for passed assertions
return;
}
}

addBreadcrumb(breadcrumb, {
input: args,
level,
});
}

function formatConsoleArgs(values: unknown[]): string {
return 'util' in GLOBAL_OBJ && typeof (GLOBAL_OBJ as GlobalObjectWithUtil).util.format === 'function'
? (GLOBAL_OBJ as GlobalObjectWithUtil).util.format(...values)
: safeJoin(values, ' ');
}
71 changes: 71 additions & 0 deletions packages/core/test/lib/integrations/console.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { addConsoleBreadcrumb } from '../../../src/integrations/console';
import { addBreadcrumb } from '../../../src/breadcrumbs';

vi.mock('../../../src/breadcrumbs', () => ({
addBreadcrumb: vi.fn(),
}));

describe('addConsoleBreadcrumb', () => {
beforeEach(() => {
vi.clearAllMocks();
});

it('creates a breadcrumb with correct properties for basic console log', () => {
const level = 'log';
const args = ['test message', 123];

addConsoleBreadcrumb(level, args);

expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
category: 'console',
data: {
arguments: args,
logger: 'console',
},
level: 'log',
message: 'test message 123',
}),
{
input: args,
level,
},
);
});

it.each(['debug', 'info', 'warn', 'error'] as const)('handles %s level correctly', level => {
addConsoleBreadcrumb(level, ['test']);
expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
level: expect.any(String),
}),
expect.any(Object),
);
});

it('skips breadcrumb for passed assertions', () => {
addConsoleBreadcrumb('assert', [true, 'should not be captured']);
expect(addBreadcrumb).not.toHaveBeenCalled();
});

it('creates breadcrumb for failed assertions', () => {
const args = [false, 'assertion failed', 'details'];

addConsoleBreadcrumb('assert', args);

expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
message: expect.stringContaining('Assertion failed'),
data: {
arguments: args.slice(1),
logger: 'console',
},
}),
{
input: args,
level: 'assert',
},
);
});
});
1 change: 1 addition & 0 deletions packages/deno/src/integrations/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
return {
name: INTEGRATION_NAME,
setup(client) {
// TODO(v10): Remove this functionality and use `consoleIntegration` from @sentry/core instead.
if (_options.console) {
addConsoleInstrumentationHandler(_getConsoleBreadcrumbHandler(client));
}
Expand Down
2 changes: 1 addition & 1 deletion packages/node/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ export { httpIntegration } from './integrations/http';
export { nativeNodeFetchIntegration } from './integrations/node-fetch';
export { fsIntegration } from './integrations/fs';

export { consoleIntegration } from './integrations/console';
export { nodeContextIntegration } from './integrations/context';
export { contextLinesIntegration } from './integrations/contextlines';
export { localVariablesIntegration } from './integrations/local-variables';
Expand DownExpand Up@@ -131,6 +130,7 @@ export {
zodErrorsIntegration,
profiler,
consoleLoggingIntegration,
consoleIntegration,
} from '@sentry/core';

export type {
Expand Down
38 changes: 0 additions & 38 deletions packages/node/src/integrations/console.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/node/src/sdk/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
propagationContextFromHeaders,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import {
enhanceDscWithOpenTelemetryRootSpanName,
Expand All@@ -20,7 +21,6 @@ import {
} from '@sentry/opentelemetry';
import { DEBUG_BUILD } from '../debug-build';
import { childProcessIntegration } from '../integrations/childProcess';
import { consoleIntegration } from '../integrations/console';
import { nodeContextIntegration } from '../integrations/context';
import { contextLinesIntegration } from '../integrations/contextlines';
import { httpIntegration } from '../integrations/http';
Expand Down
39 changes: 0 additions & 39 deletions packages/node/test/integration/console.test.ts

This file was deleted.

1 change: 1 addition & 0 deletions packages/vercel-edge/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export {
captureConsoleIntegration,
moduleMetadataIntegration,
zodErrorsIntegration,
consoleIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
Expand Down
2 changes: 2 additions & 0 deletions packages/vercel-edge/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import {
nodeStackLineParser,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import {
SentryPropagator,
Expand DownExpand Up@@ -57,6 +58,7 @@ export function getDefaultIntegrations(options: Options): Integration[] {
functionToStringIntegration(),
linkedErrorsIntegration(),
winterCGFetchIntegration(),
consoleIntegration(),
...(options.sendDefaultPii ? [requestDataIntegration()] : []),
];
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/browser/src/integrations/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,7 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
return {
name: INTEGRATION_NAME,
setup(client) {
// TODO(v10): Remove this functionality and use `consoleIntegration` from @sentry/core instead.
if (_options.console) {
addConsoleInstrumentationHandler(_getConsoleBreadcrumbHandler(client));
}
Expand Down
1 change: 1 addition & 0 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export {
captureConsoleIntegration,
moduleMetadataIntegration,
zodErrorsIntegration,
consoleIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
linkedErrorsIntegration,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import type { CloudflareClientOptions, CloudflareOptions } from './client';
import { CloudflareClient } from './client';
Expand All@@ -27,6 +28,7 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
linkedErrorsIntegration(),
fetchIntegration(),
requestDataIntegration(sendDefaultPii ? undefined : { include: { cookies: false } }),
consoleIntegration(),
];
}

Expand Down
2 changes: 2 additions & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,8 @@ export { extraErrorDataIntegration } from './integrations/extraerrordata';
export { rewriteFramesIntegration } from './integrations/rewriteframes';
export { zodErrorsIntegration } from './integrations/zoderrors';
export { thirdPartyErrorFilterIntegration } from './integrations/third-party-errors-filter';
export { consoleIntegration } from './integrations/console';

export { profiler } from './profiling';
export { instrumentFetchRequest } from './fetch';
export { trpcMiddleware } from './trpc';
Expand Down
95 changes: 95 additions & 0 deletions packages/core/src/integrations/console.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
import { addBreadcrumb } from '../breadcrumbs';
import { getClient } from '../currentScopes';
import { defineIntegration } from '../integration';
import type { ConsoleLevel } from '../types-hoist';
import {
CONSOLE_LEVELS,
GLOBAL_OBJ,
addConsoleInstrumentationHandler,
safeJoin,
severityLevelFromString,
} from '../utils-hoist';

interface ConsoleIntegrationOptions {
levels: ConsoleLevel[];
}

type GlobalObjectWithUtil = typeof GLOBAL_OBJ & {
util: {
format: (...args: unknown[]) => string;
};
};

const INTEGRATION_NAME = 'Console';

/**
* Captures calls to the `console` API as breadcrumbs in Sentry.
*
* By default the integration instruments `console.debug`, `console.info`, `console.warn`, `console.error`,
* `console.log`, `console.trace`, and `console.assert`. You can use the `levels` option to customize which
* levels are captured.
*
* @example
*
* ```js
* Sentry.init({
* integrations: [Sentry.consoleIntegration({ levels: ['error', 'warn'] })],
* });
* ```
*/
export const consoleIntegration = defineIntegration((options: Partial<ConsoleIntegrationOptions> = {}) => {
const levels = new Set(options.levels || CONSOLE_LEVELS);

return {
name: INTEGRATION_NAME,
setup(client) {
addConsoleInstrumentationHandler(({ args, level }) => {
if (getClient() !== client || !levels.has(level)) {
return;
}

addConsoleBreadcrumb(level, args);
});
},
};
});

/**
* Capture a console breadcrumb.
*
* Exported just for tests.
*/
export function addConsoleBreadcrumb(level: ConsoleLevel, args: unknown[]): void {
const breadcrumb = {
category: 'console',
data: {
arguments: args,
logger: 'console',
},
level: severityLevelFromString(level),
message: formatConsoleArgs(args),
};

if (level === 'assert') {
if (args[0] === false) {
const assertionArgs = args.slice(1);
breadcrumb.message =
assertionArgs.length > 0 ? `Assertion failed: ${formatConsoleArgs(assertionArgs)}` : 'Assertion failed';
breadcrumb.data.arguments = assertionArgs;
} else {
// Don't capture a breadcrumb for passed assertions
return;
}
}

addBreadcrumb(breadcrumb, {
input: args,
level,
});
}

function formatConsoleArgs(values: unknown[]): string {
return 'util' in GLOBAL_OBJ && typeof (GLOBAL_OBJ as GlobalObjectWithUtil).util.format === 'function'
? (GLOBAL_OBJ as GlobalObjectWithUtil).util.format(...values)
: safeJoin(values, ' ');
}
71 changes: 71 additions & 0 deletions packages/core/test/lib/integrations/console.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { addConsoleBreadcrumb } from '../../../src/integrations/console';
import { addBreadcrumb } from '../../../src/breadcrumbs';

vi.mock('../../../src/breadcrumbs', () => ({
addBreadcrumb: vi.fn(),
}));

describe('addConsoleBreadcrumb', () => {
beforeEach(() => {
vi.clearAllMocks();
});

it('creates a breadcrumb with correct properties for basic console log', () => {
const level = 'log';
const args = ['test message', 123];

addConsoleBreadcrumb(level, args);

expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
category: 'console',
data: {
arguments: args,
logger: 'console',
},
level: 'log',
message: 'test message 123',
}),
{
input: args,
level,
},
);
});

it.each(['debug', 'info', 'warn', 'error'] as const)('handles %s level correctly', level => {
addConsoleBreadcrumb(level, ['test']);
expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
level: expect.any(String),
}),
expect.any(Object),
);
});

it('skips breadcrumb for passed assertions', () => {
addConsoleBreadcrumb('assert', [true, 'should not be captured']);
expect(addBreadcrumb).not.toHaveBeenCalled();
});

it('creates breadcrumb for failed assertions', () => {
const args = [false, 'assertion failed', 'details'];

addConsoleBreadcrumb('assert', args);

expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
message: expect.stringContaining('Assertion failed'),
data: {
arguments: args.slice(1),
logger: 'console',
},
}),
{
input: args,
level: 'assert',
},
);
});
});
1 change: 1 addition & 0 deletions packages/deno/src/integrations/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
return {
name: INTEGRATION_NAME,
setup(client) {
// TODO(v10): Remove this functionality and use `consoleIntegration` from @sentry/core instead.
if (_options.console) {
addConsoleInstrumentationHandler(_getConsoleBreadcrumbHandler(client));
}
Expand Down
2 changes: 1 addition & 1 deletion packages/node/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ export { httpIntegration } from './integrations/http';
export { nativeNodeFetchIntegration } from './integrations/node-fetch';
export { fsIntegration } from './integrations/fs';

export { consoleIntegration } from './integrations/console';
export { nodeContextIntegration } from './integrations/context';
export { contextLinesIntegration } from './integrations/contextlines';
export { localVariablesIntegration } from './integrations/local-variables';
Expand DownExpand Up@@ -131,6 +130,7 @@ export {
zodErrorsIntegration,
profiler,
consoleLoggingIntegration,
consoleIntegration,
} from '@sentry/core';

export type {
Expand Down
38 changes: 0 additions & 38 deletions packages/node/src/integrations/console.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/node/src/sdk/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
propagationContextFromHeaders,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import {
enhanceDscWithOpenTelemetryRootSpanName,
Expand All@@ -20,7 +21,6 @@ import {
} from '@sentry/opentelemetry';
import { DEBUG_BUILD } from '../debug-build';
import { childProcessIntegration } from '../integrations/childProcess';
import { consoleIntegration } from '../integrations/console';
import { nodeContextIntegration } from '../integrations/context';
import { contextLinesIntegration } from '../integrations/contextlines';
import { httpIntegration } from '../integrations/http';
Expand Down
39 changes: 0 additions & 39 deletions packages/node/test/integration/console.test.ts

This file was deleted.

1 change: 1 addition & 0 deletions packages/vercel-edge/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export {
captureConsoleIntegration,
moduleMetadataIntegration,
zodErrorsIntegration,
consoleIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
Expand Down
2 changes: 2 additions & 0 deletions packages/vercel-edge/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import {
nodeStackLineParser,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import {
SentryPropagator,
Expand DownExpand Up@@ -57,6 +58,7 @@ export function getDefaultIntegrations(options: Options): Integration[] {
functionToStringIntegration(),
linkedErrorsIntegration(),
winterCGFetchIntegration(),
consoleIntegration(),
...(options.sendDefaultPii ? [requestDataIntegration()] : []),
];
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/browser/src/integrations/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,7 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
return {
name: INTEGRATION_NAME,
setup(client) {
// TODO(v10): Remove this functionality and use `consoleIntegration` from @sentry/core instead.
if (_options.console) {
addConsoleInstrumentationHandler(_getConsoleBreadcrumbHandler(client));
}
Expand Down
1 change: 1 addition & 0 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export {
captureConsoleIntegration,
moduleMetadataIntegration,
zodErrorsIntegration,
consoleIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
linkedErrorsIntegration,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import type { CloudflareClientOptions, CloudflareOptions } from './client';
import { CloudflareClient } from './client';
Expand All@@ -27,6 +28,7 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
linkedErrorsIntegration(),
fetchIntegration(),
requestDataIntegration(sendDefaultPii ? undefined : { include: { cookies: false } }),
consoleIntegration(),
];
}

Expand Down
2 changes: 2 additions & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,8 @@ export { extraErrorDataIntegration } from './integrations/extraerrordata';
export { rewriteFramesIntegration } from './integrations/rewriteframes';
export { zodErrorsIntegration } from './integrations/zoderrors';
export { thirdPartyErrorFilterIntegration } from './integrations/third-party-errors-filter';
export { consoleIntegration } from './integrations/console';

export { profiler } from './profiling';
export { instrumentFetchRequest } from './fetch';
export { trpcMiddleware } from './trpc';
Expand Down
95 changes: 95 additions & 0 deletions packages/core/src/integrations/console.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
import { addBreadcrumb } from '../breadcrumbs';
import { getClient } from '../currentScopes';
import { defineIntegration } from '../integration';
import type { ConsoleLevel } from '../types-hoist';
import {
CONSOLE_LEVELS,
GLOBAL_OBJ,
addConsoleInstrumentationHandler,
safeJoin,
severityLevelFromString,
} from '../utils-hoist';

interface ConsoleIntegrationOptions {
levels: ConsoleLevel[];
}

type GlobalObjectWithUtil = typeof GLOBAL_OBJ & {
util: {
format: (...args: unknown[]) => string;
};
};

const INTEGRATION_NAME = 'Console';

/**
* Captures calls to the `console` API as breadcrumbs in Sentry.
*
* By default the integration instruments `console.debug`, `console.info`, `console.warn`, `console.error`,
* `console.log`, `console.trace`, and `console.assert`. You can use the `levels` option to customize which
* levels are captured.
*
* @example
*
* ```js
* Sentry.init({
* integrations: [Sentry.consoleIntegration({ levels: ['error', 'warn'] })],
* });
* ```
*/
export const consoleIntegration = defineIntegration((options: Partial<ConsoleIntegrationOptions> = {}) => {
const levels = new Set(options.levels || CONSOLE_LEVELS);

return {
name: INTEGRATION_NAME,
setup(client) {
addConsoleInstrumentationHandler(({ args, level }) => {
if (getClient() !== client || !levels.has(level)) {
return;
}

addConsoleBreadcrumb(level, args);
});
},
};
});

/**
* Capture a console breadcrumb.
*
* Exported just for tests.
*/
export function addConsoleBreadcrumb(level: ConsoleLevel, args: unknown[]): void {
const breadcrumb = {
category: 'console',
data: {
arguments: args,
logger: 'console',
},
level: severityLevelFromString(level),
message: formatConsoleArgs(args),
};

if (level === 'assert') {
if (args[0] === false) {
const assertionArgs = args.slice(1);
breadcrumb.message =
assertionArgs.length > 0 ? `Assertion failed: ${formatConsoleArgs(assertionArgs)}` : 'Assertion failed';
breadcrumb.data.arguments = assertionArgs;
} else {
// Don't capture a breadcrumb for passed assertions
return;
}
}

addBreadcrumb(breadcrumb, {
input: args,
level,
});
}

function formatConsoleArgs(values: unknown[]): string {
return 'util' in GLOBAL_OBJ && typeof (GLOBAL_OBJ as GlobalObjectWithUtil).util.format === 'function'
? (GLOBAL_OBJ as GlobalObjectWithUtil).util.format(...values)
: safeJoin(values, ' ');
}
71 changes: 71 additions & 0 deletions packages/core/test/lib/integrations/console.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { addConsoleBreadcrumb } from '../../../src/integrations/console';
import { addBreadcrumb } from '../../../src/breadcrumbs';

vi.mock('../../../src/breadcrumbs', () => ({
addBreadcrumb: vi.fn(),
}));

describe('addConsoleBreadcrumb', () => {
beforeEach(() => {
vi.clearAllMocks();
});

it('creates a breadcrumb with correct properties for basic console log', () => {
const level = 'log';
const args = ['test message', 123];

addConsoleBreadcrumb(level, args);

expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
category: 'console',
data: {
arguments: args,
logger: 'console',
},
level: 'log',
message: 'test message 123',
}),
{
input: args,
level,
},
);
});

it.each(['debug', 'info', 'warn', 'error'] as const)('handles %s level correctly', level => {
addConsoleBreadcrumb(level, ['test']);
expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
level: expect.any(String),
}),
expect.any(Object),
);
});

it('skips breadcrumb for passed assertions', () => {
addConsoleBreadcrumb('assert', [true, 'should not be captured']);
expect(addBreadcrumb).not.toHaveBeenCalled();
});

it('creates breadcrumb for failed assertions', () => {
const args = [false, 'assertion failed', 'details'];

addConsoleBreadcrumb('assert', args);

expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
message: expect.stringContaining('Assertion failed'),
data: {
arguments: args.slice(1),
logger: 'console',
},
}),
{
input: args,
level: 'assert',
},
);
});
});
1 change: 1 addition & 0 deletions packages/deno/src/integrations/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
return {
name: INTEGRATION_NAME,
setup(client) {
// TODO(v10): Remove this functionality and use `consoleIntegration` from @sentry/core instead.
if (_options.console) {
addConsoleInstrumentationHandler(_getConsoleBreadcrumbHandler(client));
}
Expand Down
2 changes: 1 addition & 1 deletion packages/node/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ export { httpIntegration } from './integrations/http';
export { nativeNodeFetchIntegration } from './integrations/node-fetch';
export { fsIntegration } from './integrations/fs';

export { consoleIntegration } from './integrations/console';
export { nodeContextIntegration } from './integrations/context';
export { contextLinesIntegration } from './integrations/contextlines';
export { localVariablesIntegration } from './integrations/local-variables';
Expand DownExpand Up@@ -131,6 +130,7 @@ export {
zodErrorsIntegration,
profiler,
consoleLoggingIntegration,
consoleIntegration,
} from '@sentry/core';

export type {
Expand Down
38 changes: 0 additions & 38 deletions packages/node/src/integrations/console.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/node/src/sdk/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
propagationContextFromHeaders,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import {
enhanceDscWithOpenTelemetryRootSpanName,
Expand All@@ -20,7 +21,6 @@ import {
} from '@sentry/opentelemetry';
import { DEBUG_BUILD } from '../debug-build';
import { childProcessIntegration } from '../integrations/childProcess';
import { consoleIntegration } from '../integrations/console';
import { nodeContextIntegration } from '../integrations/context';
import { contextLinesIntegration } from '../integrations/contextlines';
import { httpIntegration } from '../integrations/http';
Expand Down
39 changes: 0 additions & 39 deletions packages/node/test/integration/console.test.ts

This file was deleted.

1 change: 1 addition & 0 deletions packages/vercel-edge/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export {
captureConsoleIntegration,
moduleMetadataIntegration,
zodErrorsIntegration,
consoleIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
Expand Down
2 changes: 2 additions & 0 deletions packages/vercel-edge/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import {
nodeStackLineParser,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import {
SentryPropagator,
Expand DownExpand Up@@ -57,6 +58,7 @@ export function getDefaultIntegrations(options: Options): Integration[] {
functionToStringIntegration(),
linkedErrorsIntegration(),
winterCGFetchIntegration(),
consoleIntegration(),
...(options.sendDefaultPii ? [requestDataIntegration()] : []),
];
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/browser/src/integrations/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,7 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
return {
name: INTEGRATION_NAME,
setup(client) {
// TODO(v10): Remove this functionality and use `consoleIntegration` from @sentry/core instead.
if (_options.console) {
addConsoleInstrumentationHandler(_getConsoleBreadcrumbHandler(client));
}
Expand Down
1 change: 1 addition & 0 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export {
captureConsoleIntegration,
moduleMetadataIntegration,
zodErrorsIntegration,
consoleIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
linkedErrorsIntegration,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import type { CloudflareClientOptions, CloudflareOptions } from './client';
import { CloudflareClient } from './client';
Expand All@@ -27,6 +28,7 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
linkedErrorsIntegration(),
fetchIntegration(),
requestDataIntegration(sendDefaultPii ? undefined : { include: { cookies: false } }),
consoleIntegration(),
];
}

Expand Down
2 changes: 2 additions & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,8 @@ export { extraErrorDataIntegration } from './integrations/extraerrordata';
export { rewriteFramesIntegration } from './integrations/rewriteframes';
export { zodErrorsIntegration } from './integrations/zoderrors';
export { thirdPartyErrorFilterIntegration } from './integrations/third-party-errors-filter';
export { consoleIntegration } from './integrations/console';

export { profiler } from './profiling';
export { instrumentFetchRequest } from './fetch';
export { trpcMiddleware } from './trpc';
Expand Down
95 changes: 95 additions & 0 deletions packages/core/src/integrations/console.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
import { addBreadcrumb } from '../breadcrumbs';
import { getClient } from '../currentScopes';
import { defineIntegration } from '../integration';
import type { ConsoleLevel } from '../types-hoist';
import {
CONSOLE_LEVELS,
GLOBAL_OBJ,
addConsoleInstrumentationHandler,
safeJoin,
severityLevelFromString,
} from '../utils-hoist';

interface ConsoleIntegrationOptions {
levels: ConsoleLevel[];
}

type GlobalObjectWithUtil = typeof GLOBAL_OBJ & {
util: {
format: (...args: unknown[]) => string;
};
};

const INTEGRATION_NAME = 'Console';

/**
* Captures calls to the `console` API as breadcrumbs in Sentry.
*
* By default the integration instruments `console.debug`, `console.info`, `console.warn`, `console.error`,
* `console.log`, `console.trace`, and `console.assert`. You can use the `levels` option to customize which
* levels are captured.
*
* @example
*
* ```js
* Sentry.init({
* integrations: [Sentry.consoleIntegration({ levels: ['error', 'warn'] })],
* });
* ```
*/
export const consoleIntegration = defineIntegration((options: Partial<ConsoleIntegrationOptions> = {}) => {
const levels = new Set(options.levels || CONSOLE_LEVELS);

return {
name: INTEGRATION_NAME,
setup(client) {
addConsoleInstrumentationHandler(({ args, level }) => {
if (getClient() !== client || !levels.has(level)) {
return;
}

addConsoleBreadcrumb(level, args);
});
},
};
});

/**
* Capture a console breadcrumb.
*
* Exported just for tests.
*/
export function addConsoleBreadcrumb(level: ConsoleLevel, args: unknown[]): void {
const breadcrumb = {
category: 'console',
data: {
arguments: args,
logger: 'console',
},
level: severityLevelFromString(level),
message: formatConsoleArgs(args),
};

if (level === 'assert') {
if (args[0] === false) {
const assertionArgs = args.slice(1);
breadcrumb.message =
assertionArgs.length > 0 ? `Assertion failed: ${formatConsoleArgs(assertionArgs)}` : 'Assertion failed';
breadcrumb.data.arguments = assertionArgs;
} else {
// Don't capture a breadcrumb for passed assertions
return;
}
}

addBreadcrumb(breadcrumb, {
input: args,
level,
});
}

function formatConsoleArgs(values: unknown[]): string {
return 'util' in GLOBAL_OBJ && typeof (GLOBAL_OBJ as GlobalObjectWithUtil).util.format === 'function'
? (GLOBAL_OBJ as GlobalObjectWithUtil).util.format(...values)
: safeJoin(values, ' ');
}
71 changes: 71 additions & 0 deletions packages/core/test/lib/integrations/console.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { addConsoleBreadcrumb } from '../../../src/integrations/console';
import { addBreadcrumb } from '../../../src/breadcrumbs';

vi.mock('../../../src/breadcrumbs', () => ({
addBreadcrumb: vi.fn(),
}));

describe('addConsoleBreadcrumb', () => {
beforeEach(() => {
vi.clearAllMocks();
});

it('creates a breadcrumb with correct properties for basic console log', () => {
const level = 'log';
const args = ['test message', 123];

addConsoleBreadcrumb(level, args);

expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
category: 'console',
data: {
arguments: args,
logger: 'console',
},
level: 'log',
message: 'test message 123',
}),
{
input: args,
level,
},
);
});

it.each(['debug', 'info', 'warn', 'error'] as const)('handles %s level correctly', level => {
addConsoleBreadcrumb(level, ['test']);
expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
level: expect.any(String),
}),
expect.any(Object),
);
});

it('skips breadcrumb for passed assertions', () => {
addConsoleBreadcrumb('assert', [true, 'should not be captured']);
expect(addBreadcrumb).not.toHaveBeenCalled();
});

it('creates breadcrumb for failed assertions', () => {
const args = [false, 'assertion failed', 'details'];

addConsoleBreadcrumb('assert', args);

expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
message: expect.stringContaining('Assertion failed'),
data: {
arguments: args.slice(1),
logger: 'console',
},
}),
{
input: args,
level: 'assert',
},
);
});
});
1 change: 1 addition & 0 deletions packages/deno/src/integrations/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
return {
name: INTEGRATION_NAME,
setup(client) {
// TODO(v10): Remove this functionality and use `consoleIntegration` from @sentry/core instead.
if (_options.console) {
addConsoleInstrumentationHandler(_getConsoleBreadcrumbHandler(client));
}
Expand Down
2 changes: 1 addition & 1 deletion packages/node/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ export { httpIntegration } from './integrations/http';
export { nativeNodeFetchIntegration } from './integrations/node-fetch';
export { fsIntegration } from './integrations/fs';

export { consoleIntegration } from './integrations/console';
export { nodeContextIntegration } from './integrations/context';
export { contextLinesIntegration } from './integrations/contextlines';
export { localVariablesIntegration } from './integrations/local-variables';
Expand DownExpand Up@@ -131,6 +130,7 @@ export {
zodErrorsIntegration,
profiler,
consoleLoggingIntegration,
consoleIntegration,
} from '@sentry/core';

export type {
Expand Down
38 changes: 0 additions & 38 deletions packages/node/src/integrations/console.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/node/src/sdk/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
propagationContextFromHeaders,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import {
enhanceDscWithOpenTelemetryRootSpanName,
Expand All@@ -20,7 +21,6 @@ import {
} from '@sentry/opentelemetry';
import { DEBUG_BUILD } from '../debug-build';
import { childProcessIntegration } from '../integrations/childProcess';
import { consoleIntegration } from '../integrations/console';
import { nodeContextIntegration } from '../integrations/context';
import { contextLinesIntegration } from '../integrations/contextlines';
import { httpIntegration } from '../integrations/http';
Expand Down
39 changes: 0 additions & 39 deletions packages/node/test/integration/console.test.ts

This file was deleted.

1 change: 1 addition & 0 deletions packages/vercel-edge/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export {
captureConsoleIntegration,
moduleMetadataIntegration,
zodErrorsIntegration,
consoleIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
Expand Down
2 changes: 2 additions & 0 deletions packages/vercel-edge/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import {
nodeStackLineParser,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import {
SentryPropagator,
Expand DownExpand Up@@ -57,6 +58,7 @@ export function getDefaultIntegrations(options: Options): Integration[] {
functionToStringIntegration(),
linkedErrorsIntegration(),
winterCGFetchIntegration(),
consoleIntegration(),
...(options.sendDefaultPii ? [requestDataIntegration()] : []),
];
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/browser/src/integrations/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,7 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
return {
name: INTEGRATION_NAME,
setup(client) {
// TODO(v10): Remove this functionality and use `consoleIntegration` from @sentry/core instead.
if (_options.console) {
addConsoleInstrumentationHandler(_getConsoleBreadcrumbHandler(client));
}
Expand Down
1 change: 1 addition & 0 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export {
captureConsoleIntegration,
moduleMetadataIntegration,
zodErrorsIntegration,
consoleIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
linkedErrorsIntegration,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import type { CloudflareClientOptions, CloudflareOptions } from './client';
import { CloudflareClient } from './client';
Expand All@@ -27,6 +28,7 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
linkedErrorsIntegration(),
fetchIntegration(),
requestDataIntegration(sendDefaultPii ? undefined : { include: { cookies: false } }),
consoleIntegration(),
];
}

Expand Down
2 changes: 2 additions & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,8 @@ export { extraErrorDataIntegration } from './integrations/extraerrordata';
export { rewriteFramesIntegration } from './integrations/rewriteframes';
export { zodErrorsIntegration } from './integrations/zoderrors';
export { thirdPartyErrorFilterIntegration } from './integrations/third-party-errors-filter';
export { consoleIntegration } from './integrations/console';

export { profiler } from './profiling';
export { instrumentFetchRequest } from './fetch';
export { trpcMiddleware } from './trpc';
Expand Down
95 changes: 95 additions & 0 deletions packages/core/src/integrations/console.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
import { addBreadcrumb } from '../breadcrumbs';
import { getClient } from '../currentScopes';
import { defineIntegration } from '../integration';
import type { ConsoleLevel } from '../types-hoist';
import {
CONSOLE_LEVELS,
GLOBAL_OBJ,
addConsoleInstrumentationHandler,
safeJoin,
severityLevelFromString,
} from '../utils-hoist';

interface ConsoleIntegrationOptions {
levels: ConsoleLevel[];
}

type GlobalObjectWithUtil = typeof GLOBAL_OBJ & {
util: {
format: (...args: unknown[]) => string;
};
};

const INTEGRATION_NAME = 'Console';

/**
* Captures calls to the `console` API as breadcrumbs in Sentry.
*
* By default the integration instruments `console.debug`, `console.info`, `console.warn`, `console.error`,
* `console.log`, `console.trace`, and `console.assert`. You can use the `levels` option to customize which
* levels are captured.
*
* @example
*
* ```js
* Sentry.init({
* integrations: [Sentry.consoleIntegration({ levels: ['error', 'warn'] })],
* });
* ```
*/
export const consoleIntegration = defineIntegration((options: Partial<ConsoleIntegrationOptions> = {}) => {
const levels = new Set(options.levels || CONSOLE_LEVELS);

return {
name: INTEGRATION_NAME,
setup(client) {
addConsoleInstrumentationHandler(({ args, level }) => {
if (getClient() !== client || !levels.has(level)) {
return;
}

addConsoleBreadcrumb(level, args);
});
},
};
});

/**
* Capture a console breadcrumb.
*
* Exported just for tests.
*/
export function addConsoleBreadcrumb(level: ConsoleLevel, args: unknown[]): void {
const breadcrumb = {
category: 'console',
data: {
arguments: args,
logger: 'console',
},
level: severityLevelFromString(level),
message: formatConsoleArgs(args),
};

if (level === 'assert') {
if (args[0] === false) {
const assertionArgs = args.slice(1);
breadcrumb.message =
assertionArgs.length > 0 ? `Assertion failed: ${formatConsoleArgs(assertionArgs)}` : 'Assertion failed';
breadcrumb.data.arguments = assertionArgs;
} else {
// Don't capture a breadcrumb for passed assertions
return;
}
}

addBreadcrumb(breadcrumb, {
input: args,
level,
});
}

function formatConsoleArgs(values: unknown[]): string {
return 'util' in GLOBAL_OBJ && typeof (GLOBAL_OBJ as GlobalObjectWithUtil).util.format === 'function'
? (GLOBAL_OBJ as GlobalObjectWithUtil).util.format(...values)
: safeJoin(values, ' ');
}
71 changes: 71 additions & 0 deletions packages/core/test/lib/integrations/console.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { addConsoleBreadcrumb } from '../../../src/integrations/console';
import { addBreadcrumb } from '../../../src/breadcrumbs';

vi.mock('../../../src/breadcrumbs', () => ({
addBreadcrumb: vi.fn(),
}));

describe('addConsoleBreadcrumb', () => {
beforeEach(() => {
vi.clearAllMocks();
});

it('creates a breadcrumb with correct properties for basic console log', () => {
const level = 'log';
const args = ['test message', 123];

addConsoleBreadcrumb(level, args);

expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
category: 'console',
data: {
arguments: args,
logger: 'console',
},
level: 'log',
message: 'test message 123',
}),
{
input: args,
level,
},
);
});

it.each(['debug', 'info', 'warn', 'error'] as const)('handles %s level correctly', level => {
addConsoleBreadcrumb(level, ['test']);
expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
level: expect.any(String),
}),
expect.any(Object),
);
});

it('skips breadcrumb for passed assertions', () => {
addConsoleBreadcrumb('assert', [true, 'should not be captured']);
expect(addBreadcrumb).not.toHaveBeenCalled();
});

it('creates breadcrumb for failed assertions', () => {
const args = [false, 'assertion failed', 'details'];

addConsoleBreadcrumb('assert', args);

expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
message: expect.stringContaining('Assertion failed'),
data: {
arguments: args.slice(1),
logger: 'console',
},
}),
{
input: args,
level: 'assert',
},
);
});
});
1 change: 1 addition & 0 deletions packages/deno/src/integrations/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
return {
name: INTEGRATION_NAME,
setup(client) {
// TODO(v10): Remove this functionality and use `consoleIntegration` from @sentry/core instead.
if (_options.console) {
addConsoleInstrumentationHandler(_getConsoleBreadcrumbHandler(client));
}
Expand Down
2 changes: 1 addition & 1 deletion packages/node/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ export { httpIntegration } from './integrations/http';
export { nativeNodeFetchIntegration } from './integrations/node-fetch';
export { fsIntegration } from './integrations/fs';

export { consoleIntegration } from './integrations/console';
export { nodeContextIntegration } from './integrations/context';
export { contextLinesIntegration } from './integrations/contextlines';
export { localVariablesIntegration } from './integrations/local-variables';
Expand DownExpand Up@@ -131,6 +130,7 @@ export {
zodErrorsIntegration,
profiler,
consoleLoggingIntegration,
consoleIntegration,
} from '@sentry/core';

export type {
Expand Down
38 changes: 0 additions & 38 deletions packages/node/src/integrations/console.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/node/src/sdk/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
propagationContextFromHeaders,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import {
enhanceDscWithOpenTelemetryRootSpanName,
Expand All@@ -20,7 +21,6 @@ import {
} from '@sentry/opentelemetry';
import { DEBUG_BUILD } from '../debug-build';
import { childProcessIntegration } from '../integrations/childProcess';
import { consoleIntegration } from '../integrations/console';
import { nodeContextIntegration } from '../integrations/context';
import { contextLinesIntegration } from '../integrations/contextlines';
import { httpIntegration } from '../integrations/http';
Expand Down
39 changes: 0 additions & 39 deletions packages/node/test/integration/console.test.ts

This file was deleted.

1 change: 1 addition & 0 deletions packages/vercel-edge/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export {
captureConsoleIntegration,
moduleMetadataIntegration,
zodErrorsIntegration,
consoleIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
Expand Down
2 changes: 2 additions & 0 deletions packages/vercel-edge/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import {
nodeStackLineParser,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import {
SentryPropagator,
Expand DownExpand Up@@ -57,6 +58,7 @@ export function getDefaultIntegrations(options: Options): Integration[] {
functionToStringIntegration(),
linkedErrorsIntegration(),
winterCGFetchIntegration(),
consoleIntegration(),
...(options.sendDefaultPii ? [requestDataIntegration()] : []),
];
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/browser/src/integrations/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,7 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
return {
name: INTEGRATION_NAME,
setup(client) {
// TODO(v10): Remove this functionality and use `consoleIntegration` from @sentry/core instead.
if (_options.console) {
addConsoleInstrumentationHandler(_getConsoleBreadcrumbHandler(client));
}
Expand Down
1 change: 1 addition & 0 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export {
captureConsoleIntegration,
moduleMetadataIntegration,
zodErrorsIntegration,
consoleIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
linkedErrorsIntegration,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import type { CloudflareClientOptions, CloudflareOptions } from './client';
import { CloudflareClient } from './client';
Expand All@@ -27,6 +28,7 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
linkedErrorsIntegration(),
fetchIntegration(),
requestDataIntegration(sendDefaultPii ? undefined : { include: { cookies: false } }),
consoleIntegration(),
];
}

Expand Down
2 changes: 2 additions & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,8 @@ export { extraErrorDataIntegration } from './integrations/extraerrordata';
export { rewriteFramesIntegration } from './integrations/rewriteframes';
export { zodErrorsIntegration } from './integrations/zoderrors';
export { thirdPartyErrorFilterIntegration } from './integrations/third-party-errors-filter';
export { consoleIntegration } from './integrations/console';

export { profiler } from './profiling';
export { instrumentFetchRequest } from './fetch';
export { trpcMiddleware } from './trpc';
Expand Down
95 changes: 95 additions & 0 deletions packages/core/src/integrations/console.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
import { addBreadcrumb } from '../breadcrumbs';
import { getClient } from '../currentScopes';
import { defineIntegration } from '../integration';
import type { ConsoleLevel } from '../types-hoist';
import {
CONSOLE_LEVELS,
GLOBAL_OBJ,
addConsoleInstrumentationHandler,
safeJoin,
severityLevelFromString,
} from '../utils-hoist';

interface ConsoleIntegrationOptions {
levels: ConsoleLevel[];
}

type GlobalObjectWithUtil = typeof GLOBAL_OBJ & {
util: {
format: (...args: unknown[]) => string;
};
};

const INTEGRATION_NAME = 'Console';

/**
* Captures calls to the `console` API as breadcrumbs in Sentry.
*
* By default the integration instruments `console.debug`, `console.info`, `console.warn`, `console.error`,
* `console.log`, `console.trace`, and `console.assert`. You can use the `levels` option to customize which
* levels are captured.
*
* @example
*
* ```js
* Sentry.init({
* integrations: [Sentry.consoleIntegration({ levels: ['error', 'warn'] })],
* });
* ```
*/
export const consoleIntegration = defineIntegration((options: Partial<ConsoleIntegrationOptions> = {}) => {
const levels = new Set(options.levels || CONSOLE_LEVELS);

return {
name: INTEGRATION_NAME,
setup(client) {
addConsoleInstrumentationHandler(({ args, level }) => {
if (getClient() !== client || !levels.has(level)) {
return;
}

addConsoleBreadcrumb(level, args);
});
},
};
});

/**
* Capture a console breadcrumb.
*
* Exported just for tests.
*/
export function addConsoleBreadcrumb(level: ConsoleLevel, args: unknown[]): void {
const breadcrumb = {
category: 'console',
data: {
arguments: args,
logger: 'console',
},
level: severityLevelFromString(level),
message: formatConsoleArgs(args),
};

if (level === 'assert') {
if (args[0] === false) {
const assertionArgs = args.slice(1);
breadcrumb.message =
assertionArgs.length > 0 ? `Assertion failed: ${formatConsoleArgs(assertionArgs)}` : 'Assertion failed';
breadcrumb.data.arguments = assertionArgs;
} else {
// Don't capture a breadcrumb for passed assertions
return;
}
}

addBreadcrumb(breadcrumb, {
input: args,
level,
});
}

function formatConsoleArgs(values: unknown[]): string {
return 'util' in GLOBAL_OBJ && typeof (GLOBAL_OBJ as GlobalObjectWithUtil).util.format === 'function'
? (GLOBAL_OBJ as GlobalObjectWithUtil).util.format(...values)
: safeJoin(values, ' ');
}
71 changes: 71 additions & 0 deletions packages/core/test/lib/integrations/console.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { addConsoleBreadcrumb } from '../../../src/integrations/console';
import { addBreadcrumb } from '../../../src/breadcrumbs';

vi.mock('../../../src/breadcrumbs', () => ({
addBreadcrumb: vi.fn(),
}));

describe('addConsoleBreadcrumb', () => {
beforeEach(() => {
vi.clearAllMocks();
});

it('creates a breadcrumb with correct properties for basic console log', () => {
const level = 'log';
const args = ['test message', 123];

addConsoleBreadcrumb(level, args);

expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
category: 'console',
data: {
arguments: args,
logger: 'console',
},
level: 'log',
message: 'test message 123',
}),
{
input: args,
level,
},
);
});

it.each(['debug', 'info', 'warn', 'error'] as const)('handles %s level correctly', level => {
addConsoleBreadcrumb(level, ['test']);
expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
level: expect.any(String),
}),
expect.any(Object),
);
});

it('skips breadcrumb for passed assertions', () => {
addConsoleBreadcrumb('assert', [true, 'should not be captured']);
expect(addBreadcrumb).not.toHaveBeenCalled();
});

it('creates breadcrumb for failed assertions', () => {
const args = [false, 'assertion failed', 'details'];

addConsoleBreadcrumb('assert', args);

expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
message: expect.stringContaining('Assertion failed'),
data: {
arguments: args.slice(1),
logger: 'console',
},
}),
{
input: args,
level: 'assert',
},
);
});
});
1 change: 1 addition & 0 deletions packages/deno/src/integrations/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
return {
name: INTEGRATION_NAME,
setup(client) {
// TODO(v10): Remove this functionality and use `consoleIntegration` from @sentry/core instead.
if (_options.console) {
addConsoleInstrumentationHandler(_getConsoleBreadcrumbHandler(client));
}
Expand Down
2 changes: 1 addition & 1 deletion packages/node/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ export { httpIntegration } from './integrations/http';
export { nativeNodeFetchIntegration } from './integrations/node-fetch';
export { fsIntegration } from './integrations/fs';

export { consoleIntegration } from './integrations/console';
export { nodeContextIntegration } from './integrations/context';
export { contextLinesIntegration } from './integrations/contextlines';
export { localVariablesIntegration } from './integrations/local-variables';
Expand DownExpand Up@@ -131,6 +130,7 @@ export {
zodErrorsIntegration,
profiler,
consoleLoggingIntegration,
consoleIntegration,
} from '@sentry/core';

export type {
Expand Down
38 changes: 0 additions & 38 deletions packages/node/src/integrations/console.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/node/src/sdk/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
propagationContextFromHeaders,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import {
enhanceDscWithOpenTelemetryRootSpanName,
Expand All@@ -20,7 +21,6 @@ import {
} from '@sentry/opentelemetry';
import { DEBUG_BUILD } from '../debug-build';
import { childProcessIntegration } from '../integrations/childProcess';
import { consoleIntegration } from '../integrations/console';
import { nodeContextIntegration } from '../integrations/context';
import { contextLinesIntegration } from '../integrations/contextlines';
import { httpIntegration } from '../integrations/http';
Expand Down
39 changes: 0 additions & 39 deletions packages/node/test/integration/console.test.ts

This file was deleted.

1 change: 1 addition & 0 deletions packages/vercel-edge/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export {
captureConsoleIntegration,
moduleMetadataIntegration,
zodErrorsIntegration,
consoleIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
Expand Down
2 changes: 2 additions & 0 deletions packages/vercel-edge/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import {
nodeStackLineParser,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import {
SentryPropagator,
Expand DownExpand Up@@ -57,6 +58,7 @@ export function getDefaultIntegrations(options: Options): Integration[] {
functionToStringIntegration(),
linkedErrorsIntegration(),
winterCGFetchIntegration(),
consoleIntegration(),
...(options.sendDefaultPii ? [requestDataIntegration()] : []),
];
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/browser/src/integrations/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,7 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
return {
name: INTEGRATION_NAME,
setup(client) {
// TODO(v10): Remove this functionality and use `consoleIntegration` from @sentry/core instead.
if (_options.console) {
addConsoleInstrumentationHandler(_getConsoleBreadcrumbHandler(client));
}
Expand Down
1 change: 1 addition & 0 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export {
captureConsoleIntegration,
moduleMetadataIntegration,
zodErrorsIntegration,
consoleIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
linkedErrorsIntegration,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import type { CloudflareClientOptions, CloudflareOptions } from './client';
import { CloudflareClient } from './client';
Expand All@@ -27,6 +28,7 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
linkedErrorsIntegration(),
fetchIntegration(),
requestDataIntegration(sendDefaultPii ? undefined : { include: { cookies: false } }),
consoleIntegration(),
];
}

Expand Down
2 changes: 2 additions & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,8 @@ export { extraErrorDataIntegration } from './integrations/extraerrordata';
export { rewriteFramesIntegration } from './integrations/rewriteframes';
export { zodErrorsIntegration } from './integrations/zoderrors';
export { thirdPartyErrorFilterIntegration } from './integrations/third-party-errors-filter';
export { consoleIntegration } from './integrations/console';

export { profiler } from './profiling';
export { instrumentFetchRequest } from './fetch';
export { trpcMiddleware } from './trpc';
Expand Down
95 changes: 95 additions & 0 deletions packages/core/src/integrations/console.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
import { addBreadcrumb } from '../breadcrumbs';
import { getClient } from '../currentScopes';
import { defineIntegration } from '../integration';
import type { ConsoleLevel } from '../types-hoist';
import {
CONSOLE_LEVELS,
GLOBAL_OBJ,
addConsoleInstrumentationHandler,
safeJoin,
severityLevelFromString,
} from '../utils-hoist';

interface ConsoleIntegrationOptions {
levels: ConsoleLevel[];
}

type GlobalObjectWithUtil = typeof GLOBAL_OBJ & {
util: {
format: (...args: unknown[]) => string;
};
};

const INTEGRATION_NAME = 'Console';

/**
* Captures calls to the `console` API as breadcrumbs in Sentry.
*
* By default the integration instruments `console.debug`, `console.info`, `console.warn`, `console.error`,
* `console.log`, `console.trace`, and `console.assert`. You can use the `levels` option to customize which
* levels are captured.
*
* @example
*
* ```js
* Sentry.init({
* integrations: [Sentry.consoleIntegration({ levels: ['error', 'warn'] })],
* });
* ```
*/
export const consoleIntegration = defineIntegration((options: Partial<ConsoleIntegrationOptions> = {}) => {
const levels = new Set(options.levels || CONSOLE_LEVELS);

return {
name: INTEGRATION_NAME,
setup(client) {
addConsoleInstrumentationHandler(({ args, level }) => {
if (getClient() !== client || !levels.has(level)) {
return;
}

addConsoleBreadcrumb(level, args);
});
},
};
});

/**
* Capture a console breadcrumb.
*
* Exported just for tests.
*/
export function addConsoleBreadcrumb(level: ConsoleLevel, args: unknown[]): void {
const breadcrumb = {
category: 'console',
data: {
arguments: args,
logger: 'console',
},
level: severityLevelFromString(level),
message: formatConsoleArgs(args),
};

if (level === 'assert') {
if (args[0] === false) {
const assertionArgs = args.slice(1);
breadcrumb.message =
assertionArgs.length > 0 ? `Assertion failed: ${formatConsoleArgs(assertionArgs)}` : 'Assertion failed';
breadcrumb.data.arguments = assertionArgs;
} else {
// Don't capture a breadcrumb for passed assertions
return;
}
}

addBreadcrumb(breadcrumb, {
input: args,
level,
});
}

function formatConsoleArgs(values: unknown[]): string {
return 'util' in GLOBAL_OBJ && typeof (GLOBAL_OBJ as GlobalObjectWithUtil).util.format === 'function'
? (GLOBAL_OBJ as GlobalObjectWithUtil).util.format(...values)
: safeJoin(values, ' ');
}
71 changes: 71 additions & 0 deletions packages/core/test/lib/integrations/console.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { addConsoleBreadcrumb } from '../../../src/integrations/console';
import { addBreadcrumb } from '../../../src/breadcrumbs';

vi.mock('../../../src/breadcrumbs', () => ({
addBreadcrumb: vi.fn(),
}));

describe('addConsoleBreadcrumb', () => {
beforeEach(() => {
vi.clearAllMocks();
});

it('creates a breadcrumb with correct properties for basic console log', () => {
const level = 'log';
const args = ['test message', 123];

addConsoleBreadcrumb(level, args);

expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
category: 'console',
data: {
arguments: args,
logger: 'console',
},
level: 'log',
message: 'test message 123',
}),
{
input: args,
level,
},
);
});

it.each(['debug', 'info', 'warn', 'error'] as const)('handles %s level correctly', level => {
addConsoleBreadcrumb(level, ['test']);
expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
level: expect.any(String),
}),
expect.any(Object),
);
});

it('skips breadcrumb for passed assertions', () => {
addConsoleBreadcrumb('assert', [true, 'should not be captured']);
expect(addBreadcrumb).not.toHaveBeenCalled();
});

it('creates breadcrumb for failed assertions', () => {
const args = [false, 'assertion failed', 'details'];

addConsoleBreadcrumb('assert', args);

expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
message: expect.stringContaining('Assertion failed'),
data: {
arguments: args.slice(1),
logger: 'console',
},
}),
{
input: args,
level: 'assert',
},
);
});
});
1 change: 1 addition & 0 deletions packages/deno/src/integrations/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
return {
name: INTEGRATION_NAME,
setup(client) {
// TODO(v10): Remove this functionality and use `consoleIntegration` from @sentry/core instead.
if (_options.console) {
addConsoleInstrumentationHandler(_getConsoleBreadcrumbHandler(client));
}
Expand Down
2 changes: 1 addition & 1 deletion packages/node/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ export { httpIntegration } from './integrations/http';
export { nativeNodeFetchIntegration } from './integrations/node-fetch';
export { fsIntegration } from './integrations/fs';

export { consoleIntegration } from './integrations/console';
export { nodeContextIntegration } from './integrations/context';
export { contextLinesIntegration } from './integrations/contextlines';
export { localVariablesIntegration } from './integrations/local-variables';
Expand DownExpand Up@@ -131,6 +130,7 @@ export {
zodErrorsIntegration,
profiler,
consoleLoggingIntegration,
consoleIntegration,
} from '@sentry/core';

export type {
Expand Down
38 changes: 0 additions & 38 deletions packages/node/src/integrations/console.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/node/src/sdk/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
propagationContextFromHeaders,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import {
enhanceDscWithOpenTelemetryRootSpanName,
Expand All@@ -20,7 +21,6 @@ import {
} from '@sentry/opentelemetry';
import { DEBUG_BUILD } from '../debug-build';
import { childProcessIntegration } from '../integrations/childProcess';
import { consoleIntegration } from '../integrations/console';
import { nodeContextIntegration } from '../integrations/context';
import { contextLinesIntegration } from '../integrations/contextlines';
import { httpIntegration } from '../integrations/http';
Expand Down
39 changes: 0 additions & 39 deletions packages/node/test/integration/console.test.ts

This file was deleted.

1 change: 1 addition & 0 deletions packages/vercel-edge/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export {
captureConsoleIntegration,
moduleMetadataIntegration,
zodErrorsIntegration,
consoleIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
Expand Down
2 changes: 2 additions & 0 deletions packages/vercel-edge/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import {
nodeStackLineParser,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import {
SentryPropagator,
Expand DownExpand Up@@ -57,6 +58,7 @@ export function getDefaultIntegrations(options: Options): Integration[] {
functionToStringIntegration(),
linkedErrorsIntegration(),
winterCGFetchIntegration(),
consoleIntegration(),
...(options.sendDefaultPii ? [requestDataIntegration()] : []),
];
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/browser/src/integrations/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,7 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
return {
name: INTEGRATION_NAME,
setup(client) {
// TODO(v10): Remove this functionality and use `consoleIntegration` from @sentry/core instead.
if (_options.console) {
addConsoleInstrumentationHandler(_getConsoleBreadcrumbHandler(client));
}
Expand Down
1 change: 1 addition & 0 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export {
captureConsoleIntegration,
moduleMetadataIntegration,
zodErrorsIntegration,
consoleIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
linkedErrorsIntegration,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import type { CloudflareClientOptions, CloudflareOptions } from './client';
import { CloudflareClient } from './client';
Expand All@@ -27,6 +28,7 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
linkedErrorsIntegration(),
fetchIntegration(),
requestDataIntegration(sendDefaultPii ? undefined : { include: { cookies: false } }),
consoleIntegration(),
];
}

Expand Down
2 changes: 2 additions & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,8 @@ export { extraErrorDataIntegration } from './integrations/extraerrordata';
export { rewriteFramesIntegration } from './integrations/rewriteframes';
export { zodErrorsIntegration } from './integrations/zoderrors';
export { thirdPartyErrorFilterIntegration } from './integrations/third-party-errors-filter';
export { consoleIntegration } from './integrations/console';

export { profiler } from './profiling';
export { instrumentFetchRequest } from './fetch';
export { trpcMiddleware } from './trpc';
Expand Down
95 changes: 95 additions & 0 deletions packages/core/src/integrations/console.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
import { addBreadcrumb } from '../breadcrumbs';
import { getClient } from '../currentScopes';
import { defineIntegration } from '../integration';
import type { ConsoleLevel } from '../types-hoist';
import {
CONSOLE_LEVELS,
GLOBAL_OBJ,
addConsoleInstrumentationHandler,
safeJoin,
severityLevelFromString,
} from '../utils-hoist';

interface ConsoleIntegrationOptions {
levels: ConsoleLevel[];
}

type GlobalObjectWithUtil = typeof GLOBAL_OBJ & {
util: {
format: (...args: unknown[]) => string;
};
};

const INTEGRATION_NAME = 'Console';

/**
* Captures calls to the `console` API as breadcrumbs in Sentry.
*
* By default the integration instruments `console.debug`, `console.info`, `console.warn`, `console.error`,
* `console.log`, `console.trace`, and `console.assert`. You can use the `levels` option to customize which
* levels are captured.
*
* @example
*
* ```js
* Sentry.init({
* integrations: [Sentry.consoleIntegration({ levels: ['error', 'warn'] })],
* });
* ```
*/
export const consoleIntegration = defineIntegration((options: Partial<ConsoleIntegrationOptions> = {}) => {
const levels = new Set(options.levels || CONSOLE_LEVELS);

return {
name: INTEGRATION_NAME,
setup(client) {
addConsoleInstrumentationHandler(({ args, level }) => {
if (getClient() !== client || !levels.has(level)) {
return;
}

addConsoleBreadcrumb(level, args);
});
},
};
});

/**
* Capture a console breadcrumb.
*
* Exported just for tests.
*/
export function addConsoleBreadcrumb(level: ConsoleLevel, args: unknown[]): void {
const breadcrumb = {
category: 'console',
data: {
arguments: args,
logger: 'console',
},
level: severityLevelFromString(level),
message: formatConsoleArgs(args),
};

if (level === 'assert') {
if (args[0] === false) {
const assertionArgs = args.slice(1);
breadcrumb.message =
assertionArgs.length > 0 ? `Assertion failed: ${formatConsoleArgs(assertionArgs)}` : 'Assertion failed';
breadcrumb.data.arguments = assertionArgs;
} else {
// Don't capture a breadcrumb for passed assertions
return;
}
}

addBreadcrumb(breadcrumb, {
input: args,
level,
});
}

function formatConsoleArgs(values: unknown[]): string {
return 'util' in GLOBAL_OBJ && typeof (GLOBAL_OBJ as GlobalObjectWithUtil).util.format === 'function'
? (GLOBAL_OBJ as GlobalObjectWithUtil).util.format(...values)
: safeJoin(values, ' ');
}
71 changes: 71 additions & 0 deletions packages/core/test/lib/integrations/console.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { addConsoleBreadcrumb } from '../../../src/integrations/console';
import { addBreadcrumb } from '../../../src/breadcrumbs';

vi.mock('../../../src/breadcrumbs', () => ({
addBreadcrumb: vi.fn(),
}));

describe('addConsoleBreadcrumb', () => {
beforeEach(() => {
vi.clearAllMocks();
});

it('creates a breadcrumb with correct properties for basic console log', () => {
const level = 'log';
const args = ['test message', 123];

addConsoleBreadcrumb(level, args);

expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
category: 'console',
data: {
arguments: args,
logger: 'console',
},
level: 'log',
message: 'test message 123',
}),
{
input: args,
level,
},
);
});

it.each(['debug', 'info', 'warn', 'error'] as const)('handles %s level correctly', level => {
addConsoleBreadcrumb(level, ['test']);
expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
level: expect.any(String),
}),
expect.any(Object),
);
});

it('skips breadcrumb for passed assertions', () => {
addConsoleBreadcrumb('assert', [true, 'should not be captured']);
expect(addBreadcrumb).not.toHaveBeenCalled();
});

it('creates breadcrumb for failed assertions', () => {
const args = [false, 'assertion failed', 'details'];

addConsoleBreadcrumb('assert', args);

expect(addBreadcrumb).toHaveBeenCalledWith(
expect.objectContaining({
message: expect.stringContaining('Assertion failed'),
data: {
arguments: args.slice(1),
logger: 'console',
},
}),
{
input: args,
level: 'assert',
},
);
});
});
1 change: 1 addition & 0 deletions packages/deno/src/integrations/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
return {
name: INTEGRATION_NAME,
setup(client) {
// TODO(v10): Remove this functionality and use `consoleIntegration` from @sentry/core instead.
if (_options.console) {
addConsoleInstrumentationHandler(_getConsoleBreadcrumbHandler(client));
}
Expand Down
2 changes: 1 addition & 1 deletion packages/node/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ export { httpIntegration } from './integrations/http';
export { nativeNodeFetchIntegration } from './integrations/node-fetch';
export { fsIntegration } from './integrations/fs';

export { consoleIntegration } from './integrations/console';
export { nodeContextIntegration } from './integrations/context';
export { contextLinesIntegration } from './integrations/contextlines';
export { localVariablesIntegration } from './integrations/local-variables';
Expand DownExpand Up@@ -131,6 +130,7 @@ export {
zodErrorsIntegration,
profiler,
consoleLoggingIntegration,
consoleIntegration,
} from '@sentry/core';

export type {
Expand Down
38 changes: 0 additions & 38 deletions packages/node/src/integrations/console.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/node/src/sdk/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
propagationContextFromHeaders,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import {
enhanceDscWithOpenTelemetryRootSpanName,
Expand All@@ -20,7 +21,6 @@ import {
} from '@sentry/opentelemetry';
import { DEBUG_BUILD } from '../debug-build';
import { childProcessIntegration } from '../integrations/childProcess';
import { consoleIntegration } from '../integrations/console';
import { nodeContextIntegration } from '../integrations/context';
import { contextLinesIntegration } from '../integrations/contextlines';
import { httpIntegration } from '../integrations/http';
Expand Down
39 changes: 0 additions & 39 deletions packages/node/test/integration/console.test.ts

This file was deleted.

1 change: 1 addition & 0 deletions packages/vercel-edge/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export {
captureConsoleIntegration,
moduleMetadataIntegration,
zodErrorsIntegration,
consoleIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
Expand Down
2 changes: 2 additions & 0 deletions packages/vercel-edge/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import {
nodeStackLineParser,
requestDataIntegration,
stackParserFromStackParserOptions,
consoleIntegration,
} from '@sentry/core';
import {
SentryPropagator,
Expand DownExpand Up@@ -57,6 +58,7 @@ export function getDefaultIntegrations(options: Options): Integration[] {
functionToStringIntegration(),
linkedErrorsIntegration(),
winterCGFetchIntegration(),
consoleIntegration(),
...(options.sendDefaultPii ? [requestDataIntegration()] : []),
];
}
Expand Down