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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
beforeSend() {
throw new Error('beforeSend failed');
},
});

Sentry.captureException(new Error('this should get dropped because beforeSend throws'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no extra error event when beforeSend throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'before_send',
},
],
},
})
.start()
.completed();
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
});

Sentry.addEventProcessor(async () => {
throw new Error('async event processor failed');
});

Sentry.captureException(new Error('this should get dropped because the async event processor rejects'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
});

Sentry.addEventProcessor(() => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this could also have a second scenario where we throw in an async event processor?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

yes good idea, added 👍

throw new Error('event processor failed');
});

Sentry.captureException(new Error('this should get dropped because the event processor throws'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no extra error event when an event processor throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'event_processor',
},
],
},
})
.start()
.completed();
});

test('records a client report and no extra error event when an async event processor rejects', async () => {
await createRunner(__dirname, 'scenario-async.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'event_processor',
},
],
},
})
.start()
.completed();
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
tracesSampleRate: 1,
tracesSampler: () => {
throw new Error('tracesSampler failed');
},
});

Sentry.startSpan({ name: 'sampled via tracesSampleRate fallback' }, () => {
// no-op
});

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();

@Lms24Lms24Sep 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: can we add a test what happens when we set tracesSampleRate: 1 that shows that the span is sent in this case?

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
tracesSampler: () => {
throw new Error('tracesSampler failed');
},
});

Sentry.startSpan({ name: 'this should not be sampled because tracesSampler throws' }, () => {
// no-op
});

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no error event when tracesSampler throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'span',
quantity: 1,
reason: 'sample_rate',
},
],
},
})
.start()
.completed();
});

test('sends the span when tracesSampler throws but tracesSampleRate is 1', async () => {
await createRunner(__dirname, 'scenario-fallback.ts')
.expect({
transaction: {
transaction: 'sampled via tracesSampleRate fallback',
},
})
.start()
.completed();
});
8 changes: 7 additions & 1 deletion packages/core/src/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { getClient, getIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import type { Breadcrumb, BreadcrumbHint } from './types/breadcrumb';
import { consoleSandbox } from './utils/debug-logger';
import { safeCallback } from './utils/safeCallback';
import { dateTimestampInSeconds } from './utils/time';

/**
Expand DownExpand Up@@ -28,7 +30,11 @@ export function addBreadcrumb(breadcrumb: Breadcrumb, hint?: BreadcrumbHint): vo
const timestamp = dateTimestampInSeconds();
const mergedBreadcrumb = { timestamp, ...breadcrumb };
const finalBreadcrumb = beforeBreadcrumb
? consoleSandbox(() => beforeBreadcrumb(mergedBreadcrumb, hint))
? safeCallback(
DEBUG_BUILD ? 'The `beforeBreadcrumb` callback threw an error, dropping the breadcrumb:' : '',
() => consoleSandbox(() => beforeBreadcrumb(mergedBreadcrumb, hint)),
() => null,
)
: mergedBreadcrumb;

if (finalBreadcrumb === null) return;
Expand Down
14 changes: 12 additions & 2 deletions packages/core/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
import { makePromiseBuffer, type PromiseBuffer, SENTRY_BUFFER_FULL_ERROR } from './utils/promisebuffer';
import { safeMathRandom } from './utils/randomSafeContext';
import { safeCallback } from './utils/safeCallback';
import { reparentChildSpans, shouldIgnoreSpan } from './utils/should-ignore-span';
import { safeUnref } from './utils/timer';
import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
Expand DownExpand Up@@ -1738,7 +1739,12 @@ function processBeforeSend(
let processedEvent = event;

if (isErrorEvent(processedEvent) && beforeSend) {
return beforeSend(processedEvent, hint);
const errorEvent = processedEvent;
return safeCallback(
DEBUG_BUILD ? 'The `beforeSend` callback threw an error, dropping the event:' : '',
() => beforeSend(errorEvent, hint),
() => null,
);
}

if (isTransactionEvent(processedEvent)) {
Expand DownExpand Up@@ -1809,7 +1815,11 @@ function processBeforeSend(
spanCountBeforeProcessing: spanCountBefore,
};
}
return beforeSendTransaction(processedEvent as TransactionEvent, hint);
return safeCallback(
DEBUG_BUILD ? 'The `beforeSendTransaction` callback threw an error, dropping the event:' : '',
() => beforeSendTransaction(processedEvent as TransactionEvent, hint),
() => null,
);
}
}

Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/eventProcessors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { Event, EventHint } from './types/event';
import type { EventProcessor } from './types/eventprocessor';
import { debug } from './utils/debug-logger';
import { isThenable } from './utils/is';
import { safeCallback } from './utils/safeCallback';
import { rejectedSyncPromise, resolvedSyncPromise } from './utils/syncpromise';

/**
Expand DownExpand Up@@ -34,9 +35,15 @@ function _notifyEventProcessors(
return event;
}

const result = processor({ ...event }, hint);
const processorName = `Event processor "${processor.id || '?'}"`;

DEBUG_BUILD && result === null && debug.log(`Event processor "${processor.id || '?'}" dropped event`);
const result = safeCallback(
DEBUG_BUILD ? `${processorName} threw an error, dropping event:` : '',
() => processor({ ...event }, hint),
() => null,
);

DEBUG_BUILD && result === null && debug.log(`${processorName} dropped event`);
Comment thread
sentry[bot] marked this conversation as resolved.

if (isThenable(result)) {
return result.then(final => _notifyEventProcessors(final, hint, processors, index + 1));
Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/logs/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type { Integration } from '../types/integration';
import type { Log, SerializedLog } from '../types/log';
import { consoleSandbox, debug } from '../utils/debug-logger';
import { isParameterizedString } from '../utils/is';
import { safeCallback } from '../utils/safeCallback';
import { getCombinedScopeData } from '../utils/scopeData';
import { getActiveSpan } from '../utils/spanUtils';
import { timestampInSeconds } from '../utils/time';
Expand DownExpand Up@@ -142,8 +143,14 @@ export function _INTERNAL_captureLog(

client.emit('beforeCaptureLog', processedLog);

// We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
const log = beforeSendLog ? consoleSandbox(() => beforeSendLog(processedLog)) : processedLog;
const log = beforeSendLog
? safeCallback(
DEBUG_BUILD ? 'The `beforeSendLog` callback threw an error, dropping the log:' : '',
// We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
() => consoleSandbox(() => beforeSendLog(processedLog)),
() => null,
)
: processedLog;
if (!log) {
client.recordDroppedEvent('before_send', 'log_item', 1);
DEBUG_BUILD && debug.warn('beforeSendLog returned null, log will not be captured.');
Expand Down
10 changes: 9 additions & 1 deletion packages/core/src/metrics/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type { Integration } from '../types/integration';
import type { Metric, SerializedMetric } from '../types/metric';
import type { User } from '../types/user';
import { debug } from '../utils/debug-logger';
import { safeCallback } from '../utils/safeCallback';
import { getCombinedScopeData } from '../utils/scopeData';
import { getActiveSpan } from '../utils/spanUtils';
import { timestampInSeconds } from '../utils/time';
Expand DownExpand Up@@ -181,9 +182,16 @@ export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: Internal

client.emit('processMetric', enrichedMetric);

const processedMetric = beforeSendMetric ? beforeSendMetric(enrichedMetric) : enrichedMetric;
const processedMetric = beforeSendMetric
? safeCallback(
DEBUG_BUILD ? 'The `beforeSendMetric` callback threw an error, dropping the metric:' : '',
() => beforeSendMetric(enrichedMetric),
() => null,
)
: enrichedMetric;

if (!processedMetric) {
client.recordDroppedEvent('before_send', 'metric', 1);
DEBUG_BUILD && debug.log('`beforeSendMetric` returned `null`, will not send metric.');
return;
}
Expand Down
Loading
Loading
, '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
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
beforeSend() {
throw new Error('beforeSend failed');
},
});

Sentry.captureException(new Error('this should get dropped because beforeSend throws'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no extra error event when beforeSend throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'before_send',
},
],
},
})
.start()
.completed();
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
});

Sentry.addEventProcessor(async () => {
throw new Error('async event processor failed');
});

Sentry.captureException(new Error('this should get dropped because the async event processor rejects'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
});

Sentry.addEventProcessor(() => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this could also have a second scenario where we throw in an async event processor?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

yes good idea, added 👍

throw new Error('event processor failed');
});

Sentry.captureException(new Error('this should get dropped because the event processor throws'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no extra error event when an event processor throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'event_processor',
},
],
},
})
.start()
.completed();
});

test('records a client report and no extra error event when an async event processor rejects', async () => {
await createRunner(__dirname, 'scenario-async.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'event_processor',
},
],
},
})
.start()
.completed();
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
tracesSampleRate: 1,
tracesSampler: () => {
throw new Error('tracesSampler failed');
},
});

Sentry.startSpan({ name: 'sampled via tracesSampleRate fallback' }, () => {
// no-op
});

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();

@Lms24Lms24Sep 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: can we add a test what happens when we set tracesSampleRate: 1 that shows that the span is sent in this case?

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
tracesSampler: () => {
throw new Error('tracesSampler failed');
},
});

Sentry.startSpan({ name: 'this should not be sampled because tracesSampler throws' }, () => {
// no-op
});

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no error event when tracesSampler throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'span',
quantity: 1,
reason: 'sample_rate',
},
],
},
})
.start()
.completed();
});

test('sends the span when tracesSampler throws but tracesSampleRate is 1', async () => {
await createRunner(__dirname, 'scenario-fallback.ts')
.expect({
transaction: {
transaction: 'sampled via tracesSampleRate fallback',
},
})
.start()
.completed();
});
8 changes: 7 additions & 1 deletion packages/core/src/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { getClient, getIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import type { Breadcrumb, BreadcrumbHint } from './types/breadcrumb';
import { consoleSandbox } from './utils/debug-logger';
import { safeCallback } from './utils/safeCallback';
import { dateTimestampInSeconds } from './utils/time';

/**
Expand DownExpand Up@@ -28,7 +30,11 @@ export function addBreadcrumb(breadcrumb: Breadcrumb, hint?: BreadcrumbHint): vo
const timestamp = dateTimestampInSeconds();
const mergedBreadcrumb = { timestamp, ...breadcrumb };
const finalBreadcrumb = beforeBreadcrumb
? consoleSandbox(() => beforeBreadcrumb(mergedBreadcrumb, hint))
? safeCallback(
DEBUG_BUILD ? 'The `beforeBreadcrumb` callback threw an error, dropping the breadcrumb:' : '',
() => consoleSandbox(() => beforeBreadcrumb(mergedBreadcrumb, hint)),
() => null,
)
: mergedBreadcrumb;

if (finalBreadcrumb === null) return;
Expand Down
14 changes: 12 additions & 2 deletions packages/core/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
import { makePromiseBuffer, type PromiseBuffer, SENTRY_BUFFER_FULL_ERROR } from './utils/promisebuffer';
import { safeMathRandom } from './utils/randomSafeContext';
import { safeCallback } from './utils/safeCallback';
import { reparentChildSpans, shouldIgnoreSpan } from './utils/should-ignore-span';
import { safeUnref } from './utils/timer';
import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
Expand DownExpand Up@@ -1738,7 +1739,12 @@ function processBeforeSend(
let processedEvent = event;

if (isErrorEvent(processedEvent) && beforeSend) {
return beforeSend(processedEvent, hint);
const errorEvent = processedEvent;
return safeCallback(
DEBUG_BUILD ? 'The `beforeSend` callback threw an error, dropping the event:' : '',
() => beforeSend(errorEvent, hint),
() => null,
);
}

if (isTransactionEvent(processedEvent)) {
Expand DownExpand Up@@ -1809,7 +1815,11 @@ function processBeforeSend(
spanCountBeforeProcessing: spanCountBefore,
};
}
return beforeSendTransaction(processedEvent as TransactionEvent, hint);
return safeCallback(
DEBUG_BUILD ? 'The `beforeSendTransaction` callback threw an error, dropping the event:' : '',
() => beforeSendTransaction(processedEvent as TransactionEvent, hint),
() => null,
);
}
}

Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/eventProcessors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { Event, EventHint } from './types/event';
import type { EventProcessor } from './types/eventprocessor';
import { debug } from './utils/debug-logger';
import { isThenable } from './utils/is';
import { safeCallback } from './utils/safeCallback';
import { rejectedSyncPromise, resolvedSyncPromise } from './utils/syncpromise';

/**
Expand DownExpand Up@@ -34,9 +35,15 @@ function _notifyEventProcessors(
return event;
}

const result = processor({ ...event }, hint);
const processorName = `Event processor "${processor.id || '?'}"`;

DEBUG_BUILD && result === null && debug.log(`Event processor "${processor.id || '?'}" dropped event`);
const result = safeCallback(
DEBUG_BUILD ? `${processorName} threw an error, dropping event:` : '',
() => processor({ ...event }, hint),
() => null,
);

DEBUG_BUILD && result === null && debug.log(`${processorName} dropped event`);
Comment thread
sentry[bot] marked this conversation as resolved.

if (isThenable(result)) {
return result.then(final => _notifyEventProcessors(final, hint, processors, index + 1));
Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/logs/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type { Integration } from '../types/integration';
import type { Log, SerializedLog } from '../types/log';
import { consoleSandbox, debug } from '../utils/debug-logger';
import { isParameterizedString } from '../utils/is';
import { safeCallback } from '../utils/safeCallback';
import { getCombinedScopeData } from '../utils/scopeData';
import { getActiveSpan } from '../utils/spanUtils';
import { timestampInSeconds } from '../utils/time';
Expand DownExpand Up@@ -142,8 +143,14 @@ export function _INTERNAL_captureLog(

client.emit('beforeCaptureLog', processedLog);

// We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
const log = beforeSendLog ? consoleSandbox(() => beforeSendLog(processedLog)) : processedLog;
const log = beforeSendLog
? safeCallback(
DEBUG_BUILD ? 'The `beforeSendLog` callback threw an error, dropping the log:' : '',
// We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
() => consoleSandbox(() => beforeSendLog(processedLog)),
() => null,
)
: processedLog;
if (!log) {
client.recordDroppedEvent('before_send', 'log_item', 1);
DEBUG_BUILD && debug.warn('beforeSendLog returned null, log will not be captured.');
Expand Down
10 changes: 9 additions & 1 deletion packages/core/src/metrics/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type { Integration } from '../types/integration';
import type { Metric, SerializedMetric } from '../types/metric';
import type { User } from '../types/user';
import { debug } from '../utils/debug-logger';
import { safeCallback } from '../utils/safeCallback';
import { getCombinedScopeData } from '../utils/scopeData';
import { getActiveSpan } from '../utils/spanUtils';
import { timestampInSeconds } from '../utils/time';
Expand DownExpand Up@@ -181,9 +182,16 @@ export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: Internal

client.emit('processMetric', enrichedMetric);

const processedMetric = beforeSendMetric ? beforeSendMetric(enrichedMetric) : enrichedMetric;
const processedMetric = beforeSendMetric
? safeCallback(
DEBUG_BUILD ? 'The `beforeSendMetric` callback threw an error, dropping the metric:' : '',
() => beforeSendMetric(enrichedMetric),
() => null,
)
: enrichedMetric;

if (!processedMetric) {
client.recordDroppedEvent('before_send', 'metric', 1);
DEBUG_BUILD && debug.log('`beforeSendMetric` returned `null`, will not send metric.');
return;
}
Expand Down
Loading
Loading
, '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
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
beforeSend() {
throw new Error('beforeSend failed');
},
});

Sentry.captureException(new Error('this should get dropped because beforeSend throws'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no extra error event when beforeSend throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'before_send',
},
],
},
})
.start()
.completed();
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
});

Sentry.addEventProcessor(async () => {
throw new Error('async event processor failed');
});

Sentry.captureException(new Error('this should get dropped because the async event processor rejects'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
});

Sentry.addEventProcessor(() => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this could also have a second scenario where we throw in an async event processor?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

yes good idea, added 👍

throw new Error('event processor failed');
});

Sentry.captureException(new Error('this should get dropped because the event processor throws'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no extra error event when an event processor throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'event_processor',
},
],
},
})
.start()
.completed();
});

test('records a client report and no extra error event when an async event processor rejects', async () => {
await createRunner(__dirname, 'scenario-async.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'event_processor',
},
],
},
})
.start()
.completed();
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
tracesSampleRate: 1,
tracesSampler: () => {
throw new Error('tracesSampler failed');
},
});

Sentry.startSpan({ name: 'sampled via tracesSampleRate fallback' }, () => {
// no-op
});

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();

@Lms24Lms24Sep 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: can we add a test what happens when we set tracesSampleRate: 1 that shows that the span is sent in this case?

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
tracesSampler: () => {
throw new Error('tracesSampler failed');
},
});

Sentry.startSpan({ name: 'this should not be sampled because tracesSampler throws' }, () => {
// no-op
});

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no error event when tracesSampler throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'span',
quantity: 1,
reason: 'sample_rate',
},
],
},
})
.start()
.completed();
});

test('sends the span when tracesSampler throws but tracesSampleRate is 1', async () => {
await createRunner(__dirname, 'scenario-fallback.ts')
.expect({
transaction: {
transaction: 'sampled via tracesSampleRate fallback',
},
})
.start()
.completed();
});
8 changes: 7 additions & 1 deletion packages/core/src/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { getClient, getIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import type { Breadcrumb, BreadcrumbHint } from './types/breadcrumb';
import { consoleSandbox } from './utils/debug-logger';
import { safeCallback } from './utils/safeCallback';
import { dateTimestampInSeconds } from './utils/time';

/**
Expand DownExpand Up@@ -28,7 +30,11 @@ export function addBreadcrumb(breadcrumb: Breadcrumb, hint?: BreadcrumbHint): vo
const timestamp = dateTimestampInSeconds();
const mergedBreadcrumb = { timestamp, ...breadcrumb };
const finalBreadcrumb = beforeBreadcrumb
? consoleSandbox(() => beforeBreadcrumb(mergedBreadcrumb, hint))
? safeCallback(
DEBUG_BUILD ? 'The `beforeBreadcrumb` callback threw an error, dropping the breadcrumb:' : '',
() => consoleSandbox(() => beforeBreadcrumb(mergedBreadcrumb, hint)),
() => null,
)
: mergedBreadcrumb;

if (finalBreadcrumb === null) return;
Expand Down
14 changes: 12 additions & 2 deletions packages/core/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
import { makePromiseBuffer, type PromiseBuffer, SENTRY_BUFFER_FULL_ERROR } from './utils/promisebuffer';
import { safeMathRandom } from './utils/randomSafeContext';
import { safeCallback } from './utils/safeCallback';
import { reparentChildSpans, shouldIgnoreSpan } from './utils/should-ignore-span';
import { safeUnref } from './utils/timer';
import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
Expand DownExpand Up@@ -1738,7 +1739,12 @@ function processBeforeSend(
let processedEvent = event;

if (isErrorEvent(processedEvent) && beforeSend) {
return beforeSend(processedEvent, hint);
const errorEvent = processedEvent;
return safeCallback(
DEBUG_BUILD ? 'The `beforeSend` callback threw an error, dropping the event:' : '',
() => beforeSend(errorEvent, hint),
() => null,
);
}

if (isTransactionEvent(processedEvent)) {
Expand DownExpand Up@@ -1809,7 +1815,11 @@ function processBeforeSend(
spanCountBeforeProcessing: spanCountBefore,
};
}
return beforeSendTransaction(processedEvent as TransactionEvent, hint);
return safeCallback(
DEBUG_BUILD ? 'The `beforeSendTransaction` callback threw an error, dropping the event:' : '',
() => beforeSendTransaction(processedEvent as TransactionEvent, hint),
() => null,
);
}
}

Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/eventProcessors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { Event, EventHint } from './types/event';
import type { EventProcessor } from './types/eventprocessor';
import { debug } from './utils/debug-logger';
import { isThenable } from './utils/is';
import { safeCallback } from './utils/safeCallback';
import { rejectedSyncPromise, resolvedSyncPromise } from './utils/syncpromise';

/**
Expand DownExpand Up@@ -34,9 +35,15 @@ function _notifyEventProcessors(
return event;
}

const result = processor({ ...event }, hint);
const processorName = `Event processor "${processor.id || '?'}"`;

DEBUG_BUILD && result === null && debug.log(`Event processor "${processor.id || '?'}" dropped event`);
const result = safeCallback(
DEBUG_BUILD ? `${processorName} threw an error, dropping event:` : '',
() => processor({ ...event }, hint),
() => null,
);

DEBUG_BUILD && result === null && debug.log(`${processorName} dropped event`);
Comment thread
sentry[bot] marked this conversation as resolved.

if (isThenable(result)) {
return result.then(final => _notifyEventProcessors(final, hint, processors, index + 1));
Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/logs/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type { Integration } from '../types/integration';
import type { Log, SerializedLog } from '../types/log';
import { consoleSandbox, debug } from '../utils/debug-logger';
import { isParameterizedString } from '../utils/is';
import { safeCallback } from '../utils/safeCallback';
import { getCombinedScopeData } from '../utils/scopeData';
import { getActiveSpan } from '../utils/spanUtils';
import { timestampInSeconds } from '../utils/time';
Expand DownExpand Up@@ -142,8 +143,14 @@ export function _INTERNAL_captureLog(

client.emit('beforeCaptureLog', processedLog);

// We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
const log = beforeSendLog ? consoleSandbox(() => beforeSendLog(processedLog)) : processedLog;
const log = beforeSendLog
? safeCallback(
DEBUG_BUILD ? 'The `beforeSendLog` callback threw an error, dropping the log:' : '',
// We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
() => consoleSandbox(() => beforeSendLog(processedLog)),
() => null,
)
: processedLog;
if (!log) {
client.recordDroppedEvent('before_send', 'log_item', 1);
DEBUG_BUILD && debug.warn('beforeSendLog returned null, log will not be captured.');
Expand Down
10 changes: 9 additions & 1 deletion packages/core/src/metrics/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type { Integration } from '../types/integration';
import type { Metric, SerializedMetric } from '../types/metric';
import type { User } from '../types/user';
import { debug } from '../utils/debug-logger';
import { safeCallback } from '../utils/safeCallback';
import { getCombinedScopeData } from '../utils/scopeData';
import { getActiveSpan } from '../utils/spanUtils';
import { timestampInSeconds } from '../utils/time';
Expand DownExpand Up@@ -181,9 +182,16 @@ export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: Internal

client.emit('processMetric', enrichedMetric);

const processedMetric = beforeSendMetric ? beforeSendMetric(enrichedMetric) : enrichedMetric;
const processedMetric = beforeSendMetric
? safeCallback(
DEBUG_BUILD ? 'The `beforeSendMetric` callback threw an error, dropping the metric:' : '',
() => beforeSendMetric(enrichedMetric),
() => null,
)
: enrichedMetric;

if (!processedMetric) {
client.recordDroppedEvent('before_send', 'metric', 1);
DEBUG_BUILD && debug.log('`beforeSendMetric` returned `null`, will not send metric.');
return;
}
Expand Down
Loading
Loading
, '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
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
beforeSend() {
throw new Error('beforeSend failed');
},
});

Sentry.captureException(new Error('this should get dropped because beforeSend throws'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no extra error event when beforeSend throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'before_send',
},
],
},
})
.start()
.completed();
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
});

Sentry.addEventProcessor(async () => {
throw new Error('async event processor failed');
});

Sentry.captureException(new Error('this should get dropped because the async event processor rejects'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
});

Sentry.addEventProcessor(() => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this could also have a second scenario where we throw in an async event processor?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

yes good idea, added 👍

throw new Error('event processor failed');
});

Sentry.captureException(new Error('this should get dropped because the event processor throws'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no extra error event when an event processor throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'event_processor',
},
],
},
})
.start()
.completed();
});

test('records a client report and no extra error event when an async event processor rejects', async () => {
await createRunner(__dirname, 'scenario-async.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'event_processor',
},
],
},
})
.start()
.completed();
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
tracesSampleRate: 1,
tracesSampler: () => {
throw new Error('tracesSampler failed');
},
});

Sentry.startSpan({ name: 'sampled via tracesSampleRate fallback' }, () => {
// no-op
});

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();

@Lms24Lms24Sep 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: can we add a test what happens when we set tracesSampleRate: 1 that shows that the span is sent in this case?

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
tracesSampler: () => {
throw new Error('tracesSampler failed');
},
});

Sentry.startSpan({ name: 'this should not be sampled because tracesSampler throws' }, () => {
// no-op
});

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no error event when tracesSampler throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'span',
quantity: 1,
reason: 'sample_rate',
},
],
},
})
.start()
.completed();
});

test('sends the span when tracesSampler throws but tracesSampleRate is 1', async () => {
await createRunner(__dirname, 'scenario-fallback.ts')
.expect({
transaction: {
transaction: 'sampled via tracesSampleRate fallback',
},
})
.start()
.completed();
});
8 changes: 7 additions & 1 deletion packages/core/src/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { getClient, getIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import type { Breadcrumb, BreadcrumbHint } from './types/breadcrumb';
import { consoleSandbox } from './utils/debug-logger';
import { safeCallback } from './utils/safeCallback';
import { dateTimestampInSeconds } from './utils/time';

/**
Expand DownExpand Up@@ -28,7 +30,11 @@ export function addBreadcrumb(breadcrumb: Breadcrumb, hint?: BreadcrumbHint): vo
const timestamp = dateTimestampInSeconds();
const mergedBreadcrumb = { timestamp, ...breadcrumb };
const finalBreadcrumb = beforeBreadcrumb
? consoleSandbox(() => beforeBreadcrumb(mergedBreadcrumb, hint))
? safeCallback(
DEBUG_BUILD ? 'The `beforeBreadcrumb` callback threw an error, dropping the breadcrumb:' : '',
() => consoleSandbox(() => beforeBreadcrumb(mergedBreadcrumb, hint)),
() => null,
)
: mergedBreadcrumb;

if (finalBreadcrumb === null) return;
Expand Down
14 changes: 12 additions & 2 deletions packages/core/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
import { makePromiseBuffer, type PromiseBuffer, SENTRY_BUFFER_FULL_ERROR } from './utils/promisebuffer';
import { safeMathRandom } from './utils/randomSafeContext';
import { safeCallback } from './utils/safeCallback';
import { reparentChildSpans, shouldIgnoreSpan } from './utils/should-ignore-span';
import { safeUnref } from './utils/timer';
import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
Expand DownExpand Up@@ -1738,7 +1739,12 @@ function processBeforeSend(
let processedEvent = event;

if (isErrorEvent(processedEvent) && beforeSend) {
return beforeSend(processedEvent, hint);
const errorEvent = processedEvent;
return safeCallback(
DEBUG_BUILD ? 'The `beforeSend` callback threw an error, dropping the event:' : '',
() => beforeSend(errorEvent, hint),
() => null,
);
}

if (isTransactionEvent(processedEvent)) {
Expand DownExpand Up@@ -1809,7 +1815,11 @@ function processBeforeSend(
spanCountBeforeProcessing: spanCountBefore,
};
}
return beforeSendTransaction(processedEvent as TransactionEvent, hint);
return safeCallback(
DEBUG_BUILD ? 'The `beforeSendTransaction` callback threw an error, dropping the event:' : '',
() => beforeSendTransaction(processedEvent as TransactionEvent, hint),
() => null,
);
}
}

Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/eventProcessors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { Event, EventHint } from './types/event';
import type { EventProcessor } from './types/eventprocessor';
import { debug } from './utils/debug-logger';
import { isThenable } from './utils/is';
import { safeCallback } from './utils/safeCallback';
import { rejectedSyncPromise, resolvedSyncPromise } from './utils/syncpromise';

/**
Expand DownExpand Up@@ -34,9 +35,15 @@ function _notifyEventProcessors(
return event;
}

const result = processor({ ...event }, hint);
const processorName = `Event processor "${processor.id || '?'}"`;

DEBUG_BUILD && result === null && debug.log(`Event processor "${processor.id || '?'}" dropped event`);
const result = safeCallback(
DEBUG_BUILD ? `${processorName} threw an error, dropping event:` : '',
() => processor({ ...event }, hint),
() => null,
);

DEBUG_BUILD && result === null && debug.log(`${processorName} dropped event`);
Comment thread
sentry[bot] marked this conversation as resolved.

if (isThenable(result)) {
return result.then(final => _notifyEventProcessors(final, hint, processors, index + 1));
Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/logs/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type { Integration } from '../types/integration';
import type { Log, SerializedLog } from '../types/log';
import { consoleSandbox, debug } from '../utils/debug-logger';
import { isParameterizedString } from '../utils/is';
import { safeCallback } from '../utils/safeCallback';
import { getCombinedScopeData } from '../utils/scopeData';
import { getActiveSpan } from '../utils/spanUtils';
import { timestampInSeconds } from '../utils/time';
Expand DownExpand Up@@ -142,8 +143,14 @@ export function _INTERNAL_captureLog(

client.emit('beforeCaptureLog', processedLog);

// We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
const log = beforeSendLog ? consoleSandbox(() => beforeSendLog(processedLog)) : processedLog;
const log = beforeSendLog
? safeCallback(
DEBUG_BUILD ? 'The `beforeSendLog` callback threw an error, dropping the log:' : '',
// We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
() => consoleSandbox(() => beforeSendLog(processedLog)),
() => null,
)
: processedLog;
if (!log) {
client.recordDroppedEvent('before_send', 'log_item', 1);
DEBUG_BUILD && debug.warn('beforeSendLog returned null, log will not be captured.');
Expand Down
10 changes: 9 additions & 1 deletion packages/core/src/metrics/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type { Integration } from '../types/integration';
import type { Metric, SerializedMetric } from '../types/metric';
import type { User } from '../types/user';
import { debug } from '../utils/debug-logger';
import { safeCallback } from '../utils/safeCallback';
import { getCombinedScopeData } from '../utils/scopeData';
import { getActiveSpan } from '../utils/spanUtils';
import { timestampInSeconds } from '../utils/time';
Expand DownExpand Up@@ -181,9 +182,16 @@ export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: Internal

client.emit('processMetric', enrichedMetric);

const processedMetric = beforeSendMetric ? beforeSendMetric(enrichedMetric) : enrichedMetric;
const processedMetric = beforeSendMetric
? safeCallback(
DEBUG_BUILD ? 'The `beforeSendMetric` callback threw an error, dropping the metric:' : '',
() => beforeSendMetric(enrichedMetric),
() => null,
)
: enrichedMetric;

if (!processedMetric) {
client.recordDroppedEvent('before_send', 'metric', 1);
DEBUG_BUILD && debug.log('`beforeSendMetric` returned `null`, will not send metric.');
return;
}
Expand Down
Loading
Loading
, '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
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
beforeSend() {
throw new Error('beforeSend failed');
},
});

Sentry.captureException(new Error('this should get dropped because beforeSend throws'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no extra error event when beforeSend throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'before_send',
},
],
},
})
.start()
.completed();
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
});

Sentry.addEventProcessor(async () => {
throw new Error('async event processor failed');
});

Sentry.captureException(new Error('this should get dropped because the async event processor rejects'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
});

Sentry.addEventProcessor(() => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this could also have a second scenario where we throw in an async event processor?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

yes good idea, added 👍

throw new Error('event processor failed');
});

Sentry.captureException(new Error('this should get dropped because the event processor throws'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no extra error event when an event processor throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'event_processor',
},
],
},
})
.start()
.completed();
});

test('records a client report and no extra error event when an async event processor rejects', async () => {
await createRunner(__dirname, 'scenario-async.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'event_processor',
},
],
},
})
.start()
.completed();
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
tracesSampleRate: 1,
tracesSampler: () => {
throw new Error('tracesSampler failed');
},
});

Sentry.startSpan({ name: 'sampled via tracesSampleRate fallback' }, () => {
// no-op
});

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();

@Lms24Lms24Sep 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: can we add a test what happens when we set tracesSampleRate: 1 that shows that the span is sent in this case?

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
tracesSampler: () => {
throw new Error('tracesSampler failed');
},
});

Sentry.startSpan({ name: 'this should not be sampled because tracesSampler throws' }, () => {
// no-op
});

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no error event when tracesSampler throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'span',
quantity: 1,
reason: 'sample_rate',
},
],
},
})
.start()
.completed();
});

test('sends the span when tracesSampler throws but tracesSampleRate is 1', async () => {
await createRunner(__dirname, 'scenario-fallback.ts')
.expect({
transaction: {
transaction: 'sampled via tracesSampleRate fallback',
},
})
.start()
.completed();
});
8 changes: 7 additions & 1 deletion packages/core/src/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { getClient, getIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import type { Breadcrumb, BreadcrumbHint } from './types/breadcrumb';
import { consoleSandbox } from './utils/debug-logger';
import { safeCallback } from './utils/safeCallback';
import { dateTimestampInSeconds } from './utils/time';

/**
Expand DownExpand Up@@ -28,7 +30,11 @@ export function addBreadcrumb(breadcrumb: Breadcrumb, hint?: BreadcrumbHint): vo
const timestamp = dateTimestampInSeconds();
const mergedBreadcrumb = { timestamp, ...breadcrumb };
const finalBreadcrumb = beforeBreadcrumb
? consoleSandbox(() => beforeBreadcrumb(mergedBreadcrumb, hint))
? safeCallback(
DEBUG_BUILD ? 'The `beforeBreadcrumb` callback threw an error, dropping the breadcrumb:' : '',
() => consoleSandbox(() => beforeBreadcrumb(mergedBreadcrumb, hint)),
() => null,
)
: mergedBreadcrumb;

if (finalBreadcrumb === null) return;
Expand Down
14 changes: 12 additions & 2 deletions packages/core/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
import { makePromiseBuffer, type PromiseBuffer, SENTRY_BUFFER_FULL_ERROR } from './utils/promisebuffer';
import { safeMathRandom } from './utils/randomSafeContext';
import { safeCallback } from './utils/safeCallback';
import { reparentChildSpans, shouldIgnoreSpan } from './utils/should-ignore-span';
import { safeUnref } from './utils/timer';
import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
Expand DownExpand Up@@ -1738,7 +1739,12 @@ function processBeforeSend(
let processedEvent = event;

if (isErrorEvent(processedEvent) && beforeSend) {
return beforeSend(processedEvent, hint);
const errorEvent = processedEvent;
return safeCallback(
DEBUG_BUILD ? 'The `beforeSend` callback threw an error, dropping the event:' : '',
() => beforeSend(errorEvent, hint),
() => null,
);
}

if (isTransactionEvent(processedEvent)) {
Expand DownExpand Up@@ -1809,7 +1815,11 @@ function processBeforeSend(
spanCountBeforeProcessing: spanCountBefore,
};
}
return beforeSendTransaction(processedEvent as TransactionEvent, hint);
return safeCallback(
DEBUG_BUILD ? 'The `beforeSendTransaction` callback threw an error, dropping the event:' : '',
() => beforeSendTransaction(processedEvent as TransactionEvent, hint),
() => null,
);
}
}

Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/eventProcessors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { Event, EventHint } from './types/event';
import type { EventProcessor } from './types/eventprocessor';
import { debug } from './utils/debug-logger';
import { isThenable } from './utils/is';
import { safeCallback } from './utils/safeCallback';
import { rejectedSyncPromise, resolvedSyncPromise } from './utils/syncpromise';

/**
Expand DownExpand Up@@ -34,9 +35,15 @@ function _notifyEventProcessors(
return event;
}

const result = processor({ ...event }, hint);
const processorName = `Event processor "${processor.id || '?'}"`;

DEBUG_BUILD && result === null && debug.log(`Event processor "${processor.id || '?'}" dropped event`);
const result = safeCallback(
DEBUG_BUILD ? `${processorName} threw an error, dropping event:` : '',
() => processor({ ...event }, hint),
() => null,
);

DEBUG_BUILD && result === null && debug.log(`${processorName} dropped event`);
Comment thread
sentry[bot] marked this conversation as resolved.

if (isThenable(result)) {
return result.then(final => _notifyEventProcessors(final, hint, processors, index + 1));
Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/logs/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type { Integration } from '../types/integration';
import type { Log, SerializedLog } from '../types/log';
import { consoleSandbox, debug } from '../utils/debug-logger';
import { isParameterizedString } from '../utils/is';
import { safeCallback } from '../utils/safeCallback';
import { getCombinedScopeData } from '../utils/scopeData';
import { getActiveSpan } from '../utils/spanUtils';
import { timestampInSeconds } from '../utils/time';
Expand DownExpand Up@@ -142,8 +143,14 @@ export function _INTERNAL_captureLog(

client.emit('beforeCaptureLog', processedLog);

// We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
const log = beforeSendLog ? consoleSandbox(() => beforeSendLog(processedLog)) : processedLog;
const log = beforeSendLog
? safeCallback(
DEBUG_BUILD ? 'The `beforeSendLog` callback threw an error, dropping the log:' : '',
// We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
() => consoleSandbox(() => beforeSendLog(processedLog)),
() => null,
)
: processedLog;
if (!log) {
client.recordDroppedEvent('before_send', 'log_item', 1);
DEBUG_BUILD && debug.warn('beforeSendLog returned null, log will not be captured.');
Expand Down
10 changes: 9 additions & 1 deletion packages/core/src/metrics/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type { Integration } from '../types/integration';
import type { Metric, SerializedMetric } from '../types/metric';
import type { User } from '../types/user';
import { debug } from '../utils/debug-logger';
import { safeCallback } from '../utils/safeCallback';
import { getCombinedScopeData } from '../utils/scopeData';
import { getActiveSpan } from '../utils/spanUtils';
import { timestampInSeconds } from '../utils/time';
Expand DownExpand Up@@ -181,9 +182,16 @@ export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: Internal

client.emit('processMetric', enrichedMetric);

const processedMetric = beforeSendMetric ? beforeSendMetric(enrichedMetric) : enrichedMetric;
const processedMetric = beforeSendMetric
? safeCallback(
DEBUG_BUILD ? 'The `beforeSendMetric` callback threw an error, dropping the metric:' : '',
() => beforeSendMetric(enrichedMetric),
() => null,
)
: enrichedMetric;

if (!processedMetric) {
client.recordDroppedEvent('before_send', 'metric', 1);
DEBUG_BUILD && debug.log('`beforeSendMetric` returned `null`, will not send metric.');
return;
}
Expand Down
Loading
Loading
, '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
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
beforeSend() {
throw new Error('beforeSend failed');
},
});

Sentry.captureException(new Error('this should get dropped because beforeSend throws'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no extra error event when beforeSend throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'before_send',
},
],
},
})
.start()
.completed();
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
});

Sentry.addEventProcessor(async () => {
throw new Error('async event processor failed');
});

Sentry.captureException(new Error('this should get dropped because the async event processor rejects'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
});

Sentry.addEventProcessor(() => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this could also have a second scenario where we throw in an async event processor?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

yes good idea, added 👍

throw new Error('event processor failed');
});

Sentry.captureException(new Error('this should get dropped because the event processor throws'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no extra error event when an event processor throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'event_processor',
},
],
},
})
.start()
.completed();
});

test('records a client report and no extra error event when an async event processor rejects', async () => {
await createRunner(__dirname, 'scenario-async.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'event_processor',
},
],
},
})
.start()
.completed();
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
tracesSampleRate: 1,
tracesSampler: () => {
throw new Error('tracesSampler failed');
},
});

Sentry.startSpan({ name: 'sampled via tracesSampleRate fallback' }, () => {
// no-op
});

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();

@Lms24Lms24Sep 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: can we add a test what happens when we set tracesSampleRate: 1 that shows that the span is sent in this case?

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
tracesSampler: () => {
throw new Error('tracesSampler failed');
},
});

Sentry.startSpan({ name: 'this should not be sampled because tracesSampler throws' }, () => {
// no-op
});

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no error event when tracesSampler throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'span',
quantity: 1,
reason: 'sample_rate',
},
],
},
})
.start()
.completed();
});

test('sends the span when tracesSampler throws but tracesSampleRate is 1', async () => {
await createRunner(__dirname, 'scenario-fallback.ts')
.expect({
transaction: {
transaction: 'sampled via tracesSampleRate fallback',
},
})
.start()
.completed();
});
8 changes: 7 additions & 1 deletion packages/core/src/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { getClient, getIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import type { Breadcrumb, BreadcrumbHint } from './types/breadcrumb';
import { consoleSandbox } from './utils/debug-logger';
import { safeCallback } from './utils/safeCallback';
import { dateTimestampInSeconds } from './utils/time';

/**
Expand DownExpand Up@@ -28,7 +30,11 @@ export function addBreadcrumb(breadcrumb: Breadcrumb, hint?: BreadcrumbHint): vo
const timestamp = dateTimestampInSeconds();
const mergedBreadcrumb = { timestamp, ...breadcrumb };
const finalBreadcrumb = beforeBreadcrumb
? consoleSandbox(() => beforeBreadcrumb(mergedBreadcrumb, hint))
? safeCallback(
DEBUG_BUILD ? 'The `beforeBreadcrumb` callback threw an error, dropping the breadcrumb:' : '',
() => consoleSandbox(() => beforeBreadcrumb(mergedBreadcrumb, hint)),
() => null,
)
: mergedBreadcrumb;

if (finalBreadcrumb === null) return;
Expand Down
14 changes: 12 additions & 2 deletions packages/core/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
import { makePromiseBuffer, type PromiseBuffer, SENTRY_BUFFER_FULL_ERROR } from './utils/promisebuffer';
import { safeMathRandom } from './utils/randomSafeContext';
import { safeCallback } from './utils/safeCallback';
import { reparentChildSpans, shouldIgnoreSpan } from './utils/should-ignore-span';
import { safeUnref } from './utils/timer';
import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
Expand DownExpand Up@@ -1738,7 +1739,12 @@ function processBeforeSend(
let processedEvent = event;

if (isErrorEvent(processedEvent) && beforeSend) {
return beforeSend(processedEvent, hint);
const errorEvent = processedEvent;
return safeCallback(
DEBUG_BUILD ? 'The `beforeSend` callback threw an error, dropping the event:' : '',
() => beforeSend(errorEvent, hint),
() => null,
);
}

if (isTransactionEvent(processedEvent)) {
Expand DownExpand Up@@ -1809,7 +1815,11 @@ function processBeforeSend(
spanCountBeforeProcessing: spanCountBefore,
};
}
return beforeSendTransaction(processedEvent as TransactionEvent, hint);
return safeCallback(
DEBUG_BUILD ? 'The `beforeSendTransaction` callback threw an error, dropping the event:' : '',
() => beforeSendTransaction(processedEvent as TransactionEvent, hint),
() => null,
);
}
}

Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/eventProcessors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { Event, EventHint } from './types/event';
import type { EventProcessor } from './types/eventprocessor';
import { debug } from './utils/debug-logger';
import { isThenable } from './utils/is';
import { safeCallback } from './utils/safeCallback';
import { rejectedSyncPromise, resolvedSyncPromise } from './utils/syncpromise';

/**
Expand DownExpand Up@@ -34,9 +35,15 @@ function _notifyEventProcessors(
return event;
}

const result = processor({ ...event }, hint);
const processorName = `Event processor "${processor.id || '?'}"`;

DEBUG_BUILD && result === null && debug.log(`Event processor "${processor.id || '?'}" dropped event`);
const result = safeCallback(
DEBUG_BUILD ? `${processorName} threw an error, dropping event:` : '',
() => processor({ ...event }, hint),
() => null,
);

DEBUG_BUILD && result === null && debug.log(`${processorName} dropped event`);
Comment thread
sentry[bot] marked this conversation as resolved.

if (isThenable(result)) {
return result.then(final => _notifyEventProcessors(final, hint, processors, index + 1));
Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/logs/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type { Integration } from '../types/integration';
import type { Log, SerializedLog } from '../types/log';
import { consoleSandbox, debug } from '../utils/debug-logger';
import { isParameterizedString } from '../utils/is';
import { safeCallback } from '../utils/safeCallback';
import { getCombinedScopeData } from '../utils/scopeData';
import { getActiveSpan } from '../utils/spanUtils';
import { timestampInSeconds } from '../utils/time';
Expand DownExpand Up@@ -142,8 +143,14 @@ export function _INTERNAL_captureLog(

client.emit('beforeCaptureLog', processedLog);

// We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
const log = beforeSendLog ? consoleSandbox(() => beforeSendLog(processedLog)) : processedLog;
const log = beforeSendLog
? safeCallback(
DEBUG_BUILD ? 'The `beforeSendLog` callback threw an error, dropping the log:' : '',
// We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
() => consoleSandbox(() => beforeSendLog(processedLog)),
() => null,
)
: processedLog;
if (!log) {
client.recordDroppedEvent('before_send', 'log_item', 1);
DEBUG_BUILD && debug.warn('beforeSendLog returned null, log will not be captured.');
Expand Down
10 changes: 9 additions & 1 deletion packages/core/src/metrics/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type { Integration } from '../types/integration';
import type { Metric, SerializedMetric } from '../types/metric';
import type { User } from '../types/user';
import { debug } from '../utils/debug-logger';
import { safeCallback } from '../utils/safeCallback';
import { getCombinedScopeData } from '../utils/scopeData';
import { getActiveSpan } from '../utils/spanUtils';
import { timestampInSeconds } from '../utils/time';
Expand DownExpand Up@@ -181,9 +182,16 @@ export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: Internal

client.emit('processMetric', enrichedMetric);

const processedMetric = beforeSendMetric ? beforeSendMetric(enrichedMetric) : enrichedMetric;
const processedMetric = beforeSendMetric
? safeCallback(
DEBUG_BUILD ? 'The `beforeSendMetric` callback threw an error, dropping the metric:' : '',
() => beforeSendMetric(enrichedMetric),
() => null,
)
: enrichedMetric;

if (!processedMetric) {
client.recordDroppedEvent('before_send', 'metric', 1);
DEBUG_BUILD && debug.log('`beforeSendMetric` returned `null`, will not send metric.');
return;
}
Expand Down
Loading
Loading
, '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
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
beforeSend() {
throw new Error('beforeSend failed');
},
});

Sentry.captureException(new Error('this should get dropped because beforeSend throws'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no extra error event when beforeSend throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'before_send',
},
],
},
})
.start()
.completed();
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
});

Sentry.addEventProcessor(async () => {
throw new Error('async event processor failed');
});

Sentry.captureException(new Error('this should get dropped because the async event processor rejects'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
});

Sentry.addEventProcessor(() => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this could also have a second scenario where we throw in an async event processor?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

yes good idea, added 👍

throw new Error('event processor failed');
});

Sentry.captureException(new Error('this should get dropped because the event processor throws'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no extra error event when an event processor throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'event_processor',
},
],
},
})
.start()
.completed();
});

test('records a client report and no extra error event when an async event processor rejects', async () => {
await createRunner(__dirname, 'scenario-async.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'event_processor',
},
],
},
})
.start()
.completed();
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
tracesSampleRate: 1,
tracesSampler: () => {
throw new Error('tracesSampler failed');
},
});

Sentry.startSpan({ name: 'sampled via tracesSampleRate fallback' }, () => {
// no-op
});

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();

@Lms24Lms24Sep 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: can we add a test what happens when we set tracesSampleRate: 1 that shows that the span is sent in this case?

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
tracesSampler: () => {
throw new Error('tracesSampler failed');
},
});

Sentry.startSpan({ name: 'this should not be sampled because tracesSampler throws' }, () => {
// no-op
});

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no error event when tracesSampler throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'span',
quantity: 1,
reason: 'sample_rate',
},
],
},
})
.start()
.completed();
});

test('sends the span when tracesSampler throws but tracesSampleRate is 1', async () => {
await createRunner(__dirname, 'scenario-fallback.ts')
.expect({
transaction: {
transaction: 'sampled via tracesSampleRate fallback',
},
})
.start()
.completed();
});
8 changes: 7 additions & 1 deletion packages/core/src/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { getClient, getIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import type { Breadcrumb, BreadcrumbHint } from './types/breadcrumb';
import { consoleSandbox } from './utils/debug-logger';
import { safeCallback } from './utils/safeCallback';
import { dateTimestampInSeconds } from './utils/time';

/**
Expand DownExpand Up@@ -28,7 +30,11 @@ export function addBreadcrumb(breadcrumb: Breadcrumb, hint?: BreadcrumbHint): vo
const timestamp = dateTimestampInSeconds();
const mergedBreadcrumb = { timestamp, ...breadcrumb };
const finalBreadcrumb = beforeBreadcrumb
? consoleSandbox(() => beforeBreadcrumb(mergedBreadcrumb, hint))
? safeCallback(
DEBUG_BUILD ? 'The `beforeBreadcrumb` callback threw an error, dropping the breadcrumb:' : '',
() => consoleSandbox(() => beforeBreadcrumb(mergedBreadcrumb, hint)),
() => null,
)
: mergedBreadcrumb;

if (finalBreadcrumb === null) return;
Expand Down
14 changes: 12 additions & 2 deletions packages/core/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
import { makePromiseBuffer, type PromiseBuffer, SENTRY_BUFFER_FULL_ERROR } from './utils/promisebuffer';
import { safeMathRandom } from './utils/randomSafeContext';
import { safeCallback } from './utils/safeCallback';
import { reparentChildSpans, shouldIgnoreSpan } from './utils/should-ignore-span';
import { safeUnref } from './utils/timer';
import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
Expand DownExpand Up@@ -1738,7 +1739,12 @@ function processBeforeSend(
let processedEvent = event;

if (isErrorEvent(processedEvent) && beforeSend) {
return beforeSend(processedEvent, hint);
const errorEvent = processedEvent;
return safeCallback(
DEBUG_BUILD ? 'The `beforeSend` callback threw an error, dropping the event:' : '',
() => beforeSend(errorEvent, hint),
() => null,
);
}

if (isTransactionEvent(processedEvent)) {
Expand DownExpand Up@@ -1809,7 +1815,11 @@ function processBeforeSend(
spanCountBeforeProcessing: spanCountBefore,
};
}
return beforeSendTransaction(processedEvent as TransactionEvent, hint);
return safeCallback(
DEBUG_BUILD ? 'The `beforeSendTransaction` callback threw an error, dropping the event:' : '',
() => beforeSendTransaction(processedEvent as TransactionEvent, hint),
() => null,
);
}
}

Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/eventProcessors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { Event, EventHint } from './types/event';
import type { EventProcessor } from './types/eventprocessor';
import { debug } from './utils/debug-logger';
import { isThenable } from './utils/is';
import { safeCallback } from './utils/safeCallback';
import { rejectedSyncPromise, resolvedSyncPromise } from './utils/syncpromise';

/**
Expand DownExpand Up@@ -34,9 +35,15 @@ function _notifyEventProcessors(
return event;
}

const result = processor({ ...event }, hint);
const processorName = `Event processor "${processor.id || '?'}"`;

DEBUG_BUILD && result === null && debug.log(`Event processor "${processor.id || '?'}" dropped event`);
const result = safeCallback(
DEBUG_BUILD ? `${processorName} threw an error, dropping event:` : '',
() => processor({ ...event }, hint),
() => null,
);

DEBUG_BUILD && result === null && debug.log(`${processorName} dropped event`);
Comment thread
sentry[bot] marked this conversation as resolved.

if (isThenable(result)) {
return result.then(final => _notifyEventProcessors(final, hint, processors, index + 1));
Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/logs/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type { Integration } from '../types/integration';
import type { Log, SerializedLog } from '../types/log';
import { consoleSandbox, debug } from '../utils/debug-logger';
import { isParameterizedString } from '../utils/is';
import { safeCallback } from '../utils/safeCallback';
import { getCombinedScopeData } from '../utils/scopeData';
import { getActiveSpan } from '../utils/spanUtils';
import { timestampInSeconds } from '../utils/time';
Expand DownExpand Up@@ -142,8 +143,14 @@ export function _INTERNAL_captureLog(

client.emit('beforeCaptureLog', processedLog);

// We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
const log = beforeSendLog ? consoleSandbox(() => beforeSendLog(processedLog)) : processedLog;
const log = beforeSendLog
? safeCallback(
DEBUG_BUILD ? 'The `beforeSendLog` callback threw an error, dropping the log:' : '',
// We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
() => consoleSandbox(() => beforeSendLog(processedLog)),
() => null,
)
: processedLog;
if (!log) {
client.recordDroppedEvent('before_send', 'log_item', 1);
DEBUG_BUILD && debug.warn('beforeSendLog returned null, log will not be captured.');
Expand Down
10 changes: 9 additions & 1 deletion packages/core/src/metrics/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type { Integration } from '../types/integration';
import type { Metric, SerializedMetric } from '../types/metric';
import type { User } from '../types/user';
import { debug } from '../utils/debug-logger';
import { safeCallback } from '../utils/safeCallback';
import { getCombinedScopeData } from '../utils/scopeData';
import { getActiveSpan } from '../utils/spanUtils';
import { timestampInSeconds } from '../utils/time';
Expand DownExpand Up@@ -181,9 +182,16 @@ export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: Internal

client.emit('processMetric', enrichedMetric);

const processedMetric = beforeSendMetric ? beforeSendMetric(enrichedMetric) : enrichedMetric;
const processedMetric = beforeSendMetric
? safeCallback(
DEBUG_BUILD ? 'The `beforeSendMetric` callback threw an error, dropping the metric:' : '',
() => beforeSendMetric(enrichedMetric),
() => null,
)
: enrichedMetric;

if (!processedMetric) {
client.recordDroppedEvent('before_send', 'metric', 1);
DEBUG_BUILD && debug.log('`beforeSendMetric` returned `null`, will not send metric.');
return;
}
Expand Down
Loading
Loading
, '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
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
beforeSend() {
throw new Error('beforeSend failed');
},
});

Sentry.captureException(new Error('this should get dropped because beforeSend throws'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no extra error event when beforeSend throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'before_send',
},
],
},
})
.start()
.completed();
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
});

Sentry.addEventProcessor(async () => {
throw new Error('async event processor failed');
});

Sentry.captureException(new Error('this should get dropped because the async event processor rejects'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
});

Sentry.addEventProcessor(() => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this could also have a second scenario where we throw in an async event processor?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

yes good idea, added 👍

throw new Error('event processor failed');
});

Sentry.captureException(new Error('this should get dropped because the event processor throws'));

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no extra error event when an event processor throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'event_processor',
},
],
},
})
.start()
.completed();
});

test('records a client report and no extra error event when an async event processor rejects', async () => {
await createRunner(__dirname, 'scenario-async.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'error',
quantity: 1,
reason: 'event_processor',
},
],
},
})
.start()
.completed();
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
tracesSampleRate: 1,
tracesSampler: () => {
throw new Error('tracesSampler failed');
},
});

Sentry.startSpan({ name: 'sampled via tracesSampleRate fallback' }, () => {
// no-op
});

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();

@Lms24Lms24Sep 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: can we add a test what happens when we set tracesSampleRate: 1 that shows that the span is sent in this case?

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
transport: loggingTransport,
tracesSampler: () => {
throw new Error('tracesSampler failed');
},
});

Sentry.startSpan({ name: 'this should not be sampled because tracesSampler throws' }, () => {
// no-op
});

// eslint-disable-next-line @typescript-eslint/no-floating-promises
Sentry.flush();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { afterAll, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

afterAll(() => {
cleanupChildProcesses();
});

test('records a client report and no error event when tracesSampler throws', async () => {
await createRunner(__dirname, 'scenario.ts')
.unignore('client_report')
.expect({
client_report: {
discarded_events: [
{
category: 'span',
quantity: 1,
reason: 'sample_rate',
},
],
},
})
.start()
.completed();
});

test('sends the span when tracesSampler throws but tracesSampleRate is 1', async () => {
await createRunner(__dirname, 'scenario-fallback.ts')
.expect({
transaction: {
transaction: 'sampled via tracesSampleRate fallback',
},
})
.start()
.completed();
});
8 changes: 7 additions & 1 deletion packages/core/src/breadcrumbs.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { getClient, getIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
import type { Breadcrumb, BreadcrumbHint } from './types/breadcrumb';
import { consoleSandbox } from './utils/debug-logger';
import { safeCallback } from './utils/safeCallback';
import { dateTimestampInSeconds } from './utils/time';

/**
Expand DownExpand Up@@ -28,7 +30,11 @@ export function addBreadcrumb(breadcrumb: Breadcrumb, hint?: BreadcrumbHint): vo
const timestamp = dateTimestampInSeconds();
const mergedBreadcrumb = { timestamp, ...breadcrumb };
const finalBreadcrumb = beforeBreadcrumb
? consoleSandbox(() => beforeBreadcrumb(mergedBreadcrumb, hint))
? safeCallback(
DEBUG_BUILD ? 'The `beforeBreadcrumb` callback threw an error, dropping the breadcrumb:' : '',
() => consoleSandbox(() => beforeBreadcrumb(mergedBreadcrumb, hint)),
() => null,
)
: mergedBreadcrumb;

if (finalBreadcrumb === null) return;
Expand Down
14 changes: 12 additions & 2 deletions packages/core/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
import { makePromiseBuffer, type PromiseBuffer, SENTRY_BUFFER_FULL_ERROR } from './utils/promisebuffer';
import { safeMathRandom } from './utils/randomSafeContext';
import { safeCallback } from './utils/safeCallback';
import { reparentChildSpans, shouldIgnoreSpan } from './utils/should-ignore-span';
import { safeUnref } from './utils/timer';
import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
Expand DownExpand Up@@ -1738,7 +1739,12 @@ function processBeforeSend(
let processedEvent = event;

if (isErrorEvent(processedEvent) && beforeSend) {
return beforeSend(processedEvent, hint);
const errorEvent = processedEvent;
return safeCallback(
DEBUG_BUILD ? 'The `beforeSend` callback threw an error, dropping the event:' : '',
() => beforeSend(errorEvent, hint),
() => null,
);
}

if (isTransactionEvent(processedEvent)) {
Expand DownExpand Up@@ -1809,7 +1815,11 @@ function processBeforeSend(
spanCountBeforeProcessing: spanCountBefore,
};
}
return beforeSendTransaction(processedEvent as TransactionEvent, hint);
return safeCallback(
DEBUG_BUILD ? 'The `beforeSendTransaction` callback threw an error, dropping the event:' : '',
() => beforeSendTransaction(processedEvent as TransactionEvent, hint),
() => null,
);
}
}

Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/eventProcessors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { Event, EventHint } from './types/event';
import type { EventProcessor } from './types/eventprocessor';
import { debug } from './utils/debug-logger';
import { isThenable } from './utils/is';
import { safeCallback } from './utils/safeCallback';
import { rejectedSyncPromise, resolvedSyncPromise } from './utils/syncpromise';

/**
Expand DownExpand Up@@ -34,9 +35,15 @@ function _notifyEventProcessors(
return event;
}

const result = processor({ ...event }, hint);
const processorName = `Event processor "${processor.id || '?'}"`;

DEBUG_BUILD && result === null && debug.log(`Event processor "${processor.id || '?'}" dropped event`);
const result = safeCallback(
DEBUG_BUILD ? `${processorName} threw an error, dropping event:` : '',
() => processor({ ...event }, hint),
() => null,
);

DEBUG_BUILD && result === null && debug.log(`${processorName} dropped event`);
Comment thread
sentry[bot] marked this conversation as resolved.

if (isThenable(result)) {
return result.then(final => _notifyEventProcessors(final, hint, processors, index + 1));
Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/logs/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type { Integration } from '../types/integration';
import type { Log, SerializedLog } from '../types/log';
import { consoleSandbox, debug } from '../utils/debug-logger';
import { isParameterizedString } from '../utils/is';
import { safeCallback } from '../utils/safeCallback';
import { getCombinedScopeData } from '../utils/scopeData';
import { getActiveSpan } from '../utils/spanUtils';
import { timestampInSeconds } from '../utils/time';
Expand DownExpand Up@@ -142,8 +143,14 @@ export function _INTERNAL_captureLog(

client.emit('beforeCaptureLog', processedLog);

// We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
const log = beforeSendLog ? consoleSandbox(() => beforeSendLog(processedLog)) : processedLog;
const log = beforeSendLog
? safeCallback(
DEBUG_BUILD ? 'The `beforeSendLog` callback threw an error, dropping the log:' : '',
// We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
() => consoleSandbox(() => beforeSendLog(processedLog)),
() => null,
)
: processedLog;
if (!log) {
client.recordDroppedEvent('before_send', 'log_item', 1);
DEBUG_BUILD && debug.warn('beforeSendLog returned null, log will not be captured.');
Expand Down
10 changes: 9 additions & 1 deletion packages/core/src/metrics/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type { Integration } from '../types/integration';
import type { Metric, SerializedMetric } from '../types/metric';
import type { User } from '../types/user';
import { debug } from '../utils/debug-logger';
import { safeCallback } from '../utils/safeCallback';
import { getCombinedScopeData } from '../utils/scopeData';
import { getActiveSpan } from '../utils/spanUtils';
import { timestampInSeconds } from '../utils/time';
Expand DownExpand Up@@ -181,9 +182,16 @@ export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: Internal

client.emit('processMetric', enrichedMetric);

const processedMetric = beforeSendMetric ? beforeSendMetric(enrichedMetric) : enrichedMetric;
const processedMetric = beforeSendMetric
? safeCallback(
DEBUG_BUILD ? 'The `beforeSendMetric` callback threw an error, dropping the metric:' : '',
() => beforeSendMetric(enrichedMetric),
() => null,
)
: enrichedMetric;

if (!processedMetric) {
client.recordDroppedEvent('before_send', 'metric', 1);
DEBUG_BUILD && debug.log('`beforeSendMetric` returned `null`, will not send metric.');
return;
}
Expand Down
Loading
Loading