Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
10 changes: 5 additions & 5 deletions .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init'),
gzip: true,
limit: '24 KB',
limit: '25 KB',
},
{
name: '@sentry/browser - with treeshaking flags',
Expand DownExpand Up@@ -40,14 +40,14 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration'),
gzip: true,
limit: '37.5 KB',
limit: '38 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay)',
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
gzip: true,
limit: '75.2 KB',
limit: '77 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
Expand DownExpand Up@@ -79,7 +79,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
gzip: true,
limit: '80 KB',
limit: '82 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand DownExpand Up@@ -210,7 +210,7 @@ module.exports = [
import: createImport('init'),
ignore: ['next/router', 'next/constants'],
gzip: true,
limit: '41 KB',
limit: '43 KB',
},
// SvelteKit SDK (ESM)
{
Expand Down
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,36 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.4.0-alpha.0

This is an alpha release that includes experimental functionality for the new logs API in Sentry. Support for these methods are only avaliable in the browser and core SDKs.

- feat(logs): Add experimental user-callable logging methods (#15442)

Logging is gated by an experimental option, `_experiments.enableLogs`.

```js
Sentry.init({
_experiments: {
enableLogs: true,
},
});
```

These API are exposed in the `Sentry._experiment_log` namespace.

On the high level, there are functions for each of the logging severity levels `critical`, `fatal`, `error`, `warn`, `info`, `debug`, `trace`. These functions are tagged template functions, so they use a special string template syntax that we use to parameterize functions accordingly.

```js
Sentry._experiment_log.info`user ${username} just bought ${item}!`;
```

If you want more custom usage, we also expose a `captureLog` method that allows you to pass custom attributes, but it's less easy to use than the tagged template functions.

```js
Sentry._experiment_log.captureLog('error', 'Hello world!', { 'user.id': 123 });
```

## 9.3.0

### Important Changes
Expand Down
1 change: 1 addition & 0 deletions packages/browser/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ export {
extraErrorDataIntegration,
rewriteFramesIntegration,
captureFeedback,
_experiment_log,
} from '@sentry/core';

export { replayIntegration, getReplay } from '@sentry-internal/replay';
Expand Down
67 changes: 67 additions & 0 deletions packages/core/src/exports.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import { captureLog, sendLog } from './log';
import type { CaptureContext } from './scope';
import { closeSession, makeSession, updateSession } from './session';
import type {
Expand All@@ -10,6 +11,7 @@ import type {
Extra,
Extras,
FinishedCheckIn,
LogSeverityLevel,
MonitorConfig,
Primitive,
Session,
Expand DownExpand Up@@ -334,3 +336,68 @@ export function captureSession(end: boolean = false): void {
// only send the update
_sendSessionUpdate();
}

type OmitFirstArg<F> = F extends (x: LogSeverityLevel, ...args: infer P) => infer R ? (...args: P) => R : never;

/**
* A namespace for experimental logging functions.
*
* @experimental Will be removed in future versions. Do not use.
*/
export const _experiment_log = {
/**
* A utility to record a log with level 'TRACE' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.trace`user ${username} just bought ${item}!`
*/
trace: sendLog.bind(null, 'trace') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'DEBUG' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.debug`user ${username} just bought ${item}!`
*/
debug: sendLog.bind(null, 'debug') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'INFO' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.info`user ${username} just bought ${item}!`
*/
info: sendLog.bind(null, 'info') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'INFO' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.log`user ${username} just bought ${item}!`
*/
log: sendLog.bind(null, 'log') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'ERROR' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.error`user ${username} just bought ${item}!`
*/
error: sendLog.bind(null, 'error') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'WARN' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.warn`user ${username} just bought ${item}!`
*/
warn: sendLog.bind(null, 'warn') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'FATAL' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.warn`user ${username} just bought ${item}!`
*/
fatal: sendLog.bind(null, 'fatal') as OmitFirstArg<typeof sendLog>,
/**
* A flexible utility to record a log with a custom level and send it to sentry.
*
* You can optionally pass in custom attributes and a custom severity number to be attached to the log.
*/
captureLog,
};
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export {
endSession,
captureSession,
addEventProcessor,
_experiment_log,
} from './exports';
export {
getCurrentScope,
Expand Down
188 changes: 188 additions & 0 deletions packages/core/src/log.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
import type { Client } from './client';
import { getClient, getCurrentScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import type { Scope } from './scope';
import { getDynamicSamplingContextFromScope } from './tracing';
import type { DynamicSamplingContext, LogEnvelope, LogItem } from './types-hoist/envelope';
import type { Log, LogAttribute, LogSeverityLevel } from './types-hoist/log';
import { createEnvelope, dropUndefinedKeys, dsnToString, logger } from './utils-hoist';

const LOG_BUFFER_MAX_LENGTH = 25;

let GLOBAL_LOG_BUFFER: Log[] = [];

let isFlushingLogs = false;

const SEVERITY_TEXT_TO_SEVERITY_NUMBER: Partial<Record<LogSeverityLevel | 'log', number>> = {
trace: 1,
debug: 5,
info: 9,
log: 10,
warn: 13,
error: 17,
fatal: 21,
};

/**
* Creates envelope item for a single log
*/
export function createLogEnvelopeItem(log: Log): LogItem {
const headers: LogItem[0] = {
type: 'otel_log',
};

return [headers, log];
}

/**
* Records a log and sends it to sentry.
*
* Logs represent a message (and optionally some structured data) which provide context for a trace or error.
* Ex: sentry.addLog({level: 'warning', message: `user ${user} just bought ${item}`, attributes: {user, item}}
*
* @params log - the log object which will be sent
*/
function createLogEnvelope(logs: Log[], client: Client, scope: Scope): LogEnvelope {
const dsc = getDynamicSamplingContextFromScope(client, scope);

const dsn = client.getDsn();

const headers: LogEnvelope[0] = {
trace: dropUndefinedKeys(dsc) as DynamicSamplingContext,
...(dsn ? { dsn: dsnToString(dsn) } : {}),
};

return createEnvelope<LogEnvelope>(headers, logs.map(createLogEnvelopeItem));
}

function valueToAttribute(key: string, value: unknown): LogAttribute {
switch (typeof value) {
case 'number':
return {
key,
value: { doubleValue: value },
};
case 'boolean':
return {
key,
value: { boolValue: value },
};
case 'string':
return {
key,
value: { stringValue: value },
};
default:
return {
key,
value: { stringValue: JSON.stringify(value) ?? '' },
};
}
}

function addToLogBuffer(client: Client, log: Log, scope: Scope): void {
function sendLogs(flushedLogs: Log[]): void {
const envelope = createLogEnvelope(flushedLogs, client, scope);
// eslint-disable-next-line @typescript-eslint/no-floating-promises
void client.sendEnvelope(envelope);
}

if (GLOBAL_LOG_BUFFER.length >= LOG_BUFFER_MAX_LENGTH) {
sendLogs(GLOBAL_LOG_BUFFER);
GLOBAL_LOG_BUFFER = [];
} else {
GLOBAL_LOG_BUFFER.push(log);
}

// this is the first time logs have been enabled, let's kick off an interval to flush them
// we should only do this once.
if (!isFlushingLogs) {
setInterval(() => {
if (GLOBAL_LOG_BUFFER.length > 0) {
sendLogs(GLOBAL_LOG_BUFFER);
GLOBAL_LOG_BUFFER = [];
}
}, 5000);
}
isFlushingLogs = true;
}

/**
* A utility function to be able to create methods like Sentry.info`...` that use tagged template functions.
*
* The first parameter is bound with, e.g., const info = captureLog.bind(null, 'info')
* The other parameters are in the format to be passed a tagged template, Sentry.info`hello ${world}`
*/
export function sendLog(level: LogSeverityLevel, messageArr: TemplateStringsArray, ...values: unknown[]): void {
const message = messageArr.reduce((acc, str, i) => acc + str + (JSON.stringify(values[i]) ?? ''), '');

const attributes = values.reduce<Record<string, unknown>>(
(acc, value, index) => {
acc[`sentry.message.parameters.${index}`] = value;
return acc;
},
{
'sentry.message.template': messageArr.map((s, i) => s + (i < messageArr.length - 1 ? `$param.${i}` : '')).join(''),
},
);

captureLog(level, message, attributes);
}

/**
* Sends a log to Sentry.
*/
export function captureLog(
level: LogSeverityLevel,
message: string,
customAttributes: Record<string, unknown> = {},
severityNumber?: number,
): void {
const client = getClient();

if (!client) {
DEBUG_BUILD && logger.warn('No client available, log will not be captured.');
return;
}

if (!client.getOptions()._experiments?.enableLogs) {
DEBUG_BUILD && logger.warn('logging option not enabled, log will not be captured.');
return;
}

const { release, environment } = client.getOptions();

const logAttributes = {
...customAttributes,
};

if (release) {
logAttributes['sentry.release'] = release;
}

if (environment) {
logAttributes['sentry.environment'] = environment;
}

const scope = getCurrentScope();

const attributes = Object.entries(logAttributes).map<LogAttribute>(([key, value]) => valueToAttribute(key, value));

const log: Log = {
severityText: level,
body: {
stringValue: message,
},
attributes,
timeUnixNano: `${new Date().getTime().toString()}000000`,
traceId: scope.getPropagationContext().traceId,
severityNumber,
};

const maybeSeverityNumber = SEVERITY_TEXT_TO_SEVERITY_NUMBER[level];
if (maybeSeverityNumber !== undefined && log.severityNumber === undefined) {
log.severityNumber = maybeSeverityNumber;
}

addToLogBuffer(client, log, scope);
}
5 changes: 5 additions & 0 deletions packages/core/src/types-hoist/options.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,12 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
* Options which are in beta, or otherwise not guaranteed to be stable.
*/
_experiments?: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[key: string]: any;
/**
* If logs support should be enabled. Defaults to false.
*/
enableLogs?: boolean;
};

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config-sdk/src/base.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ module.exports = {
// Make sure all expressions are used. Turned off in tests
// Must disable base rule to prevent false positives
'no-unused-expressions': 'off',
'@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true }],
'@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true, allowTaggedTemplates: true }],

// Make sure Promises are handled appropriately
'@typescript-eslint/no-floating-promises': ['error', { ignoreVoid: false }],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
10 changes: 5 additions & 5 deletions .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init'),
gzip: true,
limit: '24 KB',
limit: '25 KB',
},
{
name: '@sentry/browser - with treeshaking flags',
Expand DownExpand Up@@ -40,14 +40,14 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration'),
gzip: true,
limit: '37.5 KB',
limit: '38 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay)',
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
gzip: true,
limit: '75.2 KB',
limit: '77 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
Expand DownExpand Up@@ -79,7 +79,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
gzip: true,
limit: '80 KB',
limit: '82 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand DownExpand Up@@ -210,7 +210,7 @@ module.exports = [
import: createImport('init'),
ignore: ['next/router', 'next/constants'],
gzip: true,
limit: '41 KB',
limit: '43 KB',
},
// SvelteKit SDK (ESM)
{
Expand Down
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,36 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.4.0-alpha.0

This is an alpha release that includes experimental functionality for the new logs API in Sentry. Support for these methods are only avaliable in the browser and core SDKs.

- feat(logs): Add experimental user-callable logging methods (#15442)

Logging is gated by an experimental option, `_experiments.enableLogs`.

```js
Sentry.init({
_experiments: {
enableLogs: true,
},
});
```

These API are exposed in the `Sentry._experiment_log` namespace.

On the high level, there are functions for each of the logging severity levels `critical`, `fatal`, `error`, `warn`, `info`, `debug`, `trace`. These functions are tagged template functions, so they use a special string template syntax that we use to parameterize functions accordingly.

```js
Sentry._experiment_log.info`user ${username} just bought ${item}!`;
```

If you want more custom usage, we also expose a `captureLog` method that allows you to pass custom attributes, but it's less easy to use than the tagged template functions.

```js
Sentry._experiment_log.captureLog('error', 'Hello world!', { 'user.id': 123 });
```

## 9.3.0

### Important Changes
Expand Down
1 change: 1 addition & 0 deletions packages/browser/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ export {
extraErrorDataIntegration,
rewriteFramesIntegration,
captureFeedback,
_experiment_log,
} from '@sentry/core';

export { replayIntegration, getReplay } from '@sentry-internal/replay';
Expand Down
67 changes: 67 additions & 0 deletions packages/core/src/exports.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import { captureLog, sendLog } from './log';
import type { CaptureContext } from './scope';
import { closeSession, makeSession, updateSession } from './session';
import type {
Expand All@@ -10,6 +11,7 @@ import type {
Extra,
Extras,
FinishedCheckIn,
LogSeverityLevel,
MonitorConfig,
Primitive,
Session,
Expand DownExpand Up@@ -334,3 +336,68 @@ export function captureSession(end: boolean = false): void {
// only send the update
_sendSessionUpdate();
}

type OmitFirstArg<F> = F extends (x: LogSeverityLevel, ...args: infer P) => infer R ? (...args: P) => R : never;

/**
* A namespace for experimental logging functions.
*
* @experimental Will be removed in future versions. Do not use.
*/
export const _experiment_log = {
/**
* A utility to record a log with level 'TRACE' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.trace`user ${username} just bought ${item}!`
*/
trace: sendLog.bind(null, 'trace') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'DEBUG' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.debug`user ${username} just bought ${item}!`
*/
debug: sendLog.bind(null, 'debug') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'INFO' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.info`user ${username} just bought ${item}!`
*/
info: sendLog.bind(null, 'info') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'INFO' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.log`user ${username} just bought ${item}!`
*/
log: sendLog.bind(null, 'log') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'ERROR' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.error`user ${username} just bought ${item}!`
*/
error: sendLog.bind(null, 'error') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'WARN' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.warn`user ${username} just bought ${item}!`
*/
warn: sendLog.bind(null, 'warn') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'FATAL' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.warn`user ${username} just bought ${item}!`
*/
fatal: sendLog.bind(null, 'fatal') as OmitFirstArg<typeof sendLog>,
/**
* A flexible utility to record a log with a custom level and send it to sentry.
*
* You can optionally pass in custom attributes and a custom severity number to be attached to the log.
*/
captureLog,
};
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export {
endSession,
captureSession,
addEventProcessor,
_experiment_log,
} from './exports';
export {
getCurrentScope,
Expand Down
188 changes: 188 additions & 0 deletions packages/core/src/log.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
import type { Client } from './client';
import { getClient, getCurrentScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import type { Scope } from './scope';
import { getDynamicSamplingContextFromScope } from './tracing';
import type { DynamicSamplingContext, LogEnvelope, LogItem } from './types-hoist/envelope';
import type { Log, LogAttribute, LogSeverityLevel } from './types-hoist/log';
import { createEnvelope, dropUndefinedKeys, dsnToString, logger } from './utils-hoist';

const LOG_BUFFER_MAX_LENGTH = 25;

let GLOBAL_LOG_BUFFER: Log[] = [];

let isFlushingLogs = false;

const SEVERITY_TEXT_TO_SEVERITY_NUMBER: Partial<Record<LogSeverityLevel | 'log', number>> = {
trace: 1,
debug: 5,
info: 9,
log: 10,
warn: 13,
error: 17,
fatal: 21,
};

/**
* Creates envelope item for a single log
*/
export function createLogEnvelopeItem(log: Log): LogItem {
const headers: LogItem[0] = {
type: 'otel_log',
};

return [headers, log];
}

/**
* Records a log and sends it to sentry.
*
* Logs represent a message (and optionally some structured data) which provide context for a trace or error.
* Ex: sentry.addLog({level: 'warning', message: `user ${user} just bought ${item}`, attributes: {user, item}}
*
* @params log - the log object which will be sent
*/
function createLogEnvelope(logs: Log[], client: Client, scope: Scope): LogEnvelope {
const dsc = getDynamicSamplingContextFromScope(client, scope);

const dsn = client.getDsn();

const headers: LogEnvelope[0] = {
trace: dropUndefinedKeys(dsc) as DynamicSamplingContext,
...(dsn ? { dsn: dsnToString(dsn) } : {}),
};

return createEnvelope<LogEnvelope>(headers, logs.map(createLogEnvelopeItem));
}

function valueToAttribute(key: string, value: unknown): LogAttribute {
switch (typeof value) {
case 'number':
return {
key,
value: { doubleValue: value },
};
case 'boolean':
return {
key,
value: { boolValue: value },
};
case 'string':
return {
key,
value: { stringValue: value },
};
default:
return {
key,
value: { stringValue: JSON.stringify(value) ?? '' },
};
}
}

function addToLogBuffer(client: Client, log: Log, scope: Scope): void {
function sendLogs(flushedLogs: Log[]): void {
const envelope = createLogEnvelope(flushedLogs, client, scope);
// eslint-disable-next-line @typescript-eslint/no-floating-promises
void client.sendEnvelope(envelope);
}

if (GLOBAL_LOG_BUFFER.length >= LOG_BUFFER_MAX_LENGTH) {
sendLogs(GLOBAL_LOG_BUFFER);
GLOBAL_LOG_BUFFER = [];
} else {
GLOBAL_LOG_BUFFER.push(log);
}

// this is the first time logs have been enabled, let's kick off an interval to flush them
// we should only do this once.
if (!isFlushingLogs) {
setInterval(() => {
if (GLOBAL_LOG_BUFFER.length > 0) {
sendLogs(GLOBAL_LOG_BUFFER);
GLOBAL_LOG_BUFFER = [];
}
}, 5000);
}
isFlushingLogs = true;
}

/**
* A utility function to be able to create methods like Sentry.info`...` that use tagged template functions.
*
* The first parameter is bound with, e.g., const info = captureLog.bind(null, 'info')
* The other parameters are in the format to be passed a tagged template, Sentry.info`hello ${world}`
*/
export function sendLog(level: LogSeverityLevel, messageArr: TemplateStringsArray, ...values: unknown[]): void {
const message = messageArr.reduce((acc, str, i) => acc + str + (JSON.stringify(values[i]) ?? ''), '');

const attributes = values.reduce<Record<string, unknown>>(
(acc, value, index) => {
acc[`sentry.message.parameters.${index}`] = value;
return acc;
},
{
'sentry.message.template': messageArr.map((s, i) => s + (i < messageArr.length - 1 ? `$param.${i}` : '')).join(''),
},
);

captureLog(level, message, attributes);
}

/**
* Sends a log to Sentry.
*/
export function captureLog(
level: LogSeverityLevel,
message: string,
customAttributes: Record<string, unknown> = {},
severityNumber?: number,
): void {
const client = getClient();

if (!client) {
DEBUG_BUILD && logger.warn('No client available, log will not be captured.');
return;
}

if (!client.getOptions()._experiments?.enableLogs) {
DEBUG_BUILD && logger.warn('logging option not enabled, log will not be captured.');
return;
}

const { release, environment } = client.getOptions();

const logAttributes = {
...customAttributes,
};

if (release) {
logAttributes['sentry.release'] = release;
}

if (environment) {
logAttributes['sentry.environment'] = environment;
}

const scope = getCurrentScope();

const attributes = Object.entries(logAttributes).map<LogAttribute>(([key, value]) => valueToAttribute(key, value));

const log: Log = {
severityText: level,
body: {
stringValue: message,
},
attributes,
timeUnixNano: `${new Date().getTime().toString()}000000`,
traceId: scope.getPropagationContext().traceId,
severityNumber,
};

const maybeSeverityNumber = SEVERITY_TEXT_TO_SEVERITY_NUMBER[level];
if (maybeSeverityNumber !== undefined && log.severityNumber === undefined) {
log.severityNumber = maybeSeverityNumber;
}

addToLogBuffer(client, log, scope);
}
5 changes: 5 additions & 0 deletions packages/core/src/types-hoist/options.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,12 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
* Options which are in beta, or otherwise not guaranteed to be stable.
*/
_experiments?: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[key: string]: any;
/**
* If logs support should be enabled. Defaults to false.
*/
enableLogs?: boolean;
};

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config-sdk/src/base.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ module.exports = {
// Make sure all expressions are used. Turned off in tests
// Must disable base rule to prevent false positives
'no-unused-expressions': 'off',
'@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true }],
'@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true, allowTaggedTemplates: true }],

// Make sure Promises are handled appropriately
'@typescript-eslint/no-floating-promises': ['error', { ignoreVoid: false }],
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
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
10 changes: 5 additions & 5 deletions .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init'),
gzip: true,
limit: '24 KB',
limit: '25 KB',
},
{
name: '@sentry/browser - with treeshaking flags',
Expand DownExpand Up@@ -40,14 +40,14 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration'),
gzip: true,
limit: '37.5 KB',
limit: '38 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay)',
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
gzip: true,
limit: '75.2 KB',
limit: '77 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
Expand DownExpand Up@@ -79,7 +79,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
gzip: true,
limit: '80 KB',
limit: '82 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand DownExpand Up@@ -210,7 +210,7 @@ module.exports = [
import: createImport('init'),
ignore: ['next/router', 'next/constants'],
gzip: true,
limit: '41 KB',
limit: '43 KB',
},
// SvelteKit SDK (ESM)
{
Expand Down
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,36 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.4.0-alpha.0

This is an alpha release that includes experimental functionality for the new logs API in Sentry. Support for these methods are only avaliable in the browser and core SDKs.

- feat(logs): Add experimental user-callable logging methods (#15442)

Logging is gated by an experimental option, `_experiments.enableLogs`.

```js
Sentry.init({
_experiments: {
enableLogs: true,
},
});
```

These API are exposed in the `Sentry._experiment_log` namespace.

On the high level, there are functions for each of the logging severity levels `critical`, `fatal`, `error`, `warn`, `info`, `debug`, `trace`. These functions are tagged template functions, so they use a special string template syntax that we use to parameterize functions accordingly.

```js
Sentry._experiment_log.info`user ${username} just bought ${item}!`;
```

If you want more custom usage, we also expose a `captureLog` method that allows you to pass custom attributes, but it's less easy to use than the tagged template functions.

```js
Sentry._experiment_log.captureLog('error', 'Hello world!', { 'user.id': 123 });
```

## 9.3.0

### Important Changes
Expand Down
1 change: 1 addition & 0 deletions packages/browser/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ export {
extraErrorDataIntegration,
rewriteFramesIntegration,
captureFeedback,
_experiment_log,
} from '@sentry/core';

export { replayIntegration, getReplay } from '@sentry-internal/replay';
Expand Down
67 changes: 67 additions & 0 deletions packages/core/src/exports.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import { captureLog, sendLog } from './log';
import type { CaptureContext } from './scope';
import { closeSession, makeSession, updateSession } from './session';
import type {
Expand All@@ -10,6 +11,7 @@ import type {
Extra,
Extras,
FinishedCheckIn,
LogSeverityLevel,
MonitorConfig,
Primitive,
Session,
Expand DownExpand Up@@ -334,3 +336,68 @@ export function captureSession(end: boolean = false): void {
// only send the update
_sendSessionUpdate();
}

type OmitFirstArg<F> = F extends (x: LogSeverityLevel, ...args: infer P) => infer R ? (...args: P) => R : never;

/**
* A namespace for experimental logging functions.
*
* @experimental Will be removed in future versions. Do not use.
*/
export const _experiment_log = {
/**
* A utility to record a log with level 'TRACE' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.trace`user ${username} just bought ${item}!`
*/
trace: sendLog.bind(null, 'trace') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'DEBUG' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.debug`user ${username} just bought ${item}!`
*/
debug: sendLog.bind(null, 'debug') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'INFO' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.info`user ${username} just bought ${item}!`
*/
info: sendLog.bind(null, 'info') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'INFO' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.log`user ${username} just bought ${item}!`
*/
log: sendLog.bind(null, 'log') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'ERROR' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.error`user ${username} just bought ${item}!`
*/
error: sendLog.bind(null, 'error') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'WARN' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.warn`user ${username} just bought ${item}!`
*/
warn: sendLog.bind(null, 'warn') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'FATAL' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.warn`user ${username} just bought ${item}!`
*/
fatal: sendLog.bind(null, 'fatal') as OmitFirstArg<typeof sendLog>,
/**
* A flexible utility to record a log with a custom level and send it to sentry.
*
* You can optionally pass in custom attributes and a custom severity number to be attached to the log.
*/
captureLog,
};
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export {
endSession,
captureSession,
addEventProcessor,
_experiment_log,
} from './exports';
export {
getCurrentScope,
Expand Down
188 changes: 188 additions & 0 deletions packages/core/src/log.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
import type { Client } from './client';
import { getClient, getCurrentScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import type { Scope } from './scope';
import { getDynamicSamplingContextFromScope } from './tracing';
import type { DynamicSamplingContext, LogEnvelope, LogItem } from './types-hoist/envelope';
import type { Log, LogAttribute, LogSeverityLevel } from './types-hoist/log';
import { createEnvelope, dropUndefinedKeys, dsnToString, logger } from './utils-hoist';

const LOG_BUFFER_MAX_LENGTH = 25;

let GLOBAL_LOG_BUFFER: Log[] = [];

let isFlushingLogs = false;

const SEVERITY_TEXT_TO_SEVERITY_NUMBER: Partial<Record<LogSeverityLevel | 'log', number>> = {
trace: 1,
debug: 5,
info: 9,
log: 10,
warn: 13,
error: 17,
fatal: 21,
};

/**
* Creates envelope item for a single log
*/
export function createLogEnvelopeItem(log: Log): LogItem {
const headers: LogItem[0] = {
type: 'otel_log',
};

return [headers, log];
}

/**
* Records a log and sends it to sentry.
*
* Logs represent a message (and optionally some structured data) which provide context for a trace or error.
* Ex: sentry.addLog({level: 'warning', message: `user ${user} just bought ${item}`, attributes: {user, item}}
*
* @params log - the log object which will be sent
*/
function createLogEnvelope(logs: Log[], client: Client, scope: Scope): LogEnvelope {
const dsc = getDynamicSamplingContextFromScope(client, scope);

const dsn = client.getDsn();

const headers: LogEnvelope[0] = {
trace: dropUndefinedKeys(dsc) as DynamicSamplingContext,
...(dsn ? { dsn: dsnToString(dsn) } : {}),
};

return createEnvelope<LogEnvelope>(headers, logs.map(createLogEnvelopeItem));
}

function valueToAttribute(key: string, value: unknown): LogAttribute {
switch (typeof value) {
case 'number':
return {
key,
value: { doubleValue: value },
};
case 'boolean':
return {
key,
value: { boolValue: value },
};
case 'string':
return {
key,
value: { stringValue: value },
};
default:
return {
key,
value: { stringValue: JSON.stringify(value) ?? '' },
};
}
}

function addToLogBuffer(client: Client, log: Log, scope: Scope): void {
function sendLogs(flushedLogs: Log[]): void {
const envelope = createLogEnvelope(flushedLogs, client, scope);
// eslint-disable-next-line @typescript-eslint/no-floating-promises
void client.sendEnvelope(envelope);
}

if (GLOBAL_LOG_BUFFER.length >= LOG_BUFFER_MAX_LENGTH) {
sendLogs(GLOBAL_LOG_BUFFER);
GLOBAL_LOG_BUFFER = [];
} else {
GLOBAL_LOG_BUFFER.push(log);
}

// this is the first time logs have been enabled, let's kick off an interval to flush them
// we should only do this once.
if (!isFlushingLogs) {
setInterval(() => {
if (GLOBAL_LOG_BUFFER.length > 0) {
sendLogs(GLOBAL_LOG_BUFFER);
GLOBAL_LOG_BUFFER = [];
}
}, 5000);
}
isFlushingLogs = true;
}

/**
* A utility function to be able to create methods like Sentry.info`...` that use tagged template functions.
*
* The first parameter is bound with, e.g., const info = captureLog.bind(null, 'info')
* The other parameters are in the format to be passed a tagged template, Sentry.info`hello ${world}`
*/
export function sendLog(level: LogSeverityLevel, messageArr: TemplateStringsArray, ...values: unknown[]): void {
const message = messageArr.reduce((acc, str, i) => acc + str + (JSON.stringify(values[i]) ?? ''), '');

const attributes = values.reduce<Record<string, unknown>>(
(acc, value, index) => {
acc[`sentry.message.parameters.${index}`] = value;
return acc;
},
{
'sentry.message.template': messageArr.map((s, i) => s + (i < messageArr.length - 1 ? `$param.${i}` : '')).join(''),
},
);

captureLog(level, message, attributes);
}

/**
* Sends a log to Sentry.
*/
export function captureLog(
level: LogSeverityLevel,
message: string,
customAttributes: Record<string, unknown> = {},
severityNumber?: number,
): void {
const client = getClient();

if (!client) {
DEBUG_BUILD && logger.warn('No client available, log will not be captured.');
return;
}

if (!client.getOptions()._experiments?.enableLogs) {
DEBUG_BUILD && logger.warn('logging option not enabled, log will not be captured.');
return;
}

const { release, environment } = client.getOptions();

const logAttributes = {
...customAttributes,
};

if (release) {
logAttributes['sentry.release'] = release;
}

if (environment) {
logAttributes['sentry.environment'] = environment;
}

const scope = getCurrentScope();

const attributes = Object.entries(logAttributes).map<LogAttribute>(([key, value]) => valueToAttribute(key, value));

const log: Log = {
severityText: level,
body: {
stringValue: message,
},
attributes,
timeUnixNano: `${new Date().getTime().toString()}000000`,
traceId: scope.getPropagationContext().traceId,
severityNumber,
};

const maybeSeverityNumber = SEVERITY_TEXT_TO_SEVERITY_NUMBER[level];
if (maybeSeverityNumber !== undefined && log.severityNumber === undefined) {
log.severityNumber = maybeSeverityNumber;
}

addToLogBuffer(client, log, scope);
}
5 changes: 5 additions & 0 deletions packages/core/src/types-hoist/options.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,12 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
* Options which are in beta, or otherwise not guaranteed to be stable.
*/
_experiments?: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[key: string]: any;
/**
* If logs support should be enabled. Defaults to false.
*/
enableLogs?: boolean;
};

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config-sdk/src/base.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ module.exports = {
// Make sure all expressions are used. Turned off in tests
// Must disable base rule to prevent false positives
'no-unused-expressions': 'off',
'@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true }],
'@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true, allowTaggedTemplates: true }],

// Make sure Promises are handled appropriately
'@typescript-eslint/no-floating-promises': ['error', { ignoreVoid: false }],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
10 changes: 5 additions & 5 deletions .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init'),
gzip: true,
limit: '24 KB',
limit: '25 KB',
},
{
name: '@sentry/browser - with treeshaking flags',
Expand DownExpand Up@@ -40,14 +40,14 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration'),
gzip: true,
limit: '37.5 KB',
limit: '38 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay)',
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
gzip: true,
limit: '75.2 KB',
limit: '77 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
Expand DownExpand Up@@ -79,7 +79,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
gzip: true,
limit: '80 KB',
limit: '82 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand DownExpand Up@@ -210,7 +210,7 @@ module.exports = [
import: createImport('init'),
ignore: ['next/router', 'next/constants'],
gzip: true,
limit: '41 KB',
limit: '43 KB',
},
// SvelteKit SDK (ESM)
{
Expand Down
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,36 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.4.0-alpha.0

This is an alpha release that includes experimental functionality for the new logs API in Sentry. Support for these methods are only avaliable in the browser and core SDKs.

- feat(logs): Add experimental user-callable logging methods (#15442)

Logging is gated by an experimental option, `_experiments.enableLogs`.

```js
Sentry.init({
_experiments: {
enableLogs: true,
},
});
```

These API are exposed in the `Sentry._experiment_log` namespace.

On the high level, there are functions for each of the logging severity levels `critical`, `fatal`, `error`, `warn`, `info`, `debug`, `trace`. These functions are tagged template functions, so they use a special string template syntax that we use to parameterize functions accordingly.

```js
Sentry._experiment_log.info`user ${username} just bought ${item}!`;
```

If you want more custom usage, we also expose a `captureLog` method that allows you to pass custom attributes, but it's less easy to use than the tagged template functions.

```js
Sentry._experiment_log.captureLog('error', 'Hello world!', { 'user.id': 123 });
```

## 9.3.0

### Important Changes
Expand Down
1 change: 1 addition & 0 deletions packages/browser/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ export {
extraErrorDataIntegration,
rewriteFramesIntegration,
captureFeedback,
_experiment_log,
} from '@sentry/core';

export { replayIntegration, getReplay } from '@sentry-internal/replay';
Expand Down
67 changes: 67 additions & 0 deletions packages/core/src/exports.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import { captureLog, sendLog } from './log';
import type { CaptureContext } from './scope';
import { closeSession, makeSession, updateSession } from './session';
import type {
Expand All@@ -10,6 +11,7 @@ import type {
Extra,
Extras,
FinishedCheckIn,
LogSeverityLevel,
MonitorConfig,
Primitive,
Session,
Expand DownExpand Up@@ -334,3 +336,68 @@ export function captureSession(end: boolean = false): void {
// only send the update
_sendSessionUpdate();
}

type OmitFirstArg<F> = F extends (x: LogSeverityLevel, ...args: infer P) => infer R ? (...args: P) => R : never;

/**
* A namespace for experimental logging functions.
*
* @experimental Will be removed in future versions. Do not use.
*/
export const _experiment_log = {
/**
* A utility to record a log with level 'TRACE' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.trace`user ${username} just bought ${item}!`
*/
trace: sendLog.bind(null, 'trace') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'DEBUG' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.debug`user ${username} just bought ${item}!`
*/
debug: sendLog.bind(null, 'debug') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'INFO' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.info`user ${username} just bought ${item}!`
*/
info: sendLog.bind(null, 'info') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'INFO' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.log`user ${username} just bought ${item}!`
*/
log: sendLog.bind(null, 'log') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'ERROR' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.error`user ${username} just bought ${item}!`
*/
error: sendLog.bind(null, 'error') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'WARN' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.warn`user ${username} just bought ${item}!`
*/
warn: sendLog.bind(null, 'warn') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'FATAL' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.warn`user ${username} just bought ${item}!`
*/
fatal: sendLog.bind(null, 'fatal') as OmitFirstArg<typeof sendLog>,
/**
* A flexible utility to record a log with a custom level and send it to sentry.
*
* You can optionally pass in custom attributes and a custom severity number to be attached to the log.
*/
captureLog,
};
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export {
endSession,
captureSession,
addEventProcessor,
_experiment_log,
} from './exports';
export {
getCurrentScope,
Expand Down
188 changes: 188 additions & 0 deletions packages/core/src/log.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
import type { Client } from './client';
import { getClient, getCurrentScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import type { Scope } from './scope';
import { getDynamicSamplingContextFromScope } from './tracing';
import type { DynamicSamplingContext, LogEnvelope, LogItem } from './types-hoist/envelope';
import type { Log, LogAttribute, LogSeverityLevel } from './types-hoist/log';
import { createEnvelope, dropUndefinedKeys, dsnToString, logger } from './utils-hoist';

const LOG_BUFFER_MAX_LENGTH = 25;

let GLOBAL_LOG_BUFFER: Log[] = [];

let isFlushingLogs = false;

const SEVERITY_TEXT_TO_SEVERITY_NUMBER: Partial<Record<LogSeverityLevel | 'log', number>> = {
trace: 1,
debug: 5,
info: 9,
log: 10,
warn: 13,
error: 17,
fatal: 21,
};

/**
* Creates envelope item for a single log
*/
export function createLogEnvelopeItem(log: Log): LogItem {
const headers: LogItem[0] = {
type: 'otel_log',
};

return [headers, log];
}

/**
* Records a log and sends it to sentry.
*
* Logs represent a message (and optionally some structured data) which provide context for a trace or error.
* Ex: sentry.addLog({level: 'warning', message: `user ${user} just bought ${item}`, attributes: {user, item}}
*
* @params log - the log object which will be sent
*/
function createLogEnvelope(logs: Log[], client: Client, scope: Scope): LogEnvelope {
const dsc = getDynamicSamplingContextFromScope(client, scope);

const dsn = client.getDsn();

const headers: LogEnvelope[0] = {
trace: dropUndefinedKeys(dsc) as DynamicSamplingContext,
...(dsn ? { dsn: dsnToString(dsn) } : {}),
};

return createEnvelope<LogEnvelope>(headers, logs.map(createLogEnvelopeItem));
}

function valueToAttribute(key: string, value: unknown): LogAttribute {
switch (typeof value) {
case 'number':
return {
key,
value: { doubleValue: value },
};
case 'boolean':
return {
key,
value: { boolValue: value },
};
case 'string':
return {
key,
value: { stringValue: value },
};
default:
return {
key,
value: { stringValue: JSON.stringify(value) ?? '' },
};
}
}

function addToLogBuffer(client: Client, log: Log, scope: Scope): void {
function sendLogs(flushedLogs: Log[]): void {
const envelope = createLogEnvelope(flushedLogs, client, scope);
// eslint-disable-next-line @typescript-eslint/no-floating-promises
void client.sendEnvelope(envelope);
}

if (GLOBAL_LOG_BUFFER.length >= LOG_BUFFER_MAX_LENGTH) {
sendLogs(GLOBAL_LOG_BUFFER);
GLOBAL_LOG_BUFFER = [];
} else {
GLOBAL_LOG_BUFFER.push(log);
}

// this is the first time logs have been enabled, let's kick off an interval to flush them
// we should only do this once.
if (!isFlushingLogs) {
setInterval(() => {
if (GLOBAL_LOG_BUFFER.length > 0) {
sendLogs(GLOBAL_LOG_BUFFER);
GLOBAL_LOG_BUFFER = [];
}
}, 5000);
}
isFlushingLogs = true;
}

/**
* A utility function to be able to create methods like Sentry.info`...` that use tagged template functions.
*
* The first parameter is bound with, e.g., const info = captureLog.bind(null, 'info')
* The other parameters are in the format to be passed a tagged template, Sentry.info`hello ${world}`
*/
export function sendLog(level: LogSeverityLevel, messageArr: TemplateStringsArray, ...values: unknown[]): void {
const message = messageArr.reduce((acc, str, i) => acc + str + (JSON.stringify(values[i]) ?? ''), '');

const attributes = values.reduce<Record<string, unknown>>(
(acc, value, index) => {
acc[`sentry.message.parameters.${index}`] = value;
return acc;
},
{
'sentry.message.template': messageArr.map((s, i) => s + (i < messageArr.length - 1 ? `$param.${i}` : '')).join(''),
},
);

captureLog(level, message, attributes);
}

/**
* Sends a log to Sentry.
*/
export function captureLog(
level: LogSeverityLevel,
message: string,
customAttributes: Record<string, unknown> = {},
severityNumber?: number,
): void {
const client = getClient();

if (!client) {
DEBUG_BUILD && logger.warn('No client available, log will not be captured.');
return;
}

if (!client.getOptions()._experiments?.enableLogs) {
DEBUG_BUILD && logger.warn('logging option not enabled, log will not be captured.');
return;
}

const { release, environment } = client.getOptions();

const logAttributes = {
...customAttributes,
};

if (release) {
logAttributes['sentry.release'] = release;
}

if (environment) {
logAttributes['sentry.environment'] = environment;
}

const scope = getCurrentScope();

const attributes = Object.entries(logAttributes).map<LogAttribute>(([key, value]) => valueToAttribute(key, value));

const log: Log = {
severityText: level,
body: {
stringValue: message,
},
attributes,
timeUnixNano: `${new Date().getTime().toString()}000000`,
traceId: scope.getPropagationContext().traceId,
severityNumber,
};

const maybeSeverityNumber = SEVERITY_TEXT_TO_SEVERITY_NUMBER[level];
if (maybeSeverityNumber !== undefined && log.severityNumber === undefined) {
log.severityNumber = maybeSeverityNumber;
}

addToLogBuffer(client, log, scope);
}
5 changes: 5 additions & 0 deletions packages/core/src/types-hoist/options.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,12 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
* Options which are in beta, or otherwise not guaranteed to be stable.
*/
_experiments?: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[key: string]: any;
/**
* If logs support should be enabled. Defaults to false.
*/
enableLogs?: boolean;
};

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config-sdk/src/base.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ module.exports = {
// Make sure all expressions are used. Turned off in tests
// Must disable base rule to prevent false positives
'no-unused-expressions': 'off',
'@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true }],
'@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true, allowTaggedTemplates: true }],

// Make sure Promises are handled appropriately
'@typescript-eslint/no-floating-promises': ['error', { ignoreVoid: false }],
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
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
10 changes: 5 additions & 5 deletions .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init'),
gzip: true,
limit: '24 KB',
limit: '25 KB',
},
{
name: '@sentry/browser - with treeshaking flags',
Expand DownExpand Up@@ -40,14 +40,14 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration'),
gzip: true,
limit: '37.5 KB',
limit: '38 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay)',
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
gzip: true,
limit: '75.2 KB',
limit: '77 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
Expand DownExpand Up@@ -79,7 +79,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
gzip: true,
limit: '80 KB',
limit: '82 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand DownExpand Up@@ -210,7 +210,7 @@ module.exports = [
import: createImport('init'),
ignore: ['next/router', 'next/constants'],
gzip: true,
limit: '41 KB',
limit: '43 KB',
},
// SvelteKit SDK (ESM)
{
Expand Down
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,36 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.4.0-alpha.0

This is an alpha release that includes experimental functionality for the new logs API in Sentry. Support for these methods are only avaliable in the browser and core SDKs.

- feat(logs): Add experimental user-callable logging methods (#15442)

Logging is gated by an experimental option, `_experiments.enableLogs`.

```js
Sentry.init({
_experiments: {
enableLogs: true,
},
});
```

These API are exposed in the `Sentry._experiment_log` namespace.

On the high level, there are functions for each of the logging severity levels `critical`, `fatal`, `error`, `warn`, `info`, `debug`, `trace`. These functions are tagged template functions, so they use a special string template syntax that we use to parameterize functions accordingly.

```js
Sentry._experiment_log.info`user ${username} just bought ${item}!`;
```

If you want more custom usage, we also expose a `captureLog` method that allows you to pass custom attributes, but it's less easy to use than the tagged template functions.

```js
Sentry._experiment_log.captureLog('error', 'Hello world!', { 'user.id': 123 });
```

## 9.3.0

### Important Changes
Expand Down
1 change: 1 addition & 0 deletions packages/browser/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ export {
extraErrorDataIntegration,
rewriteFramesIntegration,
captureFeedback,
_experiment_log,
} from '@sentry/core';

export { replayIntegration, getReplay } from '@sentry-internal/replay';
Expand Down
67 changes: 67 additions & 0 deletions packages/core/src/exports.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import { captureLog, sendLog } from './log';
import type { CaptureContext } from './scope';
import { closeSession, makeSession, updateSession } from './session';
import type {
Expand All@@ -10,6 +11,7 @@ import type {
Extra,
Extras,
FinishedCheckIn,
LogSeverityLevel,
MonitorConfig,
Primitive,
Session,
Expand DownExpand Up@@ -334,3 +336,68 @@ export function captureSession(end: boolean = false): void {
// only send the update
_sendSessionUpdate();
}

type OmitFirstArg<F> = F extends (x: LogSeverityLevel, ...args: infer P) => infer R ? (...args: P) => R : never;

/**
* A namespace for experimental logging functions.
*
* @experimental Will be removed in future versions. Do not use.
*/
export const _experiment_log = {
/**
* A utility to record a log with level 'TRACE' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.trace`user ${username} just bought ${item}!`
*/
trace: sendLog.bind(null, 'trace') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'DEBUG' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.debug`user ${username} just bought ${item}!`
*/
debug: sendLog.bind(null, 'debug') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'INFO' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.info`user ${username} just bought ${item}!`
*/
info: sendLog.bind(null, 'info') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'INFO' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.log`user ${username} just bought ${item}!`
*/
log: sendLog.bind(null, 'log') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'ERROR' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.error`user ${username} just bought ${item}!`
*/
error: sendLog.bind(null, 'error') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'WARN' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.warn`user ${username} just bought ${item}!`
*/
warn: sendLog.bind(null, 'warn') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'FATAL' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.warn`user ${username} just bought ${item}!`
*/
fatal: sendLog.bind(null, 'fatal') as OmitFirstArg<typeof sendLog>,
/**
* A flexible utility to record a log with a custom level and send it to sentry.
*
* You can optionally pass in custom attributes and a custom severity number to be attached to the log.
*/
captureLog,
};
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export {
endSession,
captureSession,
addEventProcessor,
_experiment_log,
} from './exports';
export {
getCurrentScope,
Expand Down
188 changes: 188 additions & 0 deletions packages/core/src/log.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
import type { Client } from './client';
import { getClient, getCurrentScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import type { Scope } from './scope';
import { getDynamicSamplingContextFromScope } from './tracing';
import type { DynamicSamplingContext, LogEnvelope, LogItem } from './types-hoist/envelope';
import type { Log, LogAttribute, LogSeverityLevel } from './types-hoist/log';
import { createEnvelope, dropUndefinedKeys, dsnToString, logger } from './utils-hoist';

const LOG_BUFFER_MAX_LENGTH = 25;

let GLOBAL_LOG_BUFFER: Log[] = [];

let isFlushingLogs = false;

const SEVERITY_TEXT_TO_SEVERITY_NUMBER: Partial<Record<LogSeverityLevel | 'log', number>> = {
trace: 1,
debug: 5,
info: 9,
log: 10,
warn: 13,
error: 17,
fatal: 21,
};

/**
* Creates envelope item for a single log
*/
export function createLogEnvelopeItem(log: Log): LogItem {
const headers: LogItem[0] = {
type: 'otel_log',
};

return [headers, log];
}

/**
* Records a log and sends it to sentry.
*
* Logs represent a message (and optionally some structured data) which provide context for a trace or error.
* Ex: sentry.addLog({level: 'warning', message: `user ${user} just bought ${item}`, attributes: {user, item}}
*
* @params log - the log object which will be sent
*/
function createLogEnvelope(logs: Log[], client: Client, scope: Scope): LogEnvelope {
const dsc = getDynamicSamplingContextFromScope(client, scope);

const dsn = client.getDsn();

const headers: LogEnvelope[0] = {
trace: dropUndefinedKeys(dsc) as DynamicSamplingContext,
...(dsn ? { dsn: dsnToString(dsn) } : {}),
};

return createEnvelope<LogEnvelope>(headers, logs.map(createLogEnvelopeItem));
}

function valueToAttribute(key: string, value: unknown): LogAttribute {
switch (typeof value) {
case 'number':
return {
key,
value: { doubleValue: value },
};
case 'boolean':
return {
key,
value: { boolValue: value },
};
case 'string':
return {
key,
value: { stringValue: value },
};
default:
return {
key,
value: { stringValue: JSON.stringify(value) ?? '' },
};
}
}

function addToLogBuffer(client: Client, log: Log, scope: Scope): void {
function sendLogs(flushedLogs: Log[]): void {
const envelope = createLogEnvelope(flushedLogs, client, scope);
// eslint-disable-next-line @typescript-eslint/no-floating-promises
void client.sendEnvelope(envelope);
}

if (GLOBAL_LOG_BUFFER.length >= LOG_BUFFER_MAX_LENGTH) {
sendLogs(GLOBAL_LOG_BUFFER);
GLOBAL_LOG_BUFFER = [];
} else {
GLOBAL_LOG_BUFFER.push(log);
}

// this is the first time logs have been enabled, let's kick off an interval to flush them
// we should only do this once.
if (!isFlushingLogs) {
setInterval(() => {
if (GLOBAL_LOG_BUFFER.length > 0) {
sendLogs(GLOBAL_LOG_BUFFER);
GLOBAL_LOG_BUFFER = [];
}
}, 5000);
}
isFlushingLogs = true;
}

/**
* A utility function to be able to create methods like Sentry.info`...` that use tagged template functions.
*
* The first parameter is bound with, e.g., const info = captureLog.bind(null, 'info')
* The other parameters are in the format to be passed a tagged template, Sentry.info`hello ${world}`
*/
export function sendLog(level: LogSeverityLevel, messageArr: TemplateStringsArray, ...values: unknown[]): void {
const message = messageArr.reduce((acc, str, i) => acc + str + (JSON.stringify(values[i]) ?? ''), '');

const attributes = values.reduce<Record<string, unknown>>(
(acc, value, index) => {
acc[`sentry.message.parameters.${index}`] = value;
return acc;
},
{
'sentry.message.template': messageArr.map((s, i) => s + (i < messageArr.length - 1 ? `$param.${i}` : '')).join(''),
},
);

captureLog(level, message, attributes);
}

/**
* Sends a log to Sentry.
*/
export function captureLog(
level: LogSeverityLevel,
message: string,
customAttributes: Record<string, unknown> = {},
severityNumber?: number,
): void {
const client = getClient();

if (!client) {
DEBUG_BUILD && logger.warn('No client available, log will not be captured.');
return;
}

if (!client.getOptions()._experiments?.enableLogs) {
DEBUG_BUILD && logger.warn('logging option not enabled, log will not be captured.');
return;
}

const { release, environment } = client.getOptions();

const logAttributes = {
...customAttributes,
};

if (release) {
logAttributes['sentry.release'] = release;
}

if (environment) {
logAttributes['sentry.environment'] = environment;
}

const scope = getCurrentScope();

const attributes = Object.entries(logAttributes).map<LogAttribute>(([key, value]) => valueToAttribute(key, value));

const log: Log = {
severityText: level,
body: {
stringValue: message,
},
attributes,
timeUnixNano: `${new Date().getTime().toString()}000000`,
traceId: scope.getPropagationContext().traceId,
severityNumber,
};

const maybeSeverityNumber = SEVERITY_TEXT_TO_SEVERITY_NUMBER[level];
if (maybeSeverityNumber !== undefined && log.severityNumber === undefined) {
log.severityNumber = maybeSeverityNumber;
}

addToLogBuffer(client, log, scope);
}
5 changes: 5 additions & 0 deletions packages/core/src/types-hoist/options.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,12 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
* Options which are in beta, or otherwise not guaranteed to be stable.
*/
_experiments?: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[key: string]: any;
/**
* If logs support should be enabled. Defaults to false.
*/
enableLogs?: boolean;
};

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config-sdk/src/base.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ module.exports = {
// Make sure all expressions are used. Turned off in tests
// Must disable base rule to prevent false positives
'no-unused-expressions': 'off',
'@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true }],
'@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true, allowTaggedTemplates: true }],

// Make sure Promises are handled appropriately
'@typescript-eslint/no-floating-promises': ['error', { ignoreVoid: false }],
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
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
10 changes: 5 additions & 5 deletions .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init'),
gzip: true,
limit: '24 KB',
limit: '25 KB',
},
{
name: '@sentry/browser - with treeshaking flags',
Expand DownExpand Up@@ -40,14 +40,14 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration'),
gzip: true,
limit: '37.5 KB',
limit: '38 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay)',
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
gzip: true,
limit: '75.2 KB',
limit: '77 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
Expand DownExpand Up@@ -79,7 +79,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
gzip: true,
limit: '80 KB',
limit: '82 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand DownExpand Up@@ -210,7 +210,7 @@ module.exports = [
import: createImport('init'),
ignore: ['next/router', 'next/constants'],
gzip: true,
limit: '41 KB',
limit: '43 KB',
},
// SvelteKit SDK (ESM)
{
Expand Down
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,36 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.4.0-alpha.0

This is an alpha release that includes experimental functionality for the new logs API in Sentry. Support for these methods are only avaliable in the browser and core SDKs.

- feat(logs): Add experimental user-callable logging methods (#15442)

Logging is gated by an experimental option, `_experiments.enableLogs`.

```js
Sentry.init({
_experiments: {
enableLogs: true,
},
});
```

These API are exposed in the `Sentry._experiment_log` namespace.

On the high level, there are functions for each of the logging severity levels `critical`, `fatal`, `error`, `warn`, `info`, `debug`, `trace`. These functions are tagged template functions, so they use a special string template syntax that we use to parameterize functions accordingly.

```js
Sentry._experiment_log.info`user ${username} just bought ${item}!`;
```

If you want more custom usage, we also expose a `captureLog` method that allows you to pass custom attributes, but it's less easy to use than the tagged template functions.

```js
Sentry._experiment_log.captureLog('error', 'Hello world!', { 'user.id': 123 });
```

## 9.3.0

### Important Changes
Expand Down
1 change: 1 addition & 0 deletions packages/browser/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ export {
extraErrorDataIntegration,
rewriteFramesIntegration,
captureFeedback,
_experiment_log,
} from '@sentry/core';

export { replayIntegration, getReplay } from '@sentry-internal/replay';
Expand Down
67 changes: 67 additions & 0 deletions packages/core/src/exports.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import { captureLog, sendLog } from './log';
import type { CaptureContext } from './scope';
import { closeSession, makeSession, updateSession } from './session';
import type {
Expand All@@ -10,6 +11,7 @@ import type {
Extra,
Extras,
FinishedCheckIn,
LogSeverityLevel,
MonitorConfig,
Primitive,
Session,
Expand DownExpand Up@@ -334,3 +336,68 @@ export function captureSession(end: boolean = false): void {
// only send the update
_sendSessionUpdate();
}

type OmitFirstArg<F> = F extends (x: LogSeverityLevel, ...args: infer P) => infer R ? (...args: P) => R : never;

/**
* A namespace for experimental logging functions.
*
* @experimental Will be removed in future versions. Do not use.
*/
export const _experiment_log = {
/**
* A utility to record a log with level 'TRACE' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.trace`user ${username} just bought ${item}!`
*/
trace: sendLog.bind(null, 'trace') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'DEBUG' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.debug`user ${username} just bought ${item}!`
*/
debug: sendLog.bind(null, 'debug') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'INFO' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.info`user ${username} just bought ${item}!`
*/
info: sendLog.bind(null, 'info') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'INFO' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.log`user ${username} just bought ${item}!`
*/
log: sendLog.bind(null, 'log') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'ERROR' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.error`user ${username} just bought ${item}!`
*/
error: sendLog.bind(null, 'error') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'WARN' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.warn`user ${username} just bought ${item}!`
*/
warn: sendLog.bind(null, 'warn') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'FATAL' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.warn`user ${username} just bought ${item}!`
*/
fatal: sendLog.bind(null, 'fatal') as OmitFirstArg<typeof sendLog>,
/**
* A flexible utility to record a log with a custom level and send it to sentry.
*
* You can optionally pass in custom attributes and a custom severity number to be attached to the log.
*/
captureLog,
};
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export {
endSession,
captureSession,
addEventProcessor,
_experiment_log,
} from './exports';
export {
getCurrentScope,
Expand Down
188 changes: 188 additions & 0 deletions packages/core/src/log.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
import type { Client } from './client';
import { getClient, getCurrentScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import type { Scope } from './scope';
import { getDynamicSamplingContextFromScope } from './tracing';
import type { DynamicSamplingContext, LogEnvelope, LogItem } from './types-hoist/envelope';
import type { Log, LogAttribute, LogSeverityLevel } from './types-hoist/log';
import { createEnvelope, dropUndefinedKeys, dsnToString, logger } from './utils-hoist';

const LOG_BUFFER_MAX_LENGTH = 25;

let GLOBAL_LOG_BUFFER: Log[] = [];

let isFlushingLogs = false;

const SEVERITY_TEXT_TO_SEVERITY_NUMBER: Partial<Record<LogSeverityLevel | 'log', number>> = {
trace: 1,
debug: 5,
info: 9,
log: 10,
warn: 13,
error: 17,
fatal: 21,
};

/**
* Creates envelope item for a single log
*/
export function createLogEnvelopeItem(log: Log): LogItem {
const headers: LogItem[0] = {
type: 'otel_log',
};

return [headers, log];
}

/**
* Records a log and sends it to sentry.
*
* Logs represent a message (and optionally some structured data) which provide context for a trace or error.
* Ex: sentry.addLog({level: 'warning', message: `user ${user} just bought ${item}`, attributes: {user, item}}
*
* @params log - the log object which will be sent
*/
function createLogEnvelope(logs: Log[], client: Client, scope: Scope): LogEnvelope {
const dsc = getDynamicSamplingContextFromScope(client, scope);

const dsn = client.getDsn();

const headers: LogEnvelope[0] = {
trace: dropUndefinedKeys(dsc) as DynamicSamplingContext,
...(dsn ? { dsn: dsnToString(dsn) } : {}),
};

return createEnvelope<LogEnvelope>(headers, logs.map(createLogEnvelopeItem));
}

function valueToAttribute(key: string, value: unknown): LogAttribute {
switch (typeof value) {
case 'number':
return {
key,
value: { doubleValue: value },
};
case 'boolean':
return {
key,
value: { boolValue: value },
};
case 'string':
return {
key,
value: { stringValue: value },
};
default:
return {
key,
value: { stringValue: JSON.stringify(value) ?? '' },
};
}
}

function addToLogBuffer(client: Client, log: Log, scope: Scope): void {
function sendLogs(flushedLogs: Log[]): void {
const envelope = createLogEnvelope(flushedLogs, client, scope);
// eslint-disable-next-line @typescript-eslint/no-floating-promises
void client.sendEnvelope(envelope);
}

if (GLOBAL_LOG_BUFFER.length >= LOG_BUFFER_MAX_LENGTH) {
sendLogs(GLOBAL_LOG_BUFFER);
GLOBAL_LOG_BUFFER = [];
} else {
GLOBAL_LOG_BUFFER.push(log);
}

// this is the first time logs have been enabled, let's kick off an interval to flush them
// we should only do this once.
if (!isFlushingLogs) {
setInterval(() => {
if (GLOBAL_LOG_BUFFER.length > 0) {
sendLogs(GLOBAL_LOG_BUFFER);
GLOBAL_LOG_BUFFER = [];
}
}, 5000);
}
isFlushingLogs = true;
}

/**
* A utility function to be able to create methods like Sentry.info`...` that use tagged template functions.
*
* The first parameter is bound with, e.g., const info = captureLog.bind(null, 'info')
* The other parameters are in the format to be passed a tagged template, Sentry.info`hello ${world}`
*/
export function sendLog(level: LogSeverityLevel, messageArr: TemplateStringsArray, ...values: unknown[]): void {
const message = messageArr.reduce((acc, str, i) => acc + str + (JSON.stringify(values[i]) ?? ''), '');

const attributes = values.reduce<Record<string, unknown>>(
(acc, value, index) => {
acc[`sentry.message.parameters.${index}`] = value;
return acc;
},
{
'sentry.message.template': messageArr.map((s, i) => s + (i < messageArr.length - 1 ? `$param.${i}` : '')).join(''),
},
);

captureLog(level, message, attributes);
}

/**
* Sends a log to Sentry.
*/
export function captureLog(
level: LogSeverityLevel,
message: string,
customAttributes: Record<string, unknown> = {},
severityNumber?: number,
): void {
const client = getClient();

if (!client) {
DEBUG_BUILD && logger.warn('No client available, log will not be captured.');
return;
}

if (!client.getOptions()._experiments?.enableLogs) {
DEBUG_BUILD && logger.warn('logging option not enabled, log will not be captured.');
return;
}

const { release, environment } = client.getOptions();

const logAttributes = {
...customAttributes,
};

if (release) {
logAttributes['sentry.release'] = release;
}

if (environment) {
logAttributes['sentry.environment'] = environment;
}

const scope = getCurrentScope();

const attributes = Object.entries(logAttributes).map<LogAttribute>(([key, value]) => valueToAttribute(key, value));

const log: Log = {
severityText: level,
body: {
stringValue: message,
},
attributes,
timeUnixNano: `${new Date().getTime().toString()}000000`,
traceId: scope.getPropagationContext().traceId,
severityNumber,
};

const maybeSeverityNumber = SEVERITY_TEXT_TO_SEVERITY_NUMBER[level];
if (maybeSeverityNumber !== undefined && log.severityNumber === undefined) {
log.severityNumber = maybeSeverityNumber;
}

addToLogBuffer(client, log, scope);
}
5 changes: 5 additions & 0 deletions packages/core/src/types-hoist/options.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,12 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
* Options which are in beta, or otherwise not guaranteed to be stable.
*/
_experiments?: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[key: string]: any;
/**
* If logs support should be enabled. Defaults to false.
*/
enableLogs?: boolean;
};

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config-sdk/src/base.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ module.exports = {
// Make sure all expressions are used. Turned off in tests
// Must disable base rule to prevent false positives
'no-unused-expressions': 'off',
'@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true }],
'@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true, allowTaggedTemplates: true }],

// Make sure Promises are handled appropriately
'@typescript-eslint/no-floating-promises': ['error', { ignoreVoid: false }],
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
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
10 changes: 5 additions & 5 deletions .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init'),
gzip: true,
limit: '24 KB',
limit: '25 KB',
},
{
name: '@sentry/browser - with treeshaking flags',
Expand DownExpand Up@@ -40,14 +40,14 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration'),
gzip: true,
limit: '37.5 KB',
limit: '38 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay)',
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
gzip: true,
limit: '75.2 KB',
limit: '77 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
Expand DownExpand Up@@ -79,7 +79,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
gzip: true,
limit: '80 KB',
limit: '82 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand DownExpand Up@@ -210,7 +210,7 @@ module.exports = [
import: createImport('init'),
ignore: ['next/router', 'next/constants'],
gzip: true,
limit: '41 KB',
limit: '43 KB',
},
// SvelteKit SDK (ESM)
{
Expand Down
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,36 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.4.0-alpha.0

This is an alpha release that includes experimental functionality for the new logs API in Sentry. Support for these methods are only avaliable in the browser and core SDKs.

- feat(logs): Add experimental user-callable logging methods (#15442)

Logging is gated by an experimental option, `_experiments.enableLogs`.

```js
Sentry.init({
_experiments: {
enableLogs: true,
},
});
```

These API are exposed in the `Sentry._experiment_log` namespace.

On the high level, there are functions for each of the logging severity levels `critical`, `fatal`, `error`, `warn`, `info`, `debug`, `trace`. These functions are tagged template functions, so they use a special string template syntax that we use to parameterize functions accordingly.

```js
Sentry._experiment_log.info`user ${username} just bought ${item}!`;
```

If you want more custom usage, we also expose a `captureLog` method that allows you to pass custom attributes, but it's less easy to use than the tagged template functions.

```js
Sentry._experiment_log.captureLog('error', 'Hello world!', { 'user.id': 123 });
```

## 9.3.0

### Important Changes
Expand Down
1 change: 1 addition & 0 deletions packages/browser/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ export {
extraErrorDataIntegration,
rewriteFramesIntegration,
captureFeedback,
_experiment_log,
} from '@sentry/core';

export { replayIntegration, getReplay } from '@sentry-internal/replay';
Expand Down
67 changes: 67 additions & 0 deletions packages/core/src/exports.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import { captureLog, sendLog } from './log';
import type { CaptureContext } from './scope';
import { closeSession, makeSession, updateSession } from './session';
import type {
Expand All@@ -10,6 +11,7 @@ import type {
Extra,
Extras,
FinishedCheckIn,
LogSeverityLevel,
MonitorConfig,
Primitive,
Session,
Expand DownExpand Up@@ -334,3 +336,68 @@ export function captureSession(end: boolean = false): void {
// only send the update
_sendSessionUpdate();
}

type OmitFirstArg<F> = F extends (x: LogSeverityLevel, ...args: infer P) => infer R ? (...args: P) => R : never;

/**
* A namespace for experimental logging functions.
*
* @experimental Will be removed in future versions. Do not use.
*/
export const _experiment_log = {
/**
* A utility to record a log with level 'TRACE' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.trace`user ${username} just bought ${item}!`
*/
trace: sendLog.bind(null, 'trace') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'DEBUG' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.debug`user ${username} just bought ${item}!`
*/
debug: sendLog.bind(null, 'debug') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'INFO' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.info`user ${username} just bought ${item}!`
*/
info: sendLog.bind(null, 'info') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'INFO' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.log`user ${username} just bought ${item}!`
*/
log: sendLog.bind(null, 'log') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'ERROR' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.error`user ${username} just bought ${item}!`
*/
error: sendLog.bind(null, 'error') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'WARN' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.warn`user ${username} just bought ${item}!`
*/
warn: sendLog.bind(null, 'warn') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'FATAL' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.warn`user ${username} just bought ${item}!`
*/
fatal: sendLog.bind(null, 'fatal') as OmitFirstArg<typeof sendLog>,
/**
* A flexible utility to record a log with a custom level and send it to sentry.
*
* You can optionally pass in custom attributes and a custom severity number to be attached to the log.
*/
captureLog,
};
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export {
endSession,
captureSession,
addEventProcessor,
_experiment_log,
} from './exports';
export {
getCurrentScope,
Expand Down
188 changes: 188 additions & 0 deletions packages/core/src/log.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
import type { Client } from './client';
import { getClient, getCurrentScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import type { Scope } from './scope';
import { getDynamicSamplingContextFromScope } from './tracing';
import type { DynamicSamplingContext, LogEnvelope, LogItem } from './types-hoist/envelope';
import type { Log, LogAttribute, LogSeverityLevel } from './types-hoist/log';
import { createEnvelope, dropUndefinedKeys, dsnToString, logger } from './utils-hoist';

const LOG_BUFFER_MAX_LENGTH = 25;

let GLOBAL_LOG_BUFFER: Log[] = [];

let isFlushingLogs = false;

const SEVERITY_TEXT_TO_SEVERITY_NUMBER: Partial<Record<LogSeverityLevel | 'log', number>> = {
trace: 1,
debug: 5,
info: 9,
log: 10,
warn: 13,
error: 17,
fatal: 21,
};

/**
* Creates envelope item for a single log
*/
export function createLogEnvelopeItem(log: Log): LogItem {
const headers: LogItem[0] = {
type: 'otel_log',
};

return [headers, log];
}

/**
* Records a log and sends it to sentry.
*
* Logs represent a message (and optionally some structured data) which provide context for a trace or error.
* Ex: sentry.addLog({level: 'warning', message: `user ${user} just bought ${item}`, attributes: {user, item}}
*
* @params log - the log object which will be sent
*/
function createLogEnvelope(logs: Log[], client: Client, scope: Scope): LogEnvelope {
const dsc = getDynamicSamplingContextFromScope(client, scope);

const dsn = client.getDsn();

const headers: LogEnvelope[0] = {
trace: dropUndefinedKeys(dsc) as DynamicSamplingContext,
...(dsn ? { dsn: dsnToString(dsn) } : {}),
};

return createEnvelope<LogEnvelope>(headers, logs.map(createLogEnvelopeItem));
}

function valueToAttribute(key: string, value: unknown): LogAttribute {
switch (typeof value) {
case 'number':
return {
key,
value: { doubleValue: value },
};
case 'boolean':
return {
key,
value: { boolValue: value },
};
case 'string':
return {
key,
value: { stringValue: value },
};
default:
return {
key,
value: { stringValue: JSON.stringify(value) ?? '' },
};
}
}

function addToLogBuffer(client: Client, log: Log, scope: Scope): void {
function sendLogs(flushedLogs: Log[]): void {
const envelope = createLogEnvelope(flushedLogs, client, scope);
// eslint-disable-next-line @typescript-eslint/no-floating-promises
void client.sendEnvelope(envelope);
}

if (GLOBAL_LOG_BUFFER.length >= LOG_BUFFER_MAX_LENGTH) {
sendLogs(GLOBAL_LOG_BUFFER);
GLOBAL_LOG_BUFFER = [];
} else {
GLOBAL_LOG_BUFFER.push(log);
}

// this is the first time logs have been enabled, let's kick off an interval to flush them
// we should only do this once.
if (!isFlushingLogs) {
setInterval(() => {
if (GLOBAL_LOG_BUFFER.length > 0) {
sendLogs(GLOBAL_LOG_BUFFER);
GLOBAL_LOG_BUFFER = [];
}
}, 5000);
}
isFlushingLogs = true;
}

/**
* A utility function to be able to create methods like Sentry.info`...` that use tagged template functions.
*
* The first parameter is bound with, e.g., const info = captureLog.bind(null, 'info')
* The other parameters are in the format to be passed a tagged template, Sentry.info`hello ${world}`
*/
export function sendLog(level: LogSeverityLevel, messageArr: TemplateStringsArray, ...values: unknown[]): void {
const message = messageArr.reduce((acc, str, i) => acc + str + (JSON.stringify(values[i]) ?? ''), '');

const attributes = values.reduce<Record<string, unknown>>(
(acc, value, index) => {
acc[`sentry.message.parameters.${index}`] = value;
return acc;
},
{
'sentry.message.template': messageArr.map((s, i) => s + (i < messageArr.length - 1 ? `$param.${i}` : '')).join(''),
},
);

captureLog(level, message, attributes);
}

/**
* Sends a log to Sentry.
*/
export function captureLog(
level: LogSeverityLevel,
message: string,
customAttributes: Record<string, unknown> = {},
severityNumber?: number,
): void {
const client = getClient();

if (!client) {
DEBUG_BUILD && logger.warn('No client available, log will not be captured.');
return;
}

if (!client.getOptions()._experiments?.enableLogs) {
DEBUG_BUILD && logger.warn('logging option not enabled, log will not be captured.');
return;
}

const { release, environment } = client.getOptions();

const logAttributes = {
...customAttributes,
};

if (release) {
logAttributes['sentry.release'] = release;
}

if (environment) {
logAttributes['sentry.environment'] = environment;
}

const scope = getCurrentScope();

const attributes = Object.entries(logAttributes).map<LogAttribute>(([key, value]) => valueToAttribute(key, value));

const log: Log = {
severityText: level,
body: {
stringValue: message,
},
attributes,
timeUnixNano: `${new Date().getTime().toString()}000000`,
traceId: scope.getPropagationContext().traceId,
severityNumber,
};

const maybeSeverityNumber = SEVERITY_TEXT_TO_SEVERITY_NUMBER[level];
if (maybeSeverityNumber !== undefined && log.severityNumber === undefined) {
log.severityNumber = maybeSeverityNumber;
}

addToLogBuffer(client, log, scope);
}
5 changes: 5 additions & 0 deletions packages/core/src/types-hoist/options.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,12 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
* Options which are in beta, or otherwise not guaranteed to be stable.
*/
_experiments?: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[key: string]: any;
/**
* If logs support should be enabled. Defaults to false.
*/
enableLogs?: boolean;
};

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config-sdk/src/base.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ module.exports = {
// Make sure all expressions are used. Turned off in tests
// Must disable base rule to prevent false positives
'no-unused-expressions': 'off',
'@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true }],
'@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true, allowTaggedTemplates: true }],

// Make sure Promises are handled appropriately
'@typescript-eslint/no-floating-promises': ['error', { ignoreVoid: false }],
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
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
10 changes: 5 additions & 5 deletions .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init'),
gzip: true,
limit: '24 KB',
limit: '25 KB',
},
{
name: '@sentry/browser - with treeshaking flags',
Expand DownExpand Up@@ -40,14 +40,14 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration'),
gzip: true,
limit: '37.5 KB',
limit: '38 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay)',
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
gzip: true,
limit: '75.2 KB',
limit: '77 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
Expand DownExpand Up@@ -79,7 +79,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
gzip: true,
limit: '80 KB',
limit: '82 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand DownExpand Up@@ -210,7 +210,7 @@ module.exports = [
import: createImport('init'),
ignore: ['next/router', 'next/constants'],
gzip: true,
limit: '41 KB',
limit: '43 KB',
},
// SvelteKit SDK (ESM)
{
Expand Down
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,36 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.4.0-alpha.0

This is an alpha release that includes experimental functionality for the new logs API in Sentry. Support for these methods are only avaliable in the browser and core SDKs.

- feat(logs): Add experimental user-callable logging methods (#15442)

Logging is gated by an experimental option, `_experiments.enableLogs`.

```js
Sentry.init({
_experiments: {
enableLogs: true,
},
});
```

These API are exposed in the `Sentry._experiment_log` namespace.

On the high level, there are functions for each of the logging severity levels `critical`, `fatal`, `error`, `warn`, `info`, `debug`, `trace`. These functions are tagged template functions, so they use a special string template syntax that we use to parameterize functions accordingly.

```js
Sentry._experiment_log.info`user ${username} just bought ${item}!`;
```

If you want more custom usage, we also expose a `captureLog` method that allows you to pass custom attributes, but it's less easy to use than the tagged template functions.

```js
Sentry._experiment_log.captureLog('error', 'Hello world!', { 'user.id': 123 });
```

## 9.3.0

### Important Changes
Expand Down
1 change: 1 addition & 0 deletions packages/browser/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ export {
extraErrorDataIntegration,
rewriteFramesIntegration,
captureFeedback,
_experiment_log,
} from '@sentry/core';

export { replayIntegration, getReplay } from '@sentry-internal/replay';
Expand Down
67 changes: 67 additions & 0 deletions packages/core/src/exports.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import { captureLog, sendLog } from './log';
import type { CaptureContext } from './scope';
import { closeSession, makeSession, updateSession } from './session';
import type {
Expand All@@ -10,6 +11,7 @@ import type {
Extra,
Extras,
FinishedCheckIn,
LogSeverityLevel,
MonitorConfig,
Primitive,
Session,
Expand DownExpand Up@@ -334,3 +336,68 @@ export function captureSession(end: boolean = false): void {
// only send the update
_sendSessionUpdate();
}

type OmitFirstArg<F> = F extends (x: LogSeverityLevel, ...args: infer P) => infer R ? (...args: P) => R : never;

/**
* A namespace for experimental logging functions.
*
* @experimental Will be removed in future versions. Do not use.
*/
export const _experiment_log = {
/**
* A utility to record a log with level 'TRACE' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.trace`user ${username} just bought ${item}!`
*/
trace: sendLog.bind(null, 'trace') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'DEBUG' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.debug`user ${username} just bought ${item}!`
*/
debug: sendLog.bind(null, 'debug') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'INFO' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.info`user ${username} just bought ${item}!`
*/
info: sendLog.bind(null, 'info') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'INFO' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.log`user ${username} just bought ${item}!`
*/
log: sendLog.bind(null, 'log') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'ERROR' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.error`user ${username} just bought ${item}!`
*/
error: sendLog.bind(null, 'error') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'WARN' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.warn`user ${username} just bought ${item}!`
*/
warn: sendLog.bind(null, 'warn') as OmitFirstArg<typeof sendLog>,
/**
* A utility to record a log with level 'FATAL' and send it to sentry.
*
* Logs represent a message and some parameters which provide context for a trace or error.
* Ex: Sentry._experiment_log.warn`user ${username} just bought ${item}!`
*/
fatal: sendLog.bind(null, 'fatal') as OmitFirstArg<typeof sendLog>,
/**
* A flexible utility to record a log with a custom level and send it to sentry.
*
* You can optionally pass in custom attributes and a custom severity number to be attached to the log.
*/
captureLog,
};
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export {
endSession,
captureSession,
addEventProcessor,
_experiment_log,
} from './exports';
export {
getCurrentScope,
Expand Down
188 changes: 188 additions & 0 deletions packages/core/src/log.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
import type { Client } from './client';
import { getClient, getCurrentScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import type { Scope } from './scope';
import { getDynamicSamplingContextFromScope } from './tracing';
import type { DynamicSamplingContext, LogEnvelope, LogItem } from './types-hoist/envelope';
import type { Log, LogAttribute, LogSeverityLevel } from './types-hoist/log';
import { createEnvelope, dropUndefinedKeys, dsnToString, logger } from './utils-hoist';

const LOG_BUFFER_MAX_LENGTH = 25;

let GLOBAL_LOG_BUFFER: Log[] = [];

let isFlushingLogs = false;

const SEVERITY_TEXT_TO_SEVERITY_NUMBER: Partial<Record<LogSeverityLevel | 'log', number>> = {
trace: 1,
debug: 5,
info: 9,
log: 10,
warn: 13,
error: 17,
fatal: 21,
};

/**
* Creates envelope item for a single log
*/
export function createLogEnvelopeItem(log: Log): LogItem {
const headers: LogItem[0] = {
type: 'otel_log',
};

return [headers, log];
}

/**
* Records a log and sends it to sentry.
*
* Logs represent a message (and optionally some structured data) which provide context for a trace or error.
* Ex: sentry.addLog({level: 'warning', message: `user ${user} just bought ${item}`, attributes: {user, item}}
*
* @params log - the log object which will be sent
*/
function createLogEnvelope(logs: Log[], client: Client, scope: Scope): LogEnvelope {
const dsc = getDynamicSamplingContextFromScope(client, scope);

const dsn = client.getDsn();

const headers: LogEnvelope[0] = {
trace: dropUndefinedKeys(dsc) as DynamicSamplingContext,
...(dsn ? { dsn: dsnToString(dsn) } : {}),
};

return createEnvelope<LogEnvelope>(headers, logs.map(createLogEnvelopeItem));
}

function valueToAttribute(key: string, value: unknown): LogAttribute {
switch (typeof value) {
case 'number':
return {
key,
value: { doubleValue: value },
};
case 'boolean':
return {
key,
value: { boolValue: value },
};
case 'string':
return {
key,
value: { stringValue: value },
};
default:
return {
key,
value: { stringValue: JSON.stringify(value) ?? '' },
};
}
}

function addToLogBuffer(client: Client, log: Log, scope: Scope): void {
function sendLogs(flushedLogs: Log[]): void {
const envelope = createLogEnvelope(flushedLogs, client, scope);
// eslint-disable-next-line @typescript-eslint/no-floating-promises
void client.sendEnvelope(envelope);
}

if (GLOBAL_LOG_BUFFER.length >= LOG_BUFFER_MAX_LENGTH) {
sendLogs(GLOBAL_LOG_BUFFER);
GLOBAL_LOG_BUFFER = [];
} else {
GLOBAL_LOG_BUFFER.push(log);
}

// this is the first time logs have been enabled, let's kick off an interval to flush them
// we should only do this once.
if (!isFlushingLogs) {
setInterval(() => {
if (GLOBAL_LOG_BUFFER.length > 0) {
sendLogs(GLOBAL_LOG_BUFFER);
GLOBAL_LOG_BUFFER = [];
}
}, 5000);
}
isFlushingLogs = true;
}

/**
* A utility function to be able to create methods like Sentry.info`...` that use tagged template functions.
*
* The first parameter is bound with, e.g., const info = captureLog.bind(null, 'info')
* The other parameters are in the format to be passed a tagged template, Sentry.info`hello ${world}`
*/
export function sendLog(level: LogSeverityLevel, messageArr: TemplateStringsArray, ...values: unknown[]): void {
const message = messageArr.reduce((acc, str, i) => acc + str + (JSON.stringify(values[i]) ?? ''), '');

const attributes = values.reduce<Record<string, unknown>>(
(acc, value, index) => {
acc[`sentry.message.parameters.${index}`] = value;
return acc;
},
{
'sentry.message.template': messageArr.map((s, i) => s + (i < messageArr.length - 1 ? `$param.${i}` : '')).join(''),
},
);

captureLog(level, message, attributes);
}

/**
* Sends a log to Sentry.
*/
export function captureLog(
level: LogSeverityLevel,
message: string,
customAttributes: Record<string, unknown> = {},
severityNumber?: number,
): void {
const client = getClient();

if (!client) {
DEBUG_BUILD && logger.warn('No client available, log will not be captured.');
return;
}

if (!client.getOptions()._experiments?.enableLogs) {
DEBUG_BUILD && logger.warn('logging option not enabled, log will not be captured.');
return;
}

const { release, environment } = client.getOptions();

const logAttributes = {
...customAttributes,
};

if (release) {
logAttributes['sentry.release'] = release;
}

if (environment) {
logAttributes['sentry.environment'] = environment;
}

const scope = getCurrentScope();

const attributes = Object.entries(logAttributes).map<LogAttribute>(([key, value]) => valueToAttribute(key, value));

const log: Log = {
severityText: level,
body: {
stringValue: message,
},
attributes,
timeUnixNano: `${new Date().getTime().toString()}000000`,
traceId: scope.getPropagationContext().traceId,
severityNumber,
};

const maybeSeverityNumber = SEVERITY_TEXT_TO_SEVERITY_NUMBER[level];
if (maybeSeverityNumber !== undefined && log.severityNumber === undefined) {
log.severityNumber = maybeSeverityNumber;
}

addToLogBuffer(client, log, scope);
}
5 changes: 5 additions & 0 deletions packages/core/src/types-hoist/options.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,12 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
* Options which are in beta, or otherwise not guaranteed to be stable.
*/
_experiments?: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[key: string]: any;
/**
* If logs support should be enabled. Defaults to false.
*/
enableLogs?: boolean;
};

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config-sdk/src/base.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ module.exports = {
// Make sure all expressions are used. Turned off in tests
// Must disable base rule to prevent false positives
'no-unused-expressions': 'off',
'@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true }],
'@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true, allowTaggedTemplates: true }],

// Make sure Promises are handled appropriately
'@typescript-eslint/no-floating-promises': ['error', { ignoreVoid: false }],
Expand Down