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
4 changes: 0 additions & 4 deletions packages/browser/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import {
addAutoIpAddressToUser,
applySdkMetadata,
getSDKSource,
_INTERNAL_flushLogsBuffer,
} from '@sentry/core';
import { eventFromException, eventFromMessage } from './eventbuilder';
import { WINDOW } from './helpers';
Expand DownExpand Up@@ -86,9 +85,6 @@ export class BrowserClient extends Client<BrowserClientOptions> {
WINDOW.document.addEventListener('visibilitychange', () => {
if (WINDOW.document.visibilityState === 'hidden') {
this._flushOutcomes();
if (this._options._experiments?.enableLogs) {
_INTERNAL_flushLogsBuffer(this);
}
}
});
}
Expand Down
4 changes: 4 additions & 0 deletions packages/browser/src/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
export * from './exports';

import * as logger from './log';

export { logger };

export { reportingObserverIntegration } from './integrations/reportingobserver';
export { httpClientIntegration } from './integrations/httpclient';
export { contextLinesIntegration } from './integrations/contextlines';
Expand Down
186 changes: 186 additions & 0 deletions packages/browser/src/log.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
import type { LogSeverityLevel, Log, Client } from '@sentry/core';
import { getClient, _INTERNAL_captureLog, _INTERNAL_flushLogsBuffer } from '@sentry/core';

import { WINDOW } from './helpers';

/**
* TODO: Make this configurable
*/
const DEFAULT_FLUSH_INTERVAL = 5000;

let timeout: ReturnType<typeof setTimeout> | undefined;

/**
* This is a global timeout that is used to flush the logs buffer.
* It is used to ensure that logs are flushed even if the client is not flushed.
*/
function startFlushTimeout(client: Client): void {
if (timeout) {
clearTimeout(timeout);
}

timeout = setTimeout(() => {
_INTERNAL_flushLogsBuffer(client);
}, DEFAULT_FLUSH_INTERVAL);
}

let isClientListenerAdded = false;
/**
* This is a function that is used to add a flush listener to the client.
* It is used to ensure that the logger buffer is flushed when the client is flushed.
*/
function addFlushingListeners(client: Client): void {
if (isClientListenerAdded || !client.getOptions()._experiments?.enableLogs) {
return;
}

isClientListenerAdded = true;

if (WINDOW.document) {
WINDOW.document.addEventListener('visibilitychange', () => {
if (WINDOW.document.visibilityState === 'hidden') {
_INTERNAL_flushLogsBuffer(client);
}
});
}

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});
}
Comment on lines +39 to +50

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we not also just flush in the client callback?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which client callback are you referring too?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});


/**
* Capture a log with the given level.
*
* @param level - The level of the log.
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
* @param severityNumber - The severity number of the log.
*/
function captureLog(
level: LogSeverityLevel,
message: string,
attributes?: Log['attributes'],
severityNumber?: Log['severityNumber'],
): void {
const client = getClient();
if (client) {
addFlushingListeners(client);

startFlushTimeout(client);
}

_INTERNAL_captureLog({ level, message, attributes, severityNumber }, client, undefined);
}

/**
* @summary Capture a log with the `trace` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.trace('Hello world', { userId: 100 });
* ```
*/
export function trace(message: string, attributes?: Log['attributes']): void {
captureLog('trace', message, attributes);
}

/**
* @summary Capture a log with the `debug` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.debug('Hello world', { userId: 100 });
* ```
*/
export function debug(message: string, attributes?: Log['attributes']): void {
captureLog('debug', message, attributes);
}

/**
* @summary Capture a log with the `info` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.info('Hello world', { userId: 100 });
* ```
*/
export function info(message: string, attributes?: Log['attributes']): void {
captureLog('info', message, attributes);
}

/**
* @summary Capture a log with the `warn` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.warn('Hello world', { userId: 100 });
* ```
*/
export function warn(message: string, attributes?: Log['attributes']): void {
captureLog('warn', message, attributes);
}

/**
* @summary Capture a log with the `error` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.error('Hello world', { userId: 100 });
* ```
*/
export function error(message: string, attributes?: Log['attributes']): void {
captureLog('error', message, attributes);
}

/**
* @summary Capture a log with the `fatal` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.fatal('Hello world', { userId: 100 });
* ```
*/
export function fatal(message: string, attributes?: Log['attributes']): void {
captureLog('fatal', message, attributes);
}

/**
* @summary Capture a log with the `critical` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.critical('Hello world', { userId: 100 });
* ```
*/
export function critical(message: string, attributes?: Log['attributes']): void {
captureLog('critical', message, attributes);
}
43 changes: 29 additions & 14 deletions packages/browser/test/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ import {
getCurrentScope,
init,
showReportDialog,
logger,
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';
Expand DownExpand Up@@ -243,20 +244,21 @@ describe('SentryBrowser', () => {
expect(event.exception.values[0]?.stacktrace.frames).not.toHaveLength(0);
});

it('should capture a message', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: (event: Event): Event | null => {
expect(event.level).toBe('info');
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
});
it('should capture an message', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.level).toBe('info');
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
}));

it('should capture an event', () =>
new Promise<void>(resolve => {
Expand DownExpand Up@@ -322,6 +324,19 @@ describe('SentryBrowser', () => {
expect(localBeforeSend).not.toHaveBeenCalled();
});
});

describe('logger', () => {
it('exports all log methods', () => {
expect(logger).toBeDefined();
expect(logger.trace).toBeDefined();
expect(logger.debug).toBeDefined();
expect(logger.info).toBeDefined();
expect(logger.warn).toBeDefined();
expect(logger.error).toBeDefined();
expect(logger.fatal).toBeDefined();
expect(logger.critical).toBeDefined();
});
});
});

describe('SentryBrowser initialization', () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat(browser): Add logger.X methods to browser SDK by AbhiPrasad · Pull Request #15763 · getsentry/sentry-javascript · GitHub
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
4 changes: 0 additions & 4 deletions packages/browser/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import {
addAutoIpAddressToUser,
applySdkMetadata,
getSDKSource,
_INTERNAL_flushLogsBuffer,
} from '@sentry/core';
import { eventFromException, eventFromMessage } from './eventbuilder';
import { WINDOW } from './helpers';
Expand DownExpand Up@@ -86,9 +85,6 @@ export class BrowserClient extends Client<BrowserClientOptions> {
WINDOW.document.addEventListener('visibilitychange', () => {
if (WINDOW.document.visibilityState === 'hidden') {
this._flushOutcomes();
if (this._options._experiments?.enableLogs) {
_INTERNAL_flushLogsBuffer(this);
}
}
});
}
Expand Down
4 changes: 4 additions & 0 deletions packages/browser/src/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
export * from './exports';

import * as logger from './log';

export { logger };

export { reportingObserverIntegration } from './integrations/reportingobserver';
export { httpClientIntegration } from './integrations/httpclient';
export { contextLinesIntegration } from './integrations/contextlines';
Expand Down
186 changes: 186 additions & 0 deletions packages/browser/src/log.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
import type { LogSeverityLevel, Log, Client } from '@sentry/core';
import { getClient, _INTERNAL_captureLog, _INTERNAL_flushLogsBuffer } from '@sentry/core';

import { WINDOW } from './helpers';

/**
* TODO: Make this configurable
*/
const DEFAULT_FLUSH_INTERVAL = 5000;

let timeout: ReturnType<typeof setTimeout> | undefined;

/**
* This is a global timeout that is used to flush the logs buffer.
* It is used to ensure that logs are flushed even if the client is not flushed.
*/
function startFlushTimeout(client: Client): void {
if (timeout) {
clearTimeout(timeout);
}

timeout = setTimeout(() => {
_INTERNAL_flushLogsBuffer(client);
}, DEFAULT_FLUSH_INTERVAL);
}

let isClientListenerAdded = false;
/**
* This is a function that is used to add a flush listener to the client.
* It is used to ensure that the logger buffer is flushed when the client is flushed.
*/
function addFlushingListeners(client: Client): void {
if (isClientListenerAdded || !client.getOptions()._experiments?.enableLogs) {
return;
}

isClientListenerAdded = true;

if (WINDOW.document) {
WINDOW.document.addEventListener('visibilitychange', () => {
if (WINDOW.document.visibilityState === 'hidden') {
_INTERNAL_flushLogsBuffer(client);
}
});
}

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});
}
Comment on lines +39 to +50

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we not also just flush in the client callback?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which client callback are you referring too?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});


/**
* Capture a log with the given level.
*
* @param level - The level of the log.
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
* @param severityNumber - The severity number of the log.
*/
function captureLog(
level: LogSeverityLevel,
message: string,
attributes?: Log['attributes'],
severityNumber?: Log['severityNumber'],
): void {
const client = getClient();
if (client) {
addFlushingListeners(client);

startFlushTimeout(client);
}

_INTERNAL_captureLog({ level, message, attributes, severityNumber }, client, undefined);
}

/**
* @summary Capture a log with the `trace` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.trace('Hello world', { userId: 100 });
* ```
*/
export function trace(message: string, attributes?: Log['attributes']): void {
captureLog('trace', message, attributes);
}

/**
* @summary Capture a log with the `debug` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.debug('Hello world', { userId: 100 });
* ```
*/
export function debug(message: string, attributes?: Log['attributes']): void {
captureLog('debug', message, attributes);
}

/**
* @summary Capture a log with the `info` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.info('Hello world', { userId: 100 });
* ```
*/
export function info(message: string, attributes?: Log['attributes']): void {
captureLog('info', message, attributes);
}

/**
* @summary Capture a log with the `warn` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.warn('Hello world', { userId: 100 });
* ```
*/
export function warn(message: string, attributes?: Log['attributes']): void {
captureLog('warn', message, attributes);
}

/**
* @summary Capture a log with the `error` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.error('Hello world', { userId: 100 });
* ```
*/
export function error(message: string, attributes?: Log['attributes']): void {
captureLog('error', message, attributes);
}

/**
* @summary Capture a log with the `fatal` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.fatal('Hello world', { userId: 100 });
* ```
*/
export function fatal(message: string, attributes?: Log['attributes']): void {
captureLog('fatal', message, attributes);
}

/**
* @summary Capture a log with the `critical` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.critical('Hello world', { userId: 100 });
* ```
*/
export function critical(message: string, attributes?: Log['attributes']): void {
captureLog('critical', message, attributes);
}
43 changes: 29 additions & 14 deletions packages/browser/test/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ import {
getCurrentScope,
init,
showReportDialog,
logger,
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';
Expand DownExpand Up@@ -243,20 +244,21 @@ describe('SentryBrowser', () => {
expect(event.exception.values[0]?.stacktrace.frames).not.toHaveLength(0);
});

it('should capture a message', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: (event: Event): Event | null => {
expect(event.level).toBe('info');
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
});
it('should capture an message', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.level).toBe('info');
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
}));

it('should capture an event', () =>
new Promise<void>(resolve => {
Expand DownExpand Up@@ -322,6 +324,19 @@ describe('SentryBrowser', () => {
expect(localBeforeSend).not.toHaveBeenCalled();
});
});

describe('logger', () => {
it('exports all log methods', () => {
expect(logger).toBeDefined();
expect(logger.trace).toBeDefined();
expect(logger.debug).toBeDefined();
expect(logger.info).toBeDefined();
expect(logger.warn).toBeDefined();
expect(logger.error).toBeDefined();
expect(logger.fatal).toBeDefined();
expect(logger.critical).toBeDefined();
});
});
});

describe('SentryBrowser initialization', () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(browser): Add logger.X methods to browser SDK by AbhiPrasad · Pull Request #15763 · getsentry/sentry-javascript · GitHub
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
4 changes: 0 additions & 4 deletions packages/browser/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import {
addAutoIpAddressToUser,
applySdkMetadata,
getSDKSource,
_INTERNAL_flushLogsBuffer,
} from '@sentry/core';
import { eventFromException, eventFromMessage } from './eventbuilder';
import { WINDOW } from './helpers';
Expand DownExpand Up@@ -86,9 +85,6 @@ export class BrowserClient extends Client<BrowserClientOptions> {
WINDOW.document.addEventListener('visibilitychange', () => {
if (WINDOW.document.visibilityState === 'hidden') {
this._flushOutcomes();
if (this._options._experiments?.enableLogs) {
_INTERNAL_flushLogsBuffer(this);
}
}
});
}
Expand Down
4 changes: 4 additions & 0 deletions packages/browser/src/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
export * from './exports';

import * as logger from './log';

export { logger };

export { reportingObserverIntegration } from './integrations/reportingobserver';
export { httpClientIntegration } from './integrations/httpclient';
export { contextLinesIntegration } from './integrations/contextlines';
Expand Down
186 changes: 186 additions & 0 deletions packages/browser/src/log.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
import type { LogSeverityLevel, Log, Client } from '@sentry/core';
import { getClient, _INTERNAL_captureLog, _INTERNAL_flushLogsBuffer } from '@sentry/core';

import { WINDOW } from './helpers';

/**
* TODO: Make this configurable
*/
const DEFAULT_FLUSH_INTERVAL = 5000;

let timeout: ReturnType<typeof setTimeout> | undefined;

/**
* This is a global timeout that is used to flush the logs buffer.
* It is used to ensure that logs are flushed even if the client is not flushed.
*/
function startFlushTimeout(client: Client): void {
if (timeout) {
clearTimeout(timeout);
}

timeout = setTimeout(() => {
_INTERNAL_flushLogsBuffer(client);
}, DEFAULT_FLUSH_INTERVAL);
}

let isClientListenerAdded = false;
/**
* This is a function that is used to add a flush listener to the client.
* It is used to ensure that the logger buffer is flushed when the client is flushed.
*/
function addFlushingListeners(client: Client): void {
if (isClientListenerAdded || !client.getOptions()._experiments?.enableLogs) {
return;
}

isClientListenerAdded = true;

if (WINDOW.document) {
WINDOW.document.addEventListener('visibilitychange', () => {
if (WINDOW.document.visibilityState === 'hidden') {
_INTERNAL_flushLogsBuffer(client);
}
});
}

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});
}
Comment on lines +39 to +50

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we not also just flush in the client callback?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which client callback are you referring too?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});


/**
* Capture a log with the given level.
*
* @param level - The level of the log.
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
* @param severityNumber - The severity number of the log.
*/
function captureLog(
level: LogSeverityLevel,
message: string,
attributes?: Log['attributes'],
severityNumber?: Log['severityNumber'],
): void {
const client = getClient();
if (client) {
addFlushingListeners(client);

startFlushTimeout(client);
}

_INTERNAL_captureLog({ level, message, attributes, severityNumber }, client, undefined);
}

/**
* @summary Capture a log with the `trace` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.trace('Hello world', { userId: 100 });
* ```
*/
export function trace(message: string, attributes?: Log['attributes']): void {
captureLog('trace', message, attributes);
}

/**
* @summary Capture a log with the `debug` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.debug('Hello world', { userId: 100 });
* ```
*/
export function debug(message: string, attributes?: Log['attributes']): void {
captureLog('debug', message, attributes);
}

/**
* @summary Capture a log with the `info` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.info('Hello world', { userId: 100 });
* ```
*/
export function info(message: string, attributes?: Log['attributes']): void {
captureLog('info', message, attributes);
}

/**
* @summary Capture a log with the `warn` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.warn('Hello world', { userId: 100 });
* ```
*/
export function warn(message: string, attributes?: Log['attributes']): void {
captureLog('warn', message, attributes);
}

/**
* @summary Capture a log with the `error` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.error('Hello world', { userId: 100 });
* ```
*/
export function error(message: string, attributes?: Log['attributes']): void {
captureLog('error', message, attributes);
}

/**
* @summary Capture a log with the `fatal` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.fatal('Hello world', { userId: 100 });
* ```
*/
export function fatal(message: string, attributes?: Log['attributes']): void {
captureLog('fatal', message, attributes);
}

/**
* @summary Capture a log with the `critical` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.critical('Hello world', { userId: 100 });
* ```
*/
export function critical(message: string, attributes?: Log['attributes']): void {
captureLog('critical', message, attributes);
}
43 changes: 29 additions & 14 deletions packages/browser/test/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ import {
getCurrentScope,
init,
showReportDialog,
logger,
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';
Expand DownExpand Up@@ -243,20 +244,21 @@ describe('SentryBrowser', () => {
expect(event.exception.values[0]?.stacktrace.frames).not.toHaveLength(0);
});

it('should capture a message', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: (event: Event): Event | null => {
expect(event.level).toBe('info');
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
});
it('should capture an message', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.level).toBe('info');
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
}));

it('should capture an event', () =>
new Promise<void>(resolve => {
Expand DownExpand Up@@ -322,6 +324,19 @@ describe('SentryBrowser', () => {
expect(localBeforeSend).not.toHaveBeenCalled();
});
});

describe('logger', () => {
it('exports all log methods', () => {
expect(logger).toBeDefined();
expect(logger.trace).toBeDefined();
expect(logger.debug).toBeDefined();
expect(logger.info).toBeDefined();
expect(logger.warn).toBeDefined();
expect(logger.error).toBeDefined();
expect(logger.fatal).toBeDefined();
expect(logger.critical).toBeDefined();
});
});
});

describe('SentryBrowser initialization', () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(browser): Add logger.X methods to browser SDK by AbhiPrasad · Pull Request #15763 · getsentry/sentry-javascript · GitHub
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
4 changes: 0 additions & 4 deletions packages/browser/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import {
addAutoIpAddressToUser,
applySdkMetadata,
getSDKSource,
_INTERNAL_flushLogsBuffer,
} from '@sentry/core';
import { eventFromException, eventFromMessage } from './eventbuilder';
import { WINDOW } from './helpers';
Expand DownExpand Up@@ -86,9 +85,6 @@ export class BrowserClient extends Client<BrowserClientOptions> {
WINDOW.document.addEventListener('visibilitychange', () => {
if (WINDOW.document.visibilityState === 'hidden') {
this._flushOutcomes();
if (this._options._experiments?.enableLogs) {
_INTERNAL_flushLogsBuffer(this);
}
}
});
}
Expand Down
4 changes: 4 additions & 0 deletions packages/browser/src/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
export * from './exports';

import * as logger from './log';

export { logger };

export { reportingObserverIntegration } from './integrations/reportingobserver';
export { httpClientIntegration } from './integrations/httpclient';
export { contextLinesIntegration } from './integrations/contextlines';
Expand Down
186 changes: 186 additions & 0 deletions packages/browser/src/log.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
import type { LogSeverityLevel, Log, Client } from '@sentry/core';
import { getClient, _INTERNAL_captureLog, _INTERNAL_flushLogsBuffer } from '@sentry/core';

import { WINDOW } from './helpers';

/**
* TODO: Make this configurable
*/
const DEFAULT_FLUSH_INTERVAL = 5000;

let timeout: ReturnType<typeof setTimeout> | undefined;

/**
* This is a global timeout that is used to flush the logs buffer.
* It is used to ensure that logs are flushed even if the client is not flushed.
*/
function startFlushTimeout(client: Client): void {
if (timeout) {
clearTimeout(timeout);
}

timeout = setTimeout(() => {
_INTERNAL_flushLogsBuffer(client);
}, DEFAULT_FLUSH_INTERVAL);
}

let isClientListenerAdded = false;
/**
* This is a function that is used to add a flush listener to the client.
* It is used to ensure that the logger buffer is flushed when the client is flushed.
*/
function addFlushingListeners(client: Client): void {
if (isClientListenerAdded || !client.getOptions()._experiments?.enableLogs) {
return;
}

isClientListenerAdded = true;

if (WINDOW.document) {
WINDOW.document.addEventListener('visibilitychange', () => {
if (WINDOW.document.visibilityState === 'hidden') {
_INTERNAL_flushLogsBuffer(client);
}
});
}

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});
}
Comment on lines +39 to +50

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we not also just flush in the client callback?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which client callback are you referring too?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});


/**
* Capture a log with the given level.
*
* @param level - The level of the log.
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
* @param severityNumber - The severity number of the log.
*/
function captureLog(
level: LogSeverityLevel,
message: string,
attributes?: Log['attributes'],
severityNumber?: Log['severityNumber'],
): void {
const client = getClient();
if (client) {
addFlushingListeners(client);

startFlushTimeout(client);
}

_INTERNAL_captureLog({ level, message, attributes, severityNumber }, client, undefined);
}

/**
* @summary Capture a log with the `trace` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.trace('Hello world', { userId: 100 });
* ```
*/
export function trace(message: string, attributes?: Log['attributes']): void {
captureLog('trace', message, attributes);
}

/**
* @summary Capture a log with the `debug` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.debug('Hello world', { userId: 100 });
* ```
*/
export function debug(message: string, attributes?: Log['attributes']): void {
captureLog('debug', message, attributes);
}

/**
* @summary Capture a log with the `info` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.info('Hello world', { userId: 100 });
* ```
*/
export function info(message: string, attributes?: Log['attributes']): void {
captureLog('info', message, attributes);
}

/**
* @summary Capture a log with the `warn` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.warn('Hello world', { userId: 100 });
* ```
*/
export function warn(message: string, attributes?: Log['attributes']): void {
captureLog('warn', message, attributes);
}

/**
* @summary Capture a log with the `error` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.error('Hello world', { userId: 100 });
* ```
*/
export function error(message: string, attributes?: Log['attributes']): void {
captureLog('error', message, attributes);
}

/**
* @summary Capture a log with the `fatal` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.fatal('Hello world', { userId: 100 });
* ```
*/
export function fatal(message: string, attributes?: Log['attributes']): void {
captureLog('fatal', message, attributes);
}

/**
* @summary Capture a log with the `critical` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.critical('Hello world', { userId: 100 });
* ```
*/
export function critical(message: string, attributes?: Log['attributes']): void {
captureLog('critical', message, attributes);
}
43 changes: 29 additions & 14 deletions packages/browser/test/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ import {
getCurrentScope,
init,
showReportDialog,
logger,
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';
Expand DownExpand Up@@ -243,20 +244,21 @@ describe('SentryBrowser', () => {
expect(event.exception.values[0]?.stacktrace.frames).not.toHaveLength(0);
});

it('should capture a message', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: (event: Event): Event | null => {
expect(event.level).toBe('info');
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
});
it('should capture an message', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.level).toBe('info');
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
}));

it('should capture an event', () =>
new Promise<void>(resolve => {
Expand DownExpand Up@@ -322,6 +324,19 @@ describe('SentryBrowser', () => {
expect(localBeforeSend).not.toHaveBeenCalled();
});
});

describe('logger', () => {
it('exports all log methods', () => {
expect(logger).toBeDefined();
expect(logger.trace).toBeDefined();
expect(logger.debug).toBeDefined();
expect(logger.info).toBeDefined();
expect(logger.warn).toBeDefined();
expect(logger.error).toBeDefined();
expect(logger.fatal).toBeDefined();
expect(logger.critical).toBeDefined();
});
});
});

describe('SentryBrowser initialization', () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat(browser): Add logger.X methods to browser SDK by AbhiPrasad · Pull Request #15763 · getsentry/sentry-javascript · GitHub
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
4 changes: 0 additions & 4 deletions packages/browser/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import {
addAutoIpAddressToUser,
applySdkMetadata,
getSDKSource,
_INTERNAL_flushLogsBuffer,
} from '@sentry/core';
import { eventFromException, eventFromMessage } from './eventbuilder';
import { WINDOW } from './helpers';
Expand DownExpand Up@@ -86,9 +85,6 @@ export class BrowserClient extends Client<BrowserClientOptions> {
WINDOW.document.addEventListener('visibilitychange', () => {
if (WINDOW.document.visibilityState === 'hidden') {
this._flushOutcomes();
if (this._options._experiments?.enableLogs) {
_INTERNAL_flushLogsBuffer(this);
}
}
});
}
Expand Down
4 changes: 4 additions & 0 deletions packages/browser/src/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
export * from './exports';

import * as logger from './log';

export { logger };

export { reportingObserverIntegration } from './integrations/reportingobserver';
export { httpClientIntegration } from './integrations/httpclient';
export { contextLinesIntegration } from './integrations/contextlines';
Expand Down
186 changes: 186 additions & 0 deletions packages/browser/src/log.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
import type { LogSeverityLevel, Log, Client } from '@sentry/core';
import { getClient, _INTERNAL_captureLog, _INTERNAL_flushLogsBuffer } from '@sentry/core';

import { WINDOW } from './helpers';

/**
* TODO: Make this configurable
*/
const DEFAULT_FLUSH_INTERVAL = 5000;

let timeout: ReturnType<typeof setTimeout> | undefined;

/**
* This is a global timeout that is used to flush the logs buffer.
* It is used to ensure that logs are flushed even if the client is not flushed.
*/
function startFlushTimeout(client: Client): void {
if (timeout) {
clearTimeout(timeout);
}

timeout = setTimeout(() => {
_INTERNAL_flushLogsBuffer(client);
}, DEFAULT_FLUSH_INTERVAL);
}

let isClientListenerAdded = false;
/**
* This is a function that is used to add a flush listener to the client.
* It is used to ensure that the logger buffer is flushed when the client is flushed.
*/
function addFlushingListeners(client: Client): void {
if (isClientListenerAdded || !client.getOptions()._experiments?.enableLogs) {
return;
}

isClientListenerAdded = true;

if (WINDOW.document) {
WINDOW.document.addEventListener('visibilitychange', () => {
if (WINDOW.document.visibilityState === 'hidden') {
_INTERNAL_flushLogsBuffer(client);
}
});
}

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});
}
Comment on lines +39 to +50

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we not also just flush in the client callback?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which client callback are you referring too?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});


/**
* Capture a log with the given level.
*
* @param level - The level of the log.
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
* @param severityNumber - The severity number of the log.
*/
function captureLog(
level: LogSeverityLevel,
message: string,
attributes?: Log['attributes'],
severityNumber?: Log['severityNumber'],
): void {
const client = getClient();
if (client) {
addFlushingListeners(client);

startFlushTimeout(client);
}

_INTERNAL_captureLog({ level, message, attributes, severityNumber }, client, undefined);
}

/**
* @summary Capture a log with the `trace` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.trace('Hello world', { userId: 100 });
* ```
*/
export function trace(message: string, attributes?: Log['attributes']): void {
captureLog('trace', message, attributes);
}

/**
* @summary Capture a log with the `debug` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.debug('Hello world', { userId: 100 });
* ```
*/
export function debug(message: string, attributes?: Log['attributes']): void {
captureLog('debug', message, attributes);
}

/**
* @summary Capture a log with the `info` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.info('Hello world', { userId: 100 });
* ```
*/
export function info(message: string, attributes?: Log['attributes']): void {
captureLog('info', message, attributes);
}

/**
* @summary Capture a log with the `warn` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.warn('Hello world', { userId: 100 });
* ```
*/
export function warn(message: string, attributes?: Log['attributes']): void {
captureLog('warn', message, attributes);
}

/**
* @summary Capture a log with the `error` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.error('Hello world', { userId: 100 });
* ```
*/
export function error(message: string, attributes?: Log['attributes']): void {
captureLog('error', message, attributes);
}

/**
* @summary Capture a log with the `fatal` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.fatal('Hello world', { userId: 100 });
* ```
*/
export function fatal(message: string, attributes?: Log['attributes']): void {
captureLog('fatal', message, attributes);
}

/**
* @summary Capture a log with the `critical` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.critical('Hello world', { userId: 100 });
* ```
*/
export function critical(message: string, attributes?: Log['attributes']): void {
captureLog('critical', message, attributes);
}
43 changes: 29 additions & 14 deletions packages/browser/test/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ import {
getCurrentScope,
init,
showReportDialog,
logger,
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';
Expand DownExpand Up@@ -243,20 +244,21 @@ describe('SentryBrowser', () => {
expect(event.exception.values[0]?.stacktrace.frames).not.toHaveLength(0);
});

it('should capture a message', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: (event: Event): Event | null => {
expect(event.level).toBe('info');
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
});
it('should capture an message', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.level).toBe('info');
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
}));

it('should capture an event', () =>
new Promise<void>(resolve => {
Expand DownExpand Up@@ -322,6 +324,19 @@ describe('SentryBrowser', () => {
expect(localBeforeSend).not.toHaveBeenCalled();
});
});

describe('logger', () => {
it('exports all log methods', () => {
expect(logger).toBeDefined();
expect(logger.trace).toBeDefined();
expect(logger.debug).toBeDefined();
expect(logger.info).toBeDefined();
expect(logger.warn).toBeDefined();
expect(logger.error).toBeDefined();
expect(logger.fatal).toBeDefined();
expect(logger.critical).toBeDefined();
});
});
});

describe('SentryBrowser initialization', () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(browser): Add logger.X methods to browser SDK by AbhiPrasad · Pull Request #15763 · getsentry/sentry-javascript · GitHub
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
4 changes: 0 additions & 4 deletions packages/browser/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import {
addAutoIpAddressToUser,
applySdkMetadata,
getSDKSource,
_INTERNAL_flushLogsBuffer,
} from '@sentry/core';
import { eventFromException, eventFromMessage } from './eventbuilder';
import { WINDOW } from './helpers';
Expand DownExpand Up@@ -86,9 +85,6 @@ export class BrowserClient extends Client<BrowserClientOptions> {
WINDOW.document.addEventListener('visibilitychange', () => {
if (WINDOW.document.visibilityState === 'hidden') {
this._flushOutcomes();
if (this._options._experiments?.enableLogs) {
_INTERNAL_flushLogsBuffer(this);
}
}
});
}
Expand Down
4 changes: 4 additions & 0 deletions packages/browser/src/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
export * from './exports';

import * as logger from './log';

export { logger };

export { reportingObserverIntegration } from './integrations/reportingobserver';
export { httpClientIntegration } from './integrations/httpclient';
export { contextLinesIntegration } from './integrations/contextlines';
Expand Down
186 changes: 186 additions & 0 deletions packages/browser/src/log.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
import type { LogSeverityLevel, Log, Client } from '@sentry/core';
import { getClient, _INTERNAL_captureLog, _INTERNAL_flushLogsBuffer } from '@sentry/core';

import { WINDOW } from './helpers';

/**
* TODO: Make this configurable
*/
const DEFAULT_FLUSH_INTERVAL = 5000;

let timeout: ReturnType<typeof setTimeout> | undefined;

/**
* This is a global timeout that is used to flush the logs buffer.
* It is used to ensure that logs are flushed even if the client is not flushed.
*/
function startFlushTimeout(client: Client): void {
if (timeout) {
clearTimeout(timeout);
}

timeout = setTimeout(() => {
_INTERNAL_flushLogsBuffer(client);
}, DEFAULT_FLUSH_INTERVAL);
}

let isClientListenerAdded = false;
/**
* This is a function that is used to add a flush listener to the client.
* It is used to ensure that the logger buffer is flushed when the client is flushed.
*/
function addFlushingListeners(client: Client): void {
if (isClientListenerAdded || !client.getOptions()._experiments?.enableLogs) {
return;
}

isClientListenerAdded = true;

if (WINDOW.document) {
WINDOW.document.addEventListener('visibilitychange', () => {
if (WINDOW.document.visibilityState === 'hidden') {
_INTERNAL_flushLogsBuffer(client);
}
});
}

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});
}
Comment on lines +39 to +50

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we not also just flush in the client callback?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which client callback are you referring too?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});


/**
* Capture a log with the given level.
*
* @param level - The level of the log.
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
* @param severityNumber - The severity number of the log.
*/
function captureLog(
level: LogSeverityLevel,
message: string,
attributes?: Log['attributes'],
severityNumber?: Log['severityNumber'],
): void {
const client = getClient();
if (client) {
addFlushingListeners(client);

startFlushTimeout(client);
}

_INTERNAL_captureLog({ level, message, attributes, severityNumber }, client, undefined);
}

/**
* @summary Capture a log with the `trace` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.trace('Hello world', { userId: 100 });
* ```
*/
export function trace(message: string, attributes?: Log['attributes']): void {
captureLog('trace', message, attributes);
}

/**
* @summary Capture a log with the `debug` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.debug('Hello world', { userId: 100 });
* ```
*/
export function debug(message: string, attributes?: Log['attributes']): void {
captureLog('debug', message, attributes);
}

/**
* @summary Capture a log with the `info` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.info('Hello world', { userId: 100 });
* ```
*/
export function info(message: string, attributes?: Log['attributes']): void {
captureLog('info', message, attributes);
}

/**
* @summary Capture a log with the `warn` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.warn('Hello world', { userId: 100 });
* ```
*/
export function warn(message: string, attributes?: Log['attributes']): void {
captureLog('warn', message, attributes);
}

/**
* @summary Capture a log with the `error` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.error('Hello world', { userId: 100 });
* ```
*/
export function error(message: string, attributes?: Log['attributes']): void {
captureLog('error', message, attributes);
}

/**
* @summary Capture a log with the `fatal` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.fatal('Hello world', { userId: 100 });
* ```
*/
export function fatal(message: string, attributes?: Log['attributes']): void {
captureLog('fatal', message, attributes);
}

/**
* @summary Capture a log with the `critical` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.critical('Hello world', { userId: 100 });
* ```
*/
export function critical(message: string, attributes?: Log['attributes']): void {
captureLog('critical', message, attributes);
}
43 changes: 29 additions & 14 deletions packages/browser/test/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ import {
getCurrentScope,
init,
showReportDialog,
logger,
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';
Expand DownExpand Up@@ -243,20 +244,21 @@ describe('SentryBrowser', () => {
expect(event.exception.values[0]?.stacktrace.frames).not.toHaveLength(0);
});

it('should capture a message', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: (event: Event): Event | null => {
expect(event.level).toBe('info');
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
});
it('should capture an message', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.level).toBe('info');
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
}));

it('should capture an event', () =>
new Promise<void>(resolve => {
Expand DownExpand Up@@ -322,6 +324,19 @@ describe('SentryBrowser', () => {
expect(localBeforeSend).not.toHaveBeenCalled();
});
});

describe('logger', () => {
it('exports all log methods', () => {
expect(logger).toBeDefined();
expect(logger.trace).toBeDefined();
expect(logger.debug).toBeDefined();
expect(logger.info).toBeDefined();
expect(logger.warn).toBeDefined();
expect(logger.error).toBeDefined();
expect(logger.fatal).toBeDefined();
expect(logger.critical).toBeDefined();
});
});
});

describe('SentryBrowser initialization', () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(browser): Add logger.X methods to browser SDK by AbhiPrasad · Pull Request #15763 · getsentry/sentry-javascript · GitHub
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
4 changes: 0 additions & 4 deletions packages/browser/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import {
addAutoIpAddressToUser,
applySdkMetadata,
getSDKSource,
_INTERNAL_flushLogsBuffer,
} from '@sentry/core';
import { eventFromException, eventFromMessage } from './eventbuilder';
import { WINDOW } from './helpers';
Expand DownExpand Up@@ -86,9 +85,6 @@ export class BrowserClient extends Client<BrowserClientOptions> {
WINDOW.document.addEventListener('visibilitychange', () => {
if (WINDOW.document.visibilityState === 'hidden') {
this._flushOutcomes();
if (this._options._experiments?.enableLogs) {
_INTERNAL_flushLogsBuffer(this);
}
}
});
}
Expand Down
4 changes: 4 additions & 0 deletions packages/browser/src/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
export * from './exports';

import * as logger from './log';

export { logger };

export { reportingObserverIntegration } from './integrations/reportingobserver';
export { httpClientIntegration } from './integrations/httpclient';
export { contextLinesIntegration } from './integrations/contextlines';
Expand Down
186 changes: 186 additions & 0 deletions packages/browser/src/log.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
import type { LogSeverityLevel, Log, Client } from '@sentry/core';
import { getClient, _INTERNAL_captureLog, _INTERNAL_flushLogsBuffer } from '@sentry/core';

import { WINDOW } from './helpers';

/**
* TODO: Make this configurable
*/
const DEFAULT_FLUSH_INTERVAL = 5000;

let timeout: ReturnType<typeof setTimeout> | undefined;

/**
* This is a global timeout that is used to flush the logs buffer.
* It is used to ensure that logs are flushed even if the client is not flushed.
*/
function startFlushTimeout(client: Client): void {
if (timeout) {
clearTimeout(timeout);
}

timeout = setTimeout(() => {
_INTERNAL_flushLogsBuffer(client);
}, DEFAULT_FLUSH_INTERVAL);
}

let isClientListenerAdded = false;
/**
* This is a function that is used to add a flush listener to the client.
* It is used to ensure that the logger buffer is flushed when the client is flushed.
*/
function addFlushingListeners(client: Client): void {
if (isClientListenerAdded || !client.getOptions()._experiments?.enableLogs) {
return;
}

isClientListenerAdded = true;

if (WINDOW.document) {
WINDOW.document.addEventListener('visibilitychange', () => {
if (WINDOW.document.visibilityState === 'hidden') {
_INTERNAL_flushLogsBuffer(client);
}
});
}

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});
}
Comment on lines +39 to +50

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we not also just flush in the client callback?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which client callback are you referring too?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});


/**
* Capture a log with the given level.
*
* @param level - The level of the log.
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
* @param severityNumber - The severity number of the log.
*/
function captureLog(
level: LogSeverityLevel,
message: string,
attributes?: Log['attributes'],
severityNumber?: Log['severityNumber'],
): void {
const client = getClient();
if (client) {
addFlushingListeners(client);

startFlushTimeout(client);
}

_INTERNAL_captureLog({ level, message, attributes, severityNumber }, client, undefined);
}

/**
* @summary Capture a log with the `trace` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.trace('Hello world', { userId: 100 });
* ```
*/
export function trace(message: string, attributes?: Log['attributes']): void {
captureLog('trace', message, attributes);
}

/**
* @summary Capture a log with the `debug` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.debug('Hello world', { userId: 100 });
* ```
*/
export function debug(message: string, attributes?: Log['attributes']): void {
captureLog('debug', message, attributes);
}

/**
* @summary Capture a log with the `info` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.info('Hello world', { userId: 100 });
* ```
*/
export function info(message: string, attributes?: Log['attributes']): void {
captureLog('info', message, attributes);
}

/**
* @summary Capture a log with the `warn` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.warn('Hello world', { userId: 100 });
* ```
*/
export function warn(message: string, attributes?: Log['attributes']): void {
captureLog('warn', message, attributes);
}

/**
* @summary Capture a log with the `error` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.error('Hello world', { userId: 100 });
* ```
*/
export function error(message: string, attributes?: Log['attributes']): void {
captureLog('error', message, attributes);
}

/**
* @summary Capture a log with the `fatal` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.fatal('Hello world', { userId: 100 });
* ```
*/
export function fatal(message: string, attributes?: Log['attributes']): void {
captureLog('fatal', message, attributes);
}

/**
* @summary Capture a log with the `critical` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.critical('Hello world', { userId: 100 });
* ```
*/
export function critical(message: string, attributes?: Log['attributes']): void {
captureLog('critical', message, attributes);
}
43 changes: 29 additions & 14 deletions packages/browser/test/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ import {
getCurrentScope,
init,
showReportDialog,
logger,
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';
Expand DownExpand Up@@ -243,20 +244,21 @@ describe('SentryBrowser', () => {
expect(event.exception.values[0]?.stacktrace.frames).not.toHaveLength(0);
});

it('should capture a message', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: (event: Event): Event | null => {
expect(event.level).toBe('info');
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
});
it('should capture an message', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.level).toBe('info');
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
}));

it('should capture an event', () =>
new Promise<void>(resolve => {
Expand DownExpand Up@@ -322,6 +324,19 @@ describe('SentryBrowser', () => {
expect(localBeforeSend).not.toHaveBeenCalled();
});
});

describe('logger', () => {
it('exports all log methods', () => {
expect(logger).toBeDefined();
expect(logger.trace).toBeDefined();
expect(logger.debug).toBeDefined();
expect(logger.info).toBeDefined();
expect(logger.warn).toBeDefined();
expect(logger.error).toBeDefined();
expect(logger.fatal).toBeDefined();
expect(logger.critical).toBeDefined();
});
});
});

describe('SentryBrowser initialization', () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); feat(browser): Add logger.X methods to browser SDK by AbhiPrasad · Pull Request #15763 · getsentry/sentry-javascript · GitHub
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
4 changes: 0 additions & 4 deletions packages/browser/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import {
addAutoIpAddressToUser,
applySdkMetadata,
getSDKSource,
_INTERNAL_flushLogsBuffer,
} from '@sentry/core';
import { eventFromException, eventFromMessage } from './eventbuilder';
import { WINDOW } from './helpers';
Expand DownExpand Up@@ -86,9 +85,6 @@ export class BrowserClient extends Client<BrowserClientOptions> {
WINDOW.document.addEventListener('visibilitychange', () => {
if (WINDOW.document.visibilityState === 'hidden') {
this._flushOutcomes();
if (this._options._experiments?.enableLogs) {
_INTERNAL_flushLogsBuffer(this);
}
}
});
}
Expand Down
4 changes: 4 additions & 0 deletions packages/browser/src/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
export * from './exports';

import * as logger from './log';

export { logger };

export { reportingObserverIntegration } from './integrations/reportingobserver';
export { httpClientIntegration } from './integrations/httpclient';
export { contextLinesIntegration } from './integrations/contextlines';
Expand Down
186 changes: 186 additions & 0 deletions packages/browser/src/log.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
import type { LogSeverityLevel, Log, Client } from '@sentry/core';
import { getClient, _INTERNAL_captureLog, _INTERNAL_flushLogsBuffer } from '@sentry/core';

import { WINDOW } from './helpers';

/**
* TODO: Make this configurable
*/
const DEFAULT_FLUSH_INTERVAL = 5000;

let timeout: ReturnType<typeof setTimeout> | undefined;

/**
* This is a global timeout that is used to flush the logs buffer.
* It is used to ensure that logs are flushed even if the client is not flushed.
*/
function startFlushTimeout(client: Client): void {
if (timeout) {
clearTimeout(timeout);
}

timeout = setTimeout(() => {
_INTERNAL_flushLogsBuffer(client);
}, DEFAULT_FLUSH_INTERVAL);
}

let isClientListenerAdded = false;
/**
* This is a function that is used to add a flush listener to the client.
* It is used to ensure that the logger buffer is flushed when the client is flushed.
*/
function addFlushingListeners(client: Client): void {
if (isClientListenerAdded || !client.getOptions()._experiments?.enableLogs) {
return;
}

isClientListenerAdded = true;

if (WINDOW.document) {
WINDOW.document.addEventListener('visibilitychange', () => {
if (WINDOW.document.visibilityState === 'hidden') {
_INTERNAL_flushLogsBuffer(client);
}
});
}

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});
}
Comment on lines +39 to +50

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we not also just flush in the client callback?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which client callback are you referring too?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});


/**
* Capture a log with the given level.
*
* @param level - The level of the log.
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
* @param severityNumber - The severity number of the log.
*/
function captureLog(
level: LogSeverityLevel,
message: string,
attributes?: Log['attributes'],
severityNumber?: Log['severityNumber'],
): void {
const client = getClient();
if (client) {
addFlushingListeners(client);

startFlushTimeout(client);
}

_INTERNAL_captureLog({ level, message, attributes, severityNumber }, client, undefined);
}

/**
* @summary Capture a log with the `trace` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.trace('Hello world', { userId: 100 });
* ```
*/
export function trace(message: string, attributes?: Log['attributes']): void {
captureLog('trace', message, attributes);
}

/**
* @summary Capture a log with the `debug` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.debug('Hello world', { userId: 100 });
* ```
*/
export function debug(message: string, attributes?: Log['attributes']): void {
captureLog('debug', message, attributes);
}

/**
* @summary Capture a log with the `info` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.info('Hello world', { userId: 100 });
* ```
*/
export function info(message: string, attributes?: Log['attributes']): void {
captureLog('info', message, attributes);
}

/**
* @summary Capture a log with the `warn` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.warn('Hello world', { userId: 100 });
* ```
*/
export function warn(message: string, attributes?: Log['attributes']): void {
captureLog('warn', message, attributes);
}

/**
* @summary Capture a log with the `error` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.error('Hello world', { userId: 100 });
* ```
*/
export function error(message: string, attributes?: Log['attributes']): void {
captureLog('error', message, attributes);
}

/**
* @summary Capture a log with the `fatal` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.fatal('Hello world', { userId: 100 });
* ```
*/
export function fatal(message: string, attributes?: Log['attributes']): void {
captureLog('fatal', message, attributes);
}

/**
* @summary Capture a log with the `critical` level. Requires `_experiments.enableLogs` to be enabled.
*
* @param message - The message to log.
* @param attributes - Arbitrary structured data that stores information about the log - e.g., userId: 100.
*
* @example
*
* ```
* Sentry.logger.critical('Hello world', { userId: 100 });
* ```
*/
export function critical(message: string, attributes?: Log['attributes']): void {
captureLog('critical', message, attributes);
}
43 changes: 29 additions & 14 deletions packages/browser/test/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ import {
getCurrentScope,
init,
showReportDialog,
logger,
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';
Expand DownExpand Up@@ -243,20 +244,21 @@ describe('SentryBrowser', () => {
expect(event.exception.values[0]?.stacktrace.frames).not.toHaveLength(0);
});

it('should capture a message', done => {
const options = getDefaultBrowserClientOptions({
beforeSend: (event: Event): Event | null => {
expect(event.level).toBe('info');
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
done();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
});
it('should capture an message', () =>
new Promise<void>(resolve => {
const options = getDefaultBrowserClientOptions({
beforeSend: event => {
expect(event.level).toBe('info');
expect(event.message).toBe('test');
expect(event.exception).toBeUndefined();
resolve();
return event;
},
dsn,
});
setCurrentClient(new BrowserClient(options));
captureMessage('test');
}));

it('should capture an event', () =>
new Promise<void>(resolve => {
Expand DownExpand Up@@ -322,6 +324,19 @@ describe('SentryBrowser', () => {
expect(localBeforeSend).not.toHaveBeenCalled();
});
});

describe('logger', () => {
it('exports all log methods', () => {
expect(logger).toBeDefined();
expect(logger.trace).toBeDefined();
expect(logger.debug).toBeDefined();
expect(logger.info).toBeDefined();
expect(logger.warn).toBeDefined();
expect(logger.error).toBeDefined();
expect(logger.fatal).toBeDefined();
expect(logger.critical).toBeDefined();
});
});
});

describe('SentryBrowser initialization', () => {
Expand Down
Loading