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
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'feedbackIntegration'),
gzip: true,
limit: '41 KB',
limit: '42 KB',
},
{
name: '@sentry/browser (incl. sendFeedback)',
Expand Down
5 changes: 5 additions & 0 deletions packages/core/src/baseclient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ import { isParameterizedString, isPlainObject, isPrimitive, isThenable } from '.
import { consoleSandbox, logger } from './utils-hoist/logger';
import { checkOrSetAlreadyCaught, uuid4 } from './utils-hoist/misc';
import { SyncPromise, rejectedSyncPromise, resolvedSyncPromise } from './utils-hoist/syncpromise';
import { getPossibleEventMessages } from './utils/eventUtils';
import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
import { showSpanDropWarning } from './utils/spanUtils';
Expand DownExpand Up@@ -713,6 +714,10 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
* @param scope
*/
protected _captureEvent(event: Event, hint: EventHint = {}, scope?: Scope): PromiseLike<string | undefined> {
if (DEBUG_BUILD && isErrorEvent(event)) {
logger.log(`Captured error event \`${getPossibleEventMessages(event)[0] || '<unknown>'}\``);
}

return this._processEvent(event, hint, scope).then(
finalEvent => {
return finalEvent.event_id;
Expand Down
30 changes: 2 additions & 28 deletions packages/core/src/integrations/inboundfilters.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import { defineIntegration } from '../integration';
import { logger } from '../utils-hoist/logger';
import { getEventDescription } from '../utils-hoist/misc';
import { stringMatchesSomePattern } from '../utils-hoist/string';
import { getPossibleEventMessages } from '../utils/eventUtils';

// "Script error." is hard coded into browsers for errors that it can't read.
// this is the result of a script being pulled in from an external domain and CORS.
Expand DownExpand Up@@ -117,7 +118,7 @@ function _isIgnoredError(event: Event, ignoreErrors?: Array<string | RegExp>): b
return false;
}

return _getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
return getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
}

function _isIgnoredTransaction(event: Event, ignoreTransactions?: Array<string | RegExp>): boolean {
Expand DownExpand Up@@ -147,33 +148,6 @@ function _isAllowedUrl(event: Event, allowUrls?: Array<string | RegExp>): boolea
return !url ? true : stringMatchesSomePattern(url, allowUrls);
}

function _getPossibleEventMessages(event: Event): string[] {
const possibleMessages: string[] = [];

if (event.message) {
possibleMessages.push(event.message);
}

let lastException;
try {
// @ts-expect-error Try catching to save bundle size
lastException = event.exception.values[event.exception.values.length - 1];
} catch (e) {
// try catching to save bundle size checking existence of variables
}

if (lastException) {
if (lastException.value) {
possibleMessages.push(lastException.value);
if (lastException.type) {
possibleMessages.push(`${lastException.type}: ${lastException.value}`);
}
}
}

return possibleMessages;
}

function _isSentryError(event: Event): boolean {
try {
// @ts-expect-error can't be a sentry error if undefined
Expand Down
27 changes: 27 additions & 0 deletions packages/core/src/utils/eventUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import type { Event } from '../types-hoist';

/**
* Get a list of possible event messages from a Sentry event.
*/
export function getPossibleEventMessages(event: Event): string[] {
const possibleMessages: string[] = [];

if (event.message) {
possibleMessages.push(event.message);
}

try {
// @ts-expect-error Try catching to save bundle size
const lastException = event.exception.values[event.exception.values.length - 1];
if (lastException && lastException.value) {
possibleMessages.push(lastException.value);
if (lastException.type) {
possibleMessages.push(`${lastException.type}: ${lastException.value}`);
}
}
} catch (e) {
// ignore errors here
}

return possibleMessages;
}
46 changes: 46 additions & 0 deletions packages/core/test/lib/baseclient.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -366,6 +366,22 @@ describe('BaseClient', () => {
// `captureException` should bail right away this second time around and not get as far as calling this again
expect(clientEventFromException).toHaveBeenCalledTimes(1);
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureException(new Error('test error here'));
client.captureException({});

expect(logSpy).toHaveBeenCalledTimes(2);
expect(logSpy).toBeCalledWith('Captured error event `test error here`');
expect(logSpy).toBeCalledWith('Captured error event `<unknown>`');

logSpy.mockRestore();
});
});

describe('captureMessage', () => {
Expand DownExpand Up@@ -442,6 +458,20 @@ describe('BaseClient', () => {
}),
);
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureMessage('test error here');

expect(logSpy).toHaveBeenCalledTimes(1);
expect(logSpy).toBeCalledWith('Captured error event `test error here`');

logSpy.mockRestore();
});
});

describe('captureEvent() / prepareEvent()', () => {
Expand DownExpand Up@@ -1658,6 +1688,22 @@ describe('BaseClient', () => {
message: 'hello',
});
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureEvent({ message: 'hello' });
// transactions are ignored and not logged
client.captureEvent({ type: 'transaction', message: 'hello 2' });

expect(logSpy).toHaveBeenCalledTimes(1);
expect(logSpy).toBeCalledWith('Captured error event `hello`');

logSpy.mockRestore();
});
});

describe('integrations', () => {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e 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
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'feedbackIntegration'),
gzip: true,
limit: '41 KB',
limit: '42 KB',
},
{
name: '@sentry/browser (incl. sendFeedback)',
Expand Down
5 changes: 5 additions & 0 deletions packages/core/src/baseclient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ import { isParameterizedString, isPlainObject, isPrimitive, isThenable } from '.
import { consoleSandbox, logger } from './utils-hoist/logger';
import { checkOrSetAlreadyCaught, uuid4 } from './utils-hoist/misc';
import { SyncPromise, rejectedSyncPromise, resolvedSyncPromise } from './utils-hoist/syncpromise';
import { getPossibleEventMessages } from './utils/eventUtils';
import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
import { showSpanDropWarning } from './utils/spanUtils';
Expand DownExpand Up@@ -713,6 +714,10 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
* @param scope
*/
protected _captureEvent(event: Event, hint: EventHint = {}, scope?: Scope): PromiseLike<string | undefined> {
if (DEBUG_BUILD && isErrorEvent(event)) {
logger.log(`Captured error event \`${getPossibleEventMessages(event)[0] || '<unknown>'}\``);
}

return this._processEvent(event, hint, scope).then(
finalEvent => {
return finalEvent.event_id;
Expand Down
30 changes: 2 additions & 28 deletions packages/core/src/integrations/inboundfilters.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import { defineIntegration } from '../integration';
import { logger } from '../utils-hoist/logger';
import { getEventDescription } from '../utils-hoist/misc';
import { stringMatchesSomePattern } from '../utils-hoist/string';
import { getPossibleEventMessages } from '../utils/eventUtils';

// "Script error." is hard coded into browsers for errors that it can't read.
// this is the result of a script being pulled in from an external domain and CORS.
Expand DownExpand Up@@ -117,7 +118,7 @@ function _isIgnoredError(event: Event, ignoreErrors?: Array<string | RegExp>): b
return false;
}

return _getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
return getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
}

function _isIgnoredTransaction(event: Event, ignoreTransactions?: Array<string | RegExp>): boolean {
Expand DownExpand Up@@ -147,33 +148,6 @@ function _isAllowedUrl(event: Event, allowUrls?: Array<string | RegExp>): boolea
return !url ? true : stringMatchesSomePattern(url, allowUrls);
}

function _getPossibleEventMessages(event: Event): string[] {
const possibleMessages: string[] = [];

if (event.message) {
possibleMessages.push(event.message);
}

let lastException;
try {
// @ts-expect-error Try catching to save bundle size
lastException = event.exception.values[event.exception.values.length - 1];
} catch (e) {
// try catching to save bundle size checking existence of variables
}

if (lastException) {
if (lastException.value) {
possibleMessages.push(lastException.value);
if (lastException.type) {
possibleMessages.push(`${lastException.type}: ${lastException.value}`);
}
}
}

return possibleMessages;
}

function _isSentryError(event: Event): boolean {
try {
// @ts-expect-error can't be a sentry error if undefined
Expand Down
27 changes: 27 additions & 0 deletions packages/core/src/utils/eventUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import type { Event } from '../types-hoist';

/**
* Get a list of possible event messages from a Sentry event.
*/
export function getPossibleEventMessages(event: Event): string[] {
const possibleMessages: string[] = [];

if (event.message) {
possibleMessages.push(event.message);
}

try {
// @ts-expect-error Try catching to save bundle size
const lastException = event.exception.values[event.exception.values.length - 1];
if (lastException && lastException.value) {
possibleMessages.push(lastException.value);
if (lastException.type) {
possibleMessages.push(`${lastException.type}: ${lastException.value}`);
}
}
} catch (e) {
// ignore errors here
}

return possibleMessages;
}
46 changes: 46 additions & 0 deletions packages/core/test/lib/baseclient.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -366,6 +366,22 @@ describe('BaseClient', () => {
// `captureException` should bail right away this second time around and not get as far as calling this again
expect(clientEventFromException).toHaveBeenCalledTimes(1);
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureException(new Error('test error here'));
client.captureException({});

expect(logSpy).toHaveBeenCalledTimes(2);
expect(logSpy).toBeCalledWith('Captured error event `test error here`');
expect(logSpy).toBeCalledWith('Captured error event `<unknown>`');

logSpy.mockRestore();
});
});

describe('captureMessage', () => {
Expand DownExpand Up@@ -442,6 +458,20 @@ describe('BaseClient', () => {
}),
);
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureMessage('test error here');

expect(logSpy).toHaveBeenCalledTimes(1);
expect(logSpy).toBeCalledWith('Captured error event `test error here`');

logSpy.mockRestore();
});
});

describe('captureEvent() / prepareEvent()', () => {
Expand DownExpand Up@@ -1658,6 +1688,22 @@ describe('BaseClient', () => {
message: 'hello',
});
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureEvent({ message: 'hello' });
// transactions are ignored and not logged
client.captureEvent({ type: 'transaction', message: 'hello 2' });

expect(logSpy).toHaveBeenCalledTimes(1);
expect(logSpy).toBeCalledWith('Captured error event `hello`');

logSpy.mockRestore();
});
});

describe('integrations', () => {
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
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'feedbackIntegration'),
gzip: true,
limit: '41 KB',
limit: '42 KB',
},
{
name: '@sentry/browser (incl. sendFeedback)',
Expand Down
5 changes: 5 additions & 0 deletions packages/core/src/baseclient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ import { isParameterizedString, isPlainObject, isPrimitive, isThenable } from '.
import { consoleSandbox, logger } from './utils-hoist/logger';
import { checkOrSetAlreadyCaught, uuid4 } from './utils-hoist/misc';
import { SyncPromise, rejectedSyncPromise, resolvedSyncPromise } from './utils-hoist/syncpromise';
import { getPossibleEventMessages } from './utils/eventUtils';
import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
import { showSpanDropWarning } from './utils/spanUtils';
Expand DownExpand Up@@ -713,6 +714,10 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
* @param scope
*/
protected _captureEvent(event: Event, hint: EventHint = {}, scope?: Scope): PromiseLike<string | undefined> {
if (DEBUG_BUILD && isErrorEvent(event)) {
logger.log(`Captured error event \`${getPossibleEventMessages(event)[0] || '<unknown>'}\``);
}

return this._processEvent(event, hint, scope).then(
finalEvent => {
return finalEvent.event_id;
Expand Down
30 changes: 2 additions & 28 deletions packages/core/src/integrations/inboundfilters.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import { defineIntegration } from '../integration';
import { logger } from '../utils-hoist/logger';
import { getEventDescription } from '../utils-hoist/misc';
import { stringMatchesSomePattern } from '../utils-hoist/string';
import { getPossibleEventMessages } from '../utils/eventUtils';

// "Script error." is hard coded into browsers for errors that it can't read.
// this is the result of a script being pulled in from an external domain and CORS.
Expand DownExpand Up@@ -117,7 +118,7 @@ function _isIgnoredError(event: Event, ignoreErrors?: Array<string | RegExp>): b
return false;
}

return _getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
return getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
}

function _isIgnoredTransaction(event: Event, ignoreTransactions?: Array<string | RegExp>): boolean {
Expand DownExpand Up@@ -147,33 +148,6 @@ function _isAllowedUrl(event: Event, allowUrls?: Array<string | RegExp>): boolea
return !url ? true : stringMatchesSomePattern(url, allowUrls);
}

function _getPossibleEventMessages(event: Event): string[] {
const possibleMessages: string[] = [];

if (event.message) {
possibleMessages.push(event.message);
}

let lastException;
try {
// @ts-expect-error Try catching to save bundle size
lastException = event.exception.values[event.exception.values.length - 1];
} catch (e) {
// try catching to save bundle size checking existence of variables
}

if (lastException) {
if (lastException.value) {
possibleMessages.push(lastException.value);
if (lastException.type) {
possibleMessages.push(`${lastException.type}: ${lastException.value}`);
}
}
}

return possibleMessages;
}

function _isSentryError(event: Event): boolean {
try {
// @ts-expect-error can't be a sentry error if undefined
Expand Down
27 changes: 27 additions & 0 deletions packages/core/src/utils/eventUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import type { Event } from '../types-hoist';

/**
* Get a list of possible event messages from a Sentry event.
*/
export function getPossibleEventMessages(event: Event): string[] {
const possibleMessages: string[] = [];

if (event.message) {
possibleMessages.push(event.message);
}

try {
// @ts-expect-error Try catching to save bundle size
const lastException = event.exception.values[event.exception.values.length - 1];
if (lastException && lastException.value) {
possibleMessages.push(lastException.value);
if (lastException.type) {
possibleMessages.push(`${lastException.type}: ${lastException.value}`);
}
}
} catch (e) {
// ignore errors here
}

return possibleMessages;
}
46 changes: 46 additions & 0 deletions packages/core/test/lib/baseclient.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -366,6 +366,22 @@ describe('BaseClient', () => {
// `captureException` should bail right away this second time around and not get as far as calling this again
expect(clientEventFromException).toHaveBeenCalledTimes(1);
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureException(new Error('test error here'));
client.captureException({});

expect(logSpy).toHaveBeenCalledTimes(2);
expect(logSpy).toBeCalledWith('Captured error event `test error here`');
expect(logSpy).toBeCalledWith('Captured error event `<unknown>`');

logSpy.mockRestore();
});
});

describe('captureMessage', () => {
Expand DownExpand Up@@ -442,6 +458,20 @@ describe('BaseClient', () => {
}),
);
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureMessage('test error here');

expect(logSpy).toHaveBeenCalledTimes(1);
expect(logSpy).toBeCalledWith('Captured error event `test error here`');

logSpy.mockRestore();
});
});

describe('captureEvent() / prepareEvent()', () => {
Expand DownExpand Up@@ -1658,6 +1688,22 @@ describe('BaseClient', () => {
message: 'hello',
});
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureEvent({ message: 'hello' });
// transactions are ignored and not logged
client.captureEvent({ type: 'transaction', message: 'hello 2' });

expect(logSpy).toHaveBeenCalledTimes(1);
expect(logSpy).toBeCalledWith('Captured error event `hello`');

logSpy.mockRestore();
});
});

describe('integrations', () => {
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 \u003e 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
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'feedbackIntegration'),
gzip: true,
limit: '41 KB',
limit: '42 KB',
},
{
name: '@sentry/browser (incl. sendFeedback)',
Expand Down
5 changes: 5 additions & 0 deletions packages/core/src/baseclient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ import { isParameterizedString, isPlainObject, isPrimitive, isThenable } from '.
import { consoleSandbox, logger } from './utils-hoist/logger';
import { checkOrSetAlreadyCaught, uuid4 } from './utils-hoist/misc';
import { SyncPromise, rejectedSyncPromise, resolvedSyncPromise } from './utils-hoist/syncpromise';
import { getPossibleEventMessages } from './utils/eventUtils';
import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
import { showSpanDropWarning } from './utils/spanUtils';
Expand DownExpand Up@@ -713,6 +714,10 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
* @param scope
*/
protected _captureEvent(event: Event, hint: EventHint = {}, scope?: Scope): PromiseLike<string | undefined> {
if (DEBUG_BUILD && isErrorEvent(event)) {
logger.log(`Captured error event \`${getPossibleEventMessages(event)[0] || '<unknown>'}\``);
}

return this._processEvent(event, hint, scope).then(
finalEvent => {
return finalEvent.event_id;
Expand Down
30 changes: 2 additions & 28 deletions packages/core/src/integrations/inboundfilters.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import { defineIntegration } from '../integration';
import { logger } from '../utils-hoist/logger';
import { getEventDescription } from '../utils-hoist/misc';
import { stringMatchesSomePattern } from '../utils-hoist/string';
import { getPossibleEventMessages } from '../utils/eventUtils';

// "Script error." is hard coded into browsers for errors that it can't read.
// this is the result of a script being pulled in from an external domain and CORS.
Expand DownExpand Up@@ -117,7 +118,7 @@ function _isIgnoredError(event: Event, ignoreErrors?: Array<string | RegExp>): b
return false;
}

return _getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
return getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
}

function _isIgnoredTransaction(event: Event, ignoreTransactions?: Array<string | RegExp>): boolean {
Expand DownExpand Up@@ -147,33 +148,6 @@ function _isAllowedUrl(event: Event, allowUrls?: Array<string | RegExp>): boolea
return !url ? true : stringMatchesSomePattern(url, allowUrls);
}

function _getPossibleEventMessages(event: Event): string[] {
const possibleMessages: string[] = [];

if (event.message) {
possibleMessages.push(event.message);
}

let lastException;
try {
// @ts-expect-error Try catching to save bundle size
lastException = event.exception.values[event.exception.values.length - 1];
} catch (e) {
// try catching to save bundle size checking existence of variables
}

if (lastException) {
if (lastException.value) {
possibleMessages.push(lastException.value);
if (lastException.type) {
possibleMessages.push(`${lastException.type}: ${lastException.value}`);
}
}
}

return possibleMessages;
}

function _isSentryError(event: Event): boolean {
try {
// @ts-expect-error can't be a sentry error if undefined
Expand Down
27 changes: 27 additions & 0 deletions packages/core/src/utils/eventUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import type { Event } from '../types-hoist';

/**
* Get a list of possible event messages from a Sentry event.
*/
export function getPossibleEventMessages(event: Event): string[] {
const possibleMessages: string[] = [];

if (event.message) {
possibleMessages.push(event.message);
}

try {
// @ts-expect-error Try catching to save bundle size
const lastException = event.exception.values[event.exception.values.length - 1];
if (lastException && lastException.value) {
possibleMessages.push(lastException.value);
if (lastException.type) {
possibleMessages.push(`${lastException.type}: ${lastException.value}`);
}
}
} catch (e) {
// ignore errors here
}

return possibleMessages;
}
46 changes: 46 additions & 0 deletions packages/core/test/lib/baseclient.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -366,6 +366,22 @@ describe('BaseClient', () => {
// `captureException` should bail right away this second time around and not get as far as calling this again
expect(clientEventFromException).toHaveBeenCalledTimes(1);
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureException(new Error('test error here'));
client.captureException({});

expect(logSpy).toHaveBeenCalledTimes(2);
expect(logSpy).toBeCalledWith('Captured error event `test error here`');
expect(logSpy).toBeCalledWith('Captured error event `<unknown>`');

logSpy.mockRestore();
});
});

describe('captureMessage', () => {
Expand DownExpand Up@@ -442,6 +458,20 @@ describe('BaseClient', () => {
}),
);
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureMessage('test error here');

expect(logSpy).toHaveBeenCalledTimes(1);
expect(logSpy).toBeCalledWith('Captured error event `test error here`');

logSpy.mockRestore();
});
});

describe('captureEvent() / prepareEvent()', () => {
Expand DownExpand Up@@ -1658,6 +1688,22 @@ describe('BaseClient', () => {
message: 'hello',
});
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureEvent({ message: 'hello' });
// transactions are ignored and not logged
client.captureEvent({ type: 'transaction', message: 'hello 2' });

expect(logSpy).toHaveBeenCalledTimes(1);
expect(logSpy).toBeCalledWith('Captured error event `hello`');

logSpy.mockRestore();
});
});

describe('integrations', () => {
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
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'feedbackIntegration'),
gzip: true,
limit: '41 KB',
limit: '42 KB',
},
{
name: '@sentry/browser (incl. sendFeedback)',
Expand Down
5 changes: 5 additions & 0 deletions packages/core/src/baseclient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ import { isParameterizedString, isPlainObject, isPrimitive, isThenable } from '.
import { consoleSandbox, logger } from './utils-hoist/logger';
import { checkOrSetAlreadyCaught, uuid4 } from './utils-hoist/misc';
import { SyncPromise, rejectedSyncPromise, resolvedSyncPromise } from './utils-hoist/syncpromise';
import { getPossibleEventMessages } from './utils/eventUtils';
import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
import { showSpanDropWarning } from './utils/spanUtils';
Expand DownExpand Up@@ -713,6 +714,10 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
* @param scope
*/
protected _captureEvent(event: Event, hint: EventHint = {}, scope?: Scope): PromiseLike<string | undefined> {
if (DEBUG_BUILD && isErrorEvent(event)) {
logger.log(`Captured error event \`${getPossibleEventMessages(event)[0] || '<unknown>'}\``);
}

return this._processEvent(event, hint, scope).then(
finalEvent => {
return finalEvent.event_id;
Expand Down
30 changes: 2 additions & 28 deletions packages/core/src/integrations/inboundfilters.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import { defineIntegration } from '../integration';
import { logger } from '../utils-hoist/logger';
import { getEventDescription } from '../utils-hoist/misc';
import { stringMatchesSomePattern } from '../utils-hoist/string';
import { getPossibleEventMessages } from '../utils/eventUtils';

// "Script error." is hard coded into browsers for errors that it can't read.
// this is the result of a script being pulled in from an external domain and CORS.
Expand DownExpand Up@@ -117,7 +118,7 @@ function _isIgnoredError(event: Event, ignoreErrors?: Array<string | RegExp>): b
return false;
}

return _getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
return getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
}

function _isIgnoredTransaction(event: Event, ignoreTransactions?: Array<string | RegExp>): boolean {
Expand DownExpand Up@@ -147,33 +148,6 @@ function _isAllowedUrl(event: Event, allowUrls?: Array<string | RegExp>): boolea
return !url ? true : stringMatchesSomePattern(url, allowUrls);
}

function _getPossibleEventMessages(event: Event): string[] {
const possibleMessages: string[] = [];

if (event.message) {
possibleMessages.push(event.message);
}

let lastException;
try {
// @ts-expect-error Try catching to save bundle size
lastException = event.exception.values[event.exception.values.length - 1];
} catch (e) {
// try catching to save bundle size checking existence of variables
}

if (lastException) {
if (lastException.value) {
possibleMessages.push(lastException.value);
if (lastException.type) {
possibleMessages.push(`${lastException.type}: ${lastException.value}`);
}
}
}

return possibleMessages;
}

function _isSentryError(event: Event): boolean {
try {
// @ts-expect-error can't be a sentry error if undefined
Expand Down
27 changes: 27 additions & 0 deletions packages/core/src/utils/eventUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import type { Event } from '../types-hoist';

/**
* Get a list of possible event messages from a Sentry event.
*/
export function getPossibleEventMessages(event: Event): string[] {
const possibleMessages: string[] = [];

if (event.message) {
possibleMessages.push(event.message);
}

try {
// @ts-expect-error Try catching to save bundle size
const lastException = event.exception.values[event.exception.values.length - 1];
if (lastException && lastException.value) {
possibleMessages.push(lastException.value);
if (lastException.type) {
possibleMessages.push(`${lastException.type}: ${lastException.value}`);
}
}
} catch (e) {
// ignore errors here
}

return possibleMessages;
}
46 changes: 46 additions & 0 deletions packages/core/test/lib/baseclient.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -366,6 +366,22 @@ describe('BaseClient', () => {
// `captureException` should bail right away this second time around and not get as far as calling this again
expect(clientEventFromException).toHaveBeenCalledTimes(1);
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureException(new Error('test error here'));
client.captureException({});

expect(logSpy).toHaveBeenCalledTimes(2);
expect(logSpy).toBeCalledWith('Captured error event `test error here`');
expect(logSpy).toBeCalledWith('Captured error event `<unknown>`');

logSpy.mockRestore();
});
});

describe('captureMessage', () => {
Expand DownExpand Up@@ -442,6 +458,20 @@ describe('BaseClient', () => {
}),
);
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureMessage('test error here');

expect(logSpy).toHaveBeenCalledTimes(1);
expect(logSpy).toBeCalledWith('Captured error event `test error here`');

logSpy.mockRestore();
});
});

describe('captureEvent() / prepareEvent()', () => {
Expand DownExpand Up@@ -1658,6 +1688,22 @@ describe('BaseClient', () => {
message: 'hello',
});
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureEvent({ message: 'hello' });
// transactions are ignored and not logged
client.captureEvent({ type: 'transaction', message: 'hello 2' });

expect(logSpy).toHaveBeenCalledTimes(1);
expect(logSpy).toBeCalledWith('Captured error event `hello`');

logSpy.mockRestore();
});
});

describe('integrations', () => {
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
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'feedbackIntegration'),
gzip: true,
limit: '41 KB',
limit: '42 KB',
},
{
name: '@sentry/browser (incl. sendFeedback)',
Expand Down
5 changes: 5 additions & 0 deletions packages/core/src/baseclient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ import { isParameterizedString, isPlainObject, isPrimitive, isThenable } from '.
import { consoleSandbox, logger } from './utils-hoist/logger';
import { checkOrSetAlreadyCaught, uuid4 } from './utils-hoist/misc';
import { SyncPromise, rejectedSyncPromise, resolvedSyncPromise } from './utils-hoist/syncpromise';
import { getPossibleEventMessages } from './utils/eventUtils';
import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
import { showSpanDropWarning } from './utils/spanUtils';
Expand DownExpand Up@@ -713,6 +714,10 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
* @param scope
*/
protected _captureEvent(event: Event, hint: EventHint = {}, scope?: Scope): PromiseLike<string | undefined> {
if (DEBUG_BUILD && isErrorEvent(event)) {
logger.log(`Captured error event \`${getPossibleEventMessages(event)[0] || '<unknown>'}\``);
}

return this._processEvent(event, hint, scope).then(
finalEvent => {
return finalEvent.event_id;
Expand Down
30 changes: 2 additions & 28 deletions packages/core/src/integrations/inboundfilters.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import { defineIntegration } from '../integration';
import { logger } from '../utils-hoist/logger';
import { getEventDescription } from '../utils-hoist/misc';
import { stringMatchesSomePattern } from '../utils-hoist/string';
import { getPossibleEventMessages } from '../utils/eventUtils';

// "Script error." is hard coded into browsers for errors that it can't read.
// this is the result of a script being pulled in from an external domain and CORS.
Expand DownExpand Up@@ -117,7 +118,7 @@ function _isIgnoredError(event: Event, ignoreErrors?: Array<string | RegExp>): b
return false;
}

return _getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
return getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
}

function _isIgnoredTransaction(event: Event, ignoreTransactions?: Array<string | RegExp>): boolean {
Expand DownExpand Up@@ -147,33 +148,6 @@ function _isAllowedUrl(event: Event, allowUrls?: Array<string | RegExp>): boolea
return !url ? true : stringMatchesSomePattern(url, allowUrls);
}

function _getPossibleEventMessages(event: Event): string[] {
const possibleMessages: string[] = [];

if (event.message) {
possibleMessages.push(event.message);
}

let lastException;
try {
// @ts-expect-error Try catching to save bundle size
lastException = event.exception.values[event.exception.values.length - 1];
} catch (e) {
// try catching to save bundle size checking existence of variables
}

if (lastException) {
if (lastException.value) {
possibleMessages.push(lastException.value);
if (lastException.type) {
possibleMessages.push(`${lastException.type}: ${lastException.value}`);
}
}
}

return possibleMessages;
}

function _isSentryError(event: Event): boolean {
try {
// @ts-expect-error can't be a sentry error if undefined
Expand Down
27 changes: 27 additions & 0 deletions packages/core/src/utils/eventUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import type { Event } from '../types-hoist';

/**
* Get a list of possible event messages from a Sentry event.
*/
export function getPossibleEventMessages(event: Event): string[] {
const possibleMessages: string[] = [];

if (event.message) {
possibleMessages.push(event.message);
}

try {
// @ts-expect-error Try catching to save bundle size
const lastException = event.exception.values[event.exception.values.length - 1];
if (lastException && lastException.value) {
possibleMessages.push(lastException.value);
if (lastException.type) {
possibleMessages.push(`${lastException.type}: ${lastException.value}`);
}
}
} catch (e) {
// ignore errors here
}

return possibleMessages;
}
46 changes: 46 additions & 0 deletions packages/core/test/lib/baseclient.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -366,6 +366,22 @@ describe('BaseClient', () => {
// `captureException` should bail right away this second time around and not get as far as calling this again
expect(clientEventFromException).toHaveBeenCalledTimes(1);
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureException(new Error('test error here'));
client.captureException({});

expect(logSpy).toHaveBeenCalledTimes(2);
expect(logSpy).toBeCalledWith('Captured error event `test error here`');
expect(logSpy).toBeCalledWith('Captured error event `<unknown>`');

logSpy.mockRestore();
});
});

describe('captureMessage', () => {
Expand DownExpand Up@@ -442,6 +458,20 @@ describe('BaseClient', () => {
}),
);
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureMessage('test error here');

expect(logSpy).toHaveBeenCalledTimes(1);
expect(logSpy).toBeCalledWith('Captured error event `test error here`');

logSpy.mockRestore();
});
});

describe('captureEvent() / prepareEvent()', () => {
Expand DownExpand Up@@ -1658,6 +1688,22 @@ describe('BaseClient', () => {
message: 'hello',
});
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureEvent({ message: 'hello' });
// transactions are ignored and not logged
client.captureEvent({ type: 'transaction', message: 'hello 2' });

expect(logSpy).toHaveBeenCalledTimes(1);
expect(logSpy).toBeCalledWith('Captured error event `hello`');

logSpy.mockRestore();
});
});

describe('integrations', () => {
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
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'feedbackIntegration'),
gzip: true,
limit: '41 KB',
limit: '42 KB',
},
{
name: '@sentry/browser (incl. sendFeedback)',
Expand Down
5 changes: 5 additions & 0 deletions packages/core/src/baseclient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ import { isParameterizedString, isPlainObject, isPrimitive, isThenable } from '.
import { consoleSandbox, logger } from './utils-hoist/logger';
import { checkOrSetAlreadyCaught, uuid4 } from './utils-hoist/misc';
import { SyncPromise, rejectedSyncPromise, resolvedSyncPromise } from './utils-hoist/syncpromise';
import { getPossibleEventMessages } from './utils/eventUtils';
import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
import { showSpanDropWarning } from './utils/spanUtils';
Expand DownExpand Up@@ -713,6 +714,10 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
* @param scope
*/
protected _captureEvent(event: Event, hint: EventHint = {}, scope?: Scope): PromiseLike<string | undefined> {
if (DEBUG_BUILD && isErrorEvent(event)) {
logger.log(`Captured error event \`${getPossibleEventMessages(event)[0] || '<unknown>'}\``);
}

return this._processEvent(event, hint, scope).then(
finalEvent => {
return finalEvent.event_id;
Expand Down
30 changes: 2 additions & 28 deletions packages/core/src/integrations/inboundfilters.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import { defineIntegration } from '../integration';
import { logger } from '../utils-hoist/logger';
import { getEventDescription } from '../utils-hoist/misc';
import { stringMatchesSomePattern } from '../utils-hoist/string';
import { getPossibleEventMessages } from '../utils/eventUtils';

// "Script error." is hard coded into browsers for errors that it can't read.
// this is the result of a script being pulled in from an external domain and CORS.
Expand DownExpand Up@@ -117,7 +118,7 @@ function _isIgnoredError(event: Event, ignoreErrors?: Array<string | RegExp>): b
return false;
}

return _getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
return getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
}

function _isIgnoredTransaction(event: Event, ignoreTransactions?: Array<string | RegExp>): boolean {
Expand DownExpand Up@@ -147,33 +148,6 @@ function _isAllowedUrl(event: Event, allowUrls?: Array<string | RegExp>): boolea
return !url ? true : stringMatchesSomePattern(url, allowUrls);
}

function _getPossibleEventMessages(event: Event): string[] {
const possibleMessages: string[] = [];

if (event.message) {
possibleMessages.push(event.message);
}

let lastException;
try {
// @ts-expect-error Try catching to save bundle size
lastException = event.exception.values[event.exception.values.length - 1];
} catch (e) {
// try catching to save bundle size checking existence of variables
}

if (lastException) {
if (lastException.value) {
possibleMessages.push(lastException.value);
if (lastException.type) {
possibleMessages.push(`${lastException.type}: ${lastException.value}`);
}
}
}

return possibleMessages;
}

function _isSentryError(event: Event): boolean {
try {
// @ts-expect-error can't be a sentry error if undefined
Expand Down
27 changes: 27 additions & 0 deletions packages/core/src/utils/eventUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import type { Event } from '../types-hoist';

/**
* Get a list of possible event messages from a Sentry event.
*/
export function getPossibleEventMessages(event: Event): string[] {
const possibleMessages: string[] = [];

if (event.message) {
possibleMessages.push(event.message);
}

try {
// @ts-expect-error Try catching to save bundle size
const lastException = event.exception.values[event.exception.values.length - 1];
if (lastException && lastException.value) {
possibleMessages.push(lastException.value);
if (lastException.type) {
possibleMessages.push(`${lastException.type}: ${lastException.value}`);
}
}
} catch (e) {
// ignore errors here
}

return possibleMessages;
}
46 changes: 46 additions & 0 deletions packages/core/test/lib/baseclient.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -366,6 +366,22 @@ describe('BaseClient', () => {
// `captureException` should bail right away this second time around and not get as far as calling this again
expect(clientEventFromException).toHaveBeenCalledTimes(1);
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureException(new Error('test error here'));
client.captureException({});

expect(logSpy).toHaveBeenCalledTimes(2);
expect(logSpy).toBeCalledWith('Captured error event `test error here`');
expect(logSpy).toBeCalledWith('Captured error event `<unknown>`');

logSpy.mockRestore();
});
});

describe('captureMessage', () => {
Expand DownExpand Up@@ -442,6 +458,20 @@ describe('BaseClient', () => {
}),
);
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureMessage('test error here');

expect(logSpy).toHaveBeenCalledTimes(1);
expect(logSpy).toBeCalledWith('Captured error event `test error here`');

logSpy.mockRestore();
});
});

describe('captureEvent() / prepareEvent()', () => {
Expand DownExpand Up@@ -1658,6 +1688,22 @@ describe('BaseClient', () => {
message: 'hello',
});
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureEvent({ message: 'hello' });
// transactions are ignored and not logged
client.captureEvent({ type: 'transaction', message: 'hello 2' });

expect(logSpy).toHaveBeenCalledTimes(1);
expect(logSpy).toBeCalledWith('Captured error event `hello`');

logSpy.mockRestore();
});
});

describe('integrations', () => {
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
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'feedbackIntegration'),
gzip: true,
limit: '41 KB',
limit: '42 KB',
},
{
name: '@sentry/browser (incl. sendFeedback)',
Expand Down
5 changes: 5 additions & 0 deletions packages/core/src/baseclient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ import { isParameterizedString, isPlainObject, isPrimitive, isThenable } from '.
import { consoleSandbox, logger } from './utils-hoist/logger';
import { checkOrSetAlreadyCaught, uuid4 } from './utils-hoist/misc';
import { SyncPromise, rejectedSyncPromise, resolvedSyncPromise } from './utils-hoist/syncpromise';
import { getPossibleEventMessages } from './utils/eventUtils';
import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
import { showSpanDropWarning } from './utils/spanUtils';
Expand DownExpand Up@@ -713,6 +714,10 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
* @param scope
*/
protected _captureEvent(event: Event, hint: EventHint = {}, scope?: Scope): PromiseLike<string | undefined> {
if (DEBUG_BUILD && isErrorEvent(event)) {
logger.log(`Captured error event \`${getPossibleEventMessages(event)[0] || '<unknown>'}\``);
}

return this._processEvent(event, hint, scope).then(
finalEvent => {
return finalEvent.event_id;
Expand Down
30 changes: 2 additions & 28 deletions packages/core/src/integrations/inboundfilters.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import { defineIntegration } from '../integration';
import { logger } from '../utils-hoist/logger';
import { getEventDescription } from '../utils-hoist/misc';
import { stringMatchesSomePattern } from '../utils-hoist/string';
import { getPossibleEventMessages } from '../utils/eventUtils';

// "Script error." is hard coded into browsers for errors that it can't read.
// this is the result of a script being pulled in from an external domain and CORS.
Expand DownExpand Up@@ -117,7 +118,7 @@ function _isIgnoredError(event: Event, ignoreErrors?: Array<string | RegExp>): b
return false;
}

return _getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
return getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
}

function _isIgnoredTransaction(event: Event, ignoreTransactions?: Array<string | RegExp>): boolean {
Expand DownExpand Up@@ -147,33 +148,6 @@ function _isAllowedUrl(event: Event, allowUrls?: Array<string | RegExp>): boolea
return !url ? true : stringMatchesSomePattern(url, allowUrls);
}

function _getPossibleEventMessages(event: Event): string[] {
const possibleMessages: string[] = [];

if (event.message) {
possibleMessages.push(event.message);
}

let lastException;
try {
// @ts-expect-error Try catching to save bundle size
lastException = event.exception.values[event.exception.values.length - 1];
} catch (e) {
// try catching to save bundle size checking existence of variables
}

if (lastException) {
if (lastException.value) {
possibleMessages.push(lastException.value);
if (lastException.type) {
possibleMessages.push(`${lastException.type}: ${lastException.value}`);
}
}
}

return possibleMessages;
}

function _isSentryError(event: Event): boolean {
try {
// @ts-expect-error can't be a sentry error if undefined
Expand Down
27 changes: 27 additions & 0 deletions packages/core/src/utils/eventUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import type { Event } from '../types-hoist';

/**
* Get a list of possible event messages from a Sentry event.
*/
export function getPossibleEventMessages(event: Event): string[] {
const possibleMessages: string[] = [];

if (event.message) {
possibleMessages.push(event.message);
}

try {
// @ts-expect-error Try catching to save bundle size
const lastException = event.exception.values[event.exception.values.length - 1];
if (lastException && lastException.value) {
possibleMessages.push(lastException.value);
if (lastException.type) {
possibleMessages.push(`${lastException.type}: ${lastException.value}`);
}
}
} catch (e) {
// ignore errors here
}

return possibleMessages;
}
46 changes: 46 additions & 0 deletions packages/core/test/lib/baseclient.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -366,6 +366,22 @@ describe('BaseClient', () => {
// `captureException` should bail right away this second time around and not get as far as calling this again
expect(clientEventFromException).toHaveBeenCalledTimes(1);
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureException(new Error('test error here'));
client.captureException({});

expect(logSpy).toHaveBeenCalledTimes(2);
expect(logSpy).toBeCalledWith('Captured error event `test error here`');
expect(logSpy).toBeCalledWith('Captured error event `<unknown>`');

logSpy.mockRestore();
});
});

describe('captureMessage', () => {
Expand DownExpand Up@@ -442,6 +458,20 @@ describe('BaseClient', () => {
}),
);
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureMessage('test error here');

expect(logSpy).toHaveBeenCalledTimes(1);
expect(logSpy).toBeCalledWith('Captured error event `test error here`');

logSpy.mockRestore();
});
});

describe('captureEvent() / prepareEvent()', () => {
Expand DownExpand Up@@ -1658,6 +1688,22 @@ describe('BaseClient', () => {
message: 'hello',
});
});

test('captures logger message', () => {
const logSpy = jest.spyOn(loggerModule.logger, 'log').mockImplementation(() => undefined);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
const client = new TestClient(options);

client.captureEvent({ message: 'hello' });
// transactions are ignored and not logged
client.captureEvent({ type: 'transaction', message: 'hello 2' });

expect(logSpy).toHaveBeenCalledTimes(1);
expect(logSpy).toBeCalledWith('Captured error event `hello`');

logSpy.mockRestore();
});
});

describe('integrations', () => {
Expand Down