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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import {
defaultStackParser,
functionToStringIntegration,
httpContextIntegration,
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
makeFetchTransport,
} from '@sentry/browser';
Expand All@@ -16,7 +16,7 @@ const integrations = [
functionToStringIntegration(),
dedupeIntegration(),
httpContextIntegration(),
inboundFiltersIntegration(),
eventFiltersIntegration(),
linkedErrorsIntegration(),
];

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ sentryTest('allows to setup a client manually & capture exceptions', async ({ ge
environment: 'local',
release: '0.0.1',
sdk: {
integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'InboundFilters', 'LinkedErrors'],
integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'EventFilters', 'LinkedErrors'],
name: 'sentry.javascript.browser',
version: expect.any(String),
packages: [{ name: expect.any(String), version: expect.any(String) }],
Expand Down
2 changes: 2 additions & 0 deletions packages/angular/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ export function getDefaultIntegrations(_options: BrowserOptions = {}): Integrati
// - https://github.com/getsentry/sentry-javascript/issues/5417#issuecomment-1453407097
// - https://github.com/getsentry/sentry-javascript/issues/2744
return [
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
breadcrumbsIntegration(),
Expand Down
2 changes: 2 additions & 0 deletions packages/astro/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,9 @@ export {
graphqlIntegration,
hapiIntegration,
httpIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
isInitialized,
kafkaIntegration,
Expand Down
2 changes: 2 additions & 0 deletions packages/aws-serverless/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,9 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
getActiveSpan,
Expand Down
2 changes: 2 additions & 0 deletions packages/browser/src/exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,9 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
parameterize,
startSession,
Expand Down
2 changes: 2 additions & 0 deletions packages/browser/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
* `getDefaultIntegrations` but with an adjusted set of integrations.
*/
return [
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
browserApiErrorsIntegration(),
Expand Down
6 changes: 3 additions & 3 deletions packages/browser/test/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,10 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import {
SDK_VERSION,
eventFiltersIntegration,
getGlobalScope,
getIsolationScope,
getReportDialogEndpoint,
inboundFiltersIntegration,
lastEventId,
} from '@sentry/core';
import * as utils from '@sentry/core';
Expand DownExpand Up@@ -304,12 +304,12 @@ describe('SentryBrowser', () => {
expect(localBeforeSend).toHaveBeenCalledTimes(2);
});

it('should use inboundfilter rules of bound client', async () => {
it('should use eventFilters rules of bound client', async () => {
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
integrations: [inboundFiltersIntegration({ ignoreErrors: ['capture'] })],
integrations: [eventFiltersIntegration({ ignoreErrors: ['capture'] })],
});
const client = new BrowserClient(options);
setCurrentClient(client);
Expand Down
2 changes: 2 additions & 0 deletions packages/bun/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,9 @@ export {
requestDataIntegration,
fsIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
getActiveSpan,
Expand Down
2 changes: 2 additions & 0 deletions packages/bun/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// We return a copy of the defaultIntegrations here to avoid mutating this
return [
// Common
// TODO(v10): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,9 @@ export {
getSpanDescendants,
continueTrace,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
extraErrorDataIntegration,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,8 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
const sendDefaultPii = options.sendDefaultPii ?? false;
return [
dedupeIntegration(),
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,7 +96,9 @@ export {
export { DEFAULT_ENVIRONMENT } from './constants';
export { addBreadcrumb } from './breadcrumbs';
export { functionToStringIntegration } from './integrations/functiontostring';
export { inboundFiltersIntegration } from './integrations/inboundfilters';
// eslint-disable-next-line deprecation/deprecation
export { inboundFiltersIntegration } from './integrations/eventFilters';
export { eventFiltersIntegration } from './integrations/eventFilters';
export { linkedErrorsIntegration } from './integrations/linkederrors';
export { moduleMetadataIntegration } from './integrations/metadata';
export { requestDataIntegration } from './integrations/requestdata';
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,8 @@ const DEFAULT_IGNORE_ERRORS = [
/^Java exception was raised during method invocation$/, // error from Facebook Mobile browser (https://github.com/getsentry/sentry-javascript/issues/15065)
];

/** Options for the InboundFilters integration */
export interface InboundFiltersOptions {
/** Options for the EventFilters integration */
export interface EventFiltersOptions {
allowUrls: Array<string | RegExp>;
denyUrls: Array<string | RegExp>;
ignoreErrors: Array<string | RegExp>;
Expand All@@ -33,8 +33,9 @@ export interface InboundFiltersOptions {
disableErrorDefaults: boolean;
}

const INTEGRATION_NAME = 'InboundFilters';
const _inboundFiltersIntegration = ((options: Partial<InboundFiltersOptions> = {}) => {
const INTEGRATION_NAME = 'EventFilters';

const _eventFiltersIntegration = ((options: Partial<EventFiltersOptions> = {}) => {
return {
name: INTEGRATION_NAME,
processEvent(event, _hint, client) {
Expand All@@ -45,12 +46,48 @@ const _inboundFiltersIntegration = ((options: Partial<InboundFiltersOptions> = {
};
}) satisfies IntegrationFn;

export const inboundFiltersIntegration = defineIntegration(_inboundFiltersIntegration);
/**
* An integration that filters out events (errors and transactions) based on:
*
* - (Errors) A curated list of known low-value or irrelevant errors (see {@link DEFAULT_IGNORE_ERRORS})
* - (Errors) A list of error messages or urls/filenames passed in via
* - Top level Sentry.init options (`ignoreErrors`, `denyUrls`, `allowUrls`)
* - The same options passed to the integration directly via @param options
* - (Transactions/Spans) A list of root span (transaction) names passed in via
* - Top level Sentry.init option (`ignoreTransactions`)
* - The same option passed to the integration directly via @param options
*
* Events filtered by this integration will not be sent to Sentry.
*/
export const eventFiltersIntegration = defineIntegration(_eventFiltersIntegration);

/**
* An integration that filters out events (errors and transactions) based on:
*
* - (Errors) A curated list of known low-value or irrelevant errors (see {@link DEFAULT_IGNORE_ERRORS})
* - (Errors) A list of error messages or urls/filenames passed in via
* - Top level Sentry.init options (`ignoreErrors`, `denyUrls`, `allowUrls`)
* - The same options passed to the integration directly via @param options
* - (Transactions/Spans) A list of root span (transaction) names passed in via
* - Top level Sentry.init option (`ignoreTransactions`)
* - The same option passed to the integration directly via @param options
*
* Events filtered by this integration will not be sent to Sentry.
*
* @deprecated this integration was renamed and will be removed in a future major version.
* Use `eventFiltersIntegration` instead.
*/
export const inboundFiltersIntegration = defineIntegration(((options: Partial<EventFiltersOptions> = {}) => {
return {
...eventFiltersIntegration(options),
name: 'InboundFilters',
};
}) satisfies IntegrationFn);

function _mergeOptions(
internalOptions: Partial<InboundFiltersOptions> = {},
clientOptions: Partial<InboundFiltersOptions> = {},
): Partial<InboundFiltersOptions> {
internalOptions: Partial<EventFiltersOptions> = {},
clientOptions: Partial<EventFiltersOptions> = {},
): Partial<EventFiltersOptions> {
return {
allowUrls: [...(internalOptions.allowUrls || []), ...(clientOptions.allowUrls || [])],
denyUrls: [...(internalOptions.denyUrls || []), ...(clientOptions.denyUrls || [])],
Expand All@@ -64,7 +101,7 @@ function _mergeOptions(
};
}

function _shouldDropEvent(event: Event, options: Partial<InboundFiltersOptions>): boolean {
function _shouldDropEvent(event: Event, options: Partial<EventFiltersOptions>): boolean {
if (options.ignoreInternal && _isSentryError(event)) {
DEBUG_BUILD &&
logger.warn(`Event dropped due to being internal Sentry Error.\nEvent: ${getEventDescription(event)}`);
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import {
defaultStackParser,
functionToStringIntegration,
httpContextIntegration,
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
makeFetchTransport,
} from '@sentry/browser';
Expand All@@ -16,7 +16,7 @@ const integrations = [
functionToStringIntegration(),
dedupeIntegration(),
httpContextIntegration(),
inboundFiltersIntegration(),
eventFiltersIntegration(),
linkedErrorsIntegration(),
];

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ sentryTest('allows to setup a client manually & capture exceptions', async ({ ge
environment: 'local',
release: '0.0.1',
sdk: {
integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'InboundFilters', 'LinkedErrors'],
integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'EventFilters', 'LinkedErrors'],
name: 'sentry.javascript.browser',
version: expect.any(String),
packages: [{ name: expect.any(String), version: expect.any(String) }],
Expand Down
2 changes: 2 additions & 0 deletions packages/angular/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ export function getDefaultIntegrations(_options: BrowserOptions = {}): Integrati
// - https://github.com/getsentry/sentry-javascript/issues/5417#issuecomment-1453407097
// - https://github.com/getsentry/sentry-javascript/issues/2744
return [
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
breadcrumbsIntegration(),
Expand Down
2 changes: 2 additions & 0 deletions packages/astro/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,9 @@ export {
graphqlIntegration,
hapiIntegration,
httpIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
isInitialized,
kafkaIntegration,
Expand Down
2 changes: 2 additions & 0 deletions packages/aws-serverless/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,9 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
getActiveSpan,
Expand Down
2 changes: 2 additions & 0 deletions packages/browser/src/exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,9 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
parameterize,
startSession,
Expand Down
2 changes: 2 additions & 0 deletions packages/browser/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
* `getDefaultIntegrations` but with an adjusted set of integrations.
*/
return [
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
browserApiErrorsIntegration(),
Expand Down
6 changes: 3 additions & 3 deletions packages/browser/test/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,10 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import {
SDK_VERSION,
eventFiltersIntegration,
getGlobalScope,
getIsolationScope,
getReportDialogEndpoint,
inboundFiltersIntegration,
lastEventId,
} from '@sentry/core';
import * as utils from '@sentry/core';
Expand DownExpand Up@@ -304,12 +304,12 @@ describe('SentryBrowser', () => {
expect(localBeforeSend).toHaveBeenCalledTimes(2);
});

it('should use inboundfilter rules of bound client', async () => {
it('should use eventFilters rules of bound client', async () => {
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
integrations: [inboundFiltersIntegration({ ignoreErrors: ['capture'] })],
integrations: [eventFiltersIntegration({ ignoreErrors: ['capture'] })],
});
const client = new BrowserClient(options);
setCurrentClient(client);
Expand Down
2 changes: 2 additions & 0 deletions packages/bun/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,9 @@ export {
requestDataIntegration,
fsIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
getActiveSpan,
Expand Down
2 changes: 2 additions & 0 deletions packages/bun/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// We return a copy of the defaultIntegrations here to avoid mutating this
return [
// Common
// TODO(v10): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,9 @@ export {
getSpanDescendants,
continueTrace,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
extraErrorDataIntegration,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,8 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
const sendDefaultPii = options.sendDefaultPii ?? false;
return [
dedupeIntegration(),
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,7 +96,9 @@ export {
export { DEFAULT_ENVIRONMENT } from './constants';
export { addBreadcrumb } from './breadcrumbs';
export { functionToStringIntegration } from './integrations/functiontostring';
export { inboundFiltersIntegration } from './integrations/inboundfilters';
// eslint-disable-next-line deprecation/deprecation
export { inboundFiltersIntegration } from './integrations/eventFilters';
export { eventFiltersIntegration } from './integrations/eventFilters';
export { linkedErrorsIntegration } from './integrations/linkederrors';
export { moduleMetadataIntegration } from './integrations/metadata';
export { requestDataIntegration } from './integrations/requestdata';
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,8 @@ const DEFAULT_IGNORE_ERRORS = [
/^Java exception was raised during method invocation$/, // error from Facebook Mobile browser (https://github.com/getsentry/sentry-javascript/issues/15065)
];

/** Options for the InboundFilters integration */
export interface InboundFiltersOptions {
/** Options for the EventFilters integration */
export interface EventFiltersOptions {
allowUrls: Array<string | RegExp>;
denyUrls: Array<string | RegExp>;
ignoreErrors: Array<string | RegExp>;
Expand All@@ -33,8 +33,9 @@ export interface InboundFiltersOptions {
disableErrorDefaults: boolean;
}

const INTEGRATION_NAME = 'InboundFilters';
const _inboundFiltersIntegration = ((options: Partial<InboundFiltersOptions> = {}) => {
const INTEGRATION_NAME = 'EventFilters';

const _eventFiltersIntegration = ((options: Partial<EventFiltersOptions> = {}) => {
return {
name: INTEGRATION_NAME,
processEvent(event, _hint, client) {
Expand All@@ -45,12 +46,48 @@ const _inboundFiltersIntegration = ((options: Partial<InboundFiltersOptions> = {
};
}) satisfies IntegrationFn;

export const inboundFiltersIntegration = defineIntegration(_inboundFiltersIntegration);
/**
* An integration that filters out events (errors and transactions) based on:
*
* - (Errors) A curated list of known low-value or irrelevant errors (see {@link DEFAULT_IGNORE_ERRORS})
* - (Errors) A list of error messages or urls/filenames passed in via
* - Top level Sentry.init options (`ignoreErrors`, `denyUrls`, `allowUrls`)
* - The same options passed to the integration directly via @param options
* - (Transactions/Spans) A list of root span (transaction) names passed in via
* - Top level Sentry.init option (`ignoreTransactions`)
* - The same option passed to the integration directly via @param options
*
* Events filtered by this integration will not be sent to Sentry.
*/
export const eventFiltersIntegration = defineIntegration(_eventFiltersIntegration);

/**
* An integration that filters out events (errors and transactions) based on:
*
* - (Errors) A curated list of known low-value or irrelevant errors (see {@link DEFAULT_IGNORE_ERRORS})
* - (Errors) A list of error messages or urls/filenames passed in via
* - Top level Sentry.init options (`ignoreErrors`, `denyUrls`, `allowUrls`)
* - The same options passed to the integration directly via @param options
* - (Transactions/Spans) A list of root span (transaction) names passed in via
* - Top level Sentry.init option (`ignoreTransactions`)
* - The same option passed to the integration directly via @param options
*
* Events filtered by this integration will not be sent to Sentry.
*
* @deprecated this integration was renamed and will be removed in a future major version.
* Use `eventFiltersIntegration` instead.
*/
export const inboundFiltersIntegration = defineIntegration(((options: Partial<EventFiltersOptions> = {}) => {
return {
...eventFiltersIntegration(options),
name: 'InboundFilters',
};
}) satisfies IntegrationFn);

function _mergeOptions(
internalOptions: Partial<InboundFiltersOptions> = {},
clientOptions: Partial<InboundFiltersOptions> = {},
): Partial<InboundFiltersOptions> {
internalOptions: Partial<EventFiltersOptions> = {},
clientOptions: Partial<EventFiltersOptions> = {},
): Partial<EventFiltersOptions> {
return {
allowUrls: [...(internalOptions.allowUrls || []), ...(clientOptions.allowUrls || [])],
denyUrls: [...(internalOptions.denyUrls || []), ...(clientOptions.denyUrls || [])],
Expand All@@ -64,7 +101,7 @@ function _mergeOptions(
};
}

function _shouldDropEvent(event: Event, options: Partial<InboundFiltersOptions>): boolean {
function _shouldDropEvent(event: Event, options: Partial<EventFiltersOptions>): boolean {
if (options.ignoreInternal && _isSentryError(event)) {
DEBUG_BUILD &&
logger.warn(`Event dropped due to being internal Sentry Error.\nEvent: ${getEventDescription(event)}`);
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import {
defaultStackParser,
functionToStringIntegration,
httpContextIntegration,
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
makeFetchTransport,
} from '@sentry/browser';
Expand All@@ -16,7 +16,7 @@ const integrations = [
functionToStringIntegration(),
dedupeIntegration(),
httpContextIntegration(),
inboundFiltersIntegration(),
eventFiltersIntegration(),
linkedErrorsIntegration(),
];

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ sentryTest('allows to setup a client manually & capture exceptions', async ({ ge
environment: 'local',
release: '0.0.1',
sdk: {
integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'InboundFilters', 'LinkedErrors'],
integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'EventFilters', 'LinkedErrors'],
name: 'sentry.javascript.browser',
version: expect.any(String),
packages: [{ name: expect.any(String), version: expect.any(String) }],
Expand Down
2 changes: 2 additions & 0 deletions packages/angular/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ export function getDefaultIntegrations(_options: BrowserOptions = {}): Integrati
// - https://github.com/getsentry/sentry-javascript/issues/5417#issuecomment-1453407097
// - https://github.com/getsentry/sentry-javascript/issues/2744
return [
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
breadcrumbsIntegration(),
Expand Down
2 changes: 2 additions & 0 deletions packages/astro/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,9 @@ export {
graphqlIntegration,
hapiIntegration,
httpIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
isInitialized,
kafkaIntegration,
Expand Down
2 changes: 2 additions & 0 deletions packages/aws-serverless/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,9 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
getActiveSpan,
Expand Down
2 changes: 2 additions & 0 deletions packages/browser/src/exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,9 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
parameterize,
startSession,
Expand Down
2 changes: 2 additions & 0 deletions packages/browser/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
* `getDefaultIntegrations` but with an adjusted set of integrations.
*/
return [
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
browserApiErrorsIntegration(),
Expand Down
6 changes: 3 additions & 3 deletions packages/browser/test/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,10 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import {
SDK_VERSION,
eventFiltersIntegration,
getGlobalScope,
getIsolationScope,
getReportDialogEndpoint,
inboundFiltersIntegration,
lastEventId,
} from '@sentry/core';
import * as utils from '@sentry/core';
Expand DownExpand Up@@ -304,12 +304,12 @@ describe('SentryBrowser', () => {
expect(localBeforeSend).toHaveBeenCalledTimes(2);
});

it('should use inboundfilter rules of bound client', async () => {
it('should use eventFilters rules of bound client', async () => {
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
integrations: [inboundFiltersIntegration({ ignoreErrors: ['capture'] })],
integrations: [eventFiltersIntegration({ ignoreErrors: ['capture'] })],
});
const client = new BrowserClient(options);
setCurrentClient(client);
Expand Down
2 changes: 2 additions & 0 deletions packages/bun/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,9 @@ export {
requestDataIntegration,
fsIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
getActiveSpan,
Expand Down
2 changes: 2 additions & 0 deletions packages/bun/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// We return a copy of the defaultIntegrations here to avoid mutating this
return [
// Common
// TODO(v10): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,9 @@ export {
getSpanDescendants,
continueTrace,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
extraErrorDataIntegration,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,8 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
const sendDefaultPii = options.sendDefaultPii ?? false;
return [
dedupeIntegration(),
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,7 +96,9 @@ export {
export { DEFAULT_ENVIRONMENT } from './constants';
export { addBreadcrumb } from './breadcrumbs';
export { functionToStringIntegration } from './integrations/functiontostring';
export { inboundFiltersIntegration } from './integrations/inboundfilters';
// eslint-disable-next-line deprecation/deprecation
export { inboundFiltersIntegration } from './integrations/eventFilters';
export { eventFiltersIntegration } from './integrations/eventFilters';
export { linkedErrorsIntegration } from './integrations/linkederrors';
export { moduleMetadataIntegration } from './integrations/metadata';
export { requestDataIntegration } from './integrations/requestdata';
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,8 @@ const DEFAULT_IGNORE_ERRORS = [
/^Java exception was raised during method invocation$/, // error from Facebook Mobile browser (https://github.com/getsentry/sentry-javascript/issues/15065)
];

/** Options for the InboundFilters integration */
export interface InboundFiltersOptions {
/** Options for the EventFilters integration */
export interface EventFiltersOptions {
allowUrls: Array<string | RegExp>;
denyUrls: Array<string | RegExp>;
ignoreErrors: Array<string | RegExp>;
Expand All@@ -33,8 +33,9 @@ export interface InboundFiltersOptions {
disableErrorDefaults: boolean;
}

const INTEGRATION_NAME = 'InboundFilters';
const _inboundFiltersIntegration = ((options: Partial<InboundFiltersOptions> = {}) => {
const INTEGRATION_NAME = 'EventFilters';

const _eventFiltersIntegration = ((options: Partial<EventFiltersOptions> = {}) => {
return {
name: INTEGRATION_NAME,
processEvent(event, _hint, client) {
Expand All@@ -45,12 +46,48 @@ const _inboundFiltersIntegration = ((options: Partial<InboundFiltersOptions> = {
};
}) satisfies IntegrationFn;

export const inboundFiltersIntegration = defineIntegration(_inboundFiltersIntegration);
/**
* An integration that filters out events (errors and transactions) based on:
*
* - (Errors) A curated list of known low-value or irrelevant errors (see {@link DEFAULT_IGNORE_ERRORS})
* - (Errors) A list of error messages or urls/filenames passed in via
* - Top level Sentry.init options (`ignoreErrors`, `denyUrls`, `allowUrls`)
* - The same options passed to the integration directly via @param options
* - (Transactions/Spans) A list of root span (transaction) names passed in via
* - Top level Sentry.init option (`ignoreTransactions`)
* - The same option passed to the integration directly via @param options
*
* Events filtered by this integration will not be sent to Sentry.
*/
export const eventFiltersIntegration = defineIntegration(_eventFiltersIntegration);

/**
* An integration that filters out events (errors and transactions) based on:
*
* - (Errors) A curated list of known low-value or irrelevant errors (see {@link DEFAULT_IGNORE_ERRORS})
* - (Errors) A list of error messages or urls/filenames passed in via
* - Top level Sentry.init options (`ignoreErrors`, `denyUrls`, `allowUrls`)
* - The same options passed to the integration directly via @param options
* - (Transactions/Spans) A list of root span (transaction) names passed in via
* - Top level Sentry.init option (`ignoreTransactions`)
* - The same option passed to the integration directly via @param options
*
* Events filtered by this integration will not be sent to Sentry.
*
* @deprecated this integration was renamed and will be removed in a future major version.
* Use `eventFiltersIntegration` instead.
*/
export const inboundFiltersIntegration = defineIntegration(((options: Partial<EventFiltersOptions> = {}) => {
return {
...eventFiltersIntegration(options),
name: 'InboundFilters',
};
}) satisfies IntegrationFn);

function _mergeOptions(
internalOptions: Partial<InboundFiltersOptions> = {},
clientOptions: Partial<InboundFiltersOptions> = {},
): Partial<InboundFiltersOptions> {
internalOptions: Partial<EventFiltersOptions> = {},
clientOptions: Partial<EventFiltersOptions> = {},
): Partial<EventFiltersOptions> {
return {
allowUrls: [...(internalOptions.allowUrls || []), ...(clientOptions.allowUrls || [])],
denyUrls: [...(internalOptions.denyUrls || []), ...(clientOptions.denyUrls || [])],
Expand All@@ -64,7 +101,7 @@ function _mergeOptions(
};
}

function _shouldDropEvent(event: Event, options: Partial<InboundFiltersOptions>): boolean {
function _shouldDropEvent(event: Event, options: Partial<EventFiltersOptions>): boolean {
if (options.ignoreInternal && _isSentryError(event)) {
DEBUG_BUILD &&
logger.warn(`Event dropped due to being internal Sentry Error.\nEvent: ${getEventDescription(event)}`);
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import {
defaultStackParser,
functionToStringIntegration,
httpContextIntegration,
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
makeFetchTransport,
} from '@sentry/browser';
Expand All@@ -16,7 +16,7 @@ const integrations = [
functionToStringIntegration(),
dedupeIntegration(),
httpContextIntegration(),
inboundFiltersIntegration(),
eventFiltersIntegration(),
linkedErrorsIntegration(),
];

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ sentryTest('allows to setup a client manually & capture exceptions', async ({ ge
environment: 'local',
release: '0.0.1',
sdk: {
integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'InboundFilters', 'LinkedErrors'],
integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'EventFilters', 'LinkedErrors'],
name: 'sentry.javascript.browser',
version: expect.any(String),
packages: [{ name: expect.any(String), version: expect.any(String) }],
Expand Down
2 changes: 2 additions & 0 deletions packages/angular/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ export function getDefaultIntegrations(_options: BrowserOptions = {}): Integrati
// - https://github.com/getsentry/sentry-javascript/issues/5417#issuecomment-1453407097
// - https://github.com/getsentry/sentry-javascript/issues/2744
return [
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
breadcrumbsIntegration(),
Expand Down
2 changes: 2 additions & 0 deletions packages/astro/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,9 @@ export {
graphqlIntegration,
hapiIntegration,
httpIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
isInitialized,
kafkaIntegration,
Expand Down
2 changes: 2 additions & 0 deletions packages/aws-serverless/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,9 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
getActiveSpan,
Expand Down
2 changes: 2 additions & 0 deletions packages/browser/src/exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,9 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
parameterize,
startSession,
Expand Down
2 changes: 2 additions & 0 deletions packages/browser/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
* `getDefaultIntegrations` but with an adjusted set of integrations.
*/
return [
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
browserApiErrorsIntegration(),
Expand Down
6 changes: 3 additions & 3 deletions packages/browser/test/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,10 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import {
SDK_VERSION,
eventFiltersIntegration,
getGlobalScope,
getIsolationScope,
getReportDialogEndpoint,
inboundFiltersIntegration,
lastEventId,
} from '@sentry/core';
import * as utils from '@sentry/core';
Expand DownExpand Up@@ -304,12 +304,12 @@ describe('SentryBrowser', () => {
expect(localBeforeSend).toHaveBeenCalledTimes(2);
});

it('should use inboundfilter rules of bound client', async () => {
it('should use eventFilters rules of bound client', async () => {
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
integrations: [inboundFiltersIntegration({ ignoreErrors: ['capture'] })],
integrations: [eventFiltersIntegration({ ignoreErrors: ['capture'] })],
});
const client = new BrowserClient(options);
setCurrentClient(client);
Expand Down
2 changes: 2 additions & 0 deletions packages/bun/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,9 @@ export {
requestDataIntegration,
fsIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
getActiveSpan,
Expand Down
2 changes: 2 additions & 0 deletions packages/bun/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// We return a copy of the defaultIntegrations here to avoid mutating this
return [
// Common
// TODO(v10): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,9 @@ export {
getSpanDescendants,
continueTrace,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
extraErrorDataIntegration,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,8 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
const sendDefaultPii = options.sendDefaultPii ?? false;
return [
dedupeIntegration(),
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,7 +96,9 @@ export {
export { DEFAULT_ENVIRONMENT } from './constants';
export { addBreadcrumb } from './breadcrumbs';
export { functionToStringIntegration } from './integrations/functiontostring';
export { inboundFiltersIntegration } from './integrations/inboundfilters';
// eslint-disable-next-line deprecation/deprecation
export { inboundFiltersIntegration } from './integrations/eventFilters';
export { eventFiltersIntegration } from './integrations/eventFilters';
export { linkedErrorsIntegration } from './integrations/linkederrors';
export { moduleMetadataIntegration } from './integrations/metadata';
export { requestDataIntegration } from './integrations/requestdata';
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,8 @@ const DEFAULT_IGNORE_ERRORS = [
/^Java exception was raised during method invocation$/, // error from Facebook Mobile browser (https://github.com/getsentry/sentry-javascript/issues/15065)
];

/** Options for the InboundFilters integration */
export interface InboundFiltersOptions {
/** Options for the EventFilters integration */
export interface EventFiltersOptions {
allowUrls: Array<string | RegExp>;
denyUrls: Array<string | RegExp>;
ignoreErrors: Array<string | RegExp>;
Expand All@@ -33,8 +33,9 @@ export interface InboundFiltersOptions {
disableErrorDefaults: boolean;
}

const INTEGRATION_NAME = 'InboundFilters';
const _inboundFiltersIntegration = ((options: Partial<InboundFiltersOptions> = {}) => {
const INTEGRATION_NAME = 'EventFilters';

const _eventFiltersIntegration = ((options: Partial<EventFiltersOptions> = {}) => {
return {
name: INTEGRATION_NAME,
processEvent(event, _hint, client) {
Expand All@@ -45,12 +46,48 @@ const _inboundFiltersIntegration = ((options: Partial<InboundFiltersOptions> = {
};
}) satisfies IntegrationFn;

export const inboundFiltersIntegration = defineIntegration(_inboundFiltersIntegration);
/**
* An integration that filters out events (errors and transactions) based on:
*
* - (Errors) A curated list of known low-value or irrelevant errors (see {@link DEFAULT_IGNORE_ERRORS})
* - (Errors) A list of error messages or urls/filenames passed in via
* - Top level Sentry.init options (`ignoreErrors`, `denyUrls`, `allowUrls`)
* - The same options passed to the integration directly via @param options
* - (Transactions/Spans) A list of root span (transaction) names passed in via
* - Top level Sentry.init option (`ignoreTransactions`)
* - The same option passed to the integration directly via @param options
*
* Events filtered by this integration will not be sent to Sentry.
*/
export const eventFiltersIntegration = defineIntegration(_eventFiltersIntegration);

/**
* An integration that filters out events (errors and transactions) based on:
*
* - (Errors) A curated list of known low-value or irrelevant errors (see {@link DEFAULT_IGNORE_ERRORS})
* - (Errors) A list of error messages or urls/filenames passed in via
* - Top level Sentry.init options (`ignoreErrors`, `denyUrls`, `allowUrls`)
* - The same options passed to the integration directly via @param options
* - (Transactions/Spans) A list of root span (transaction) names passed in via
* - Top level Sentry.init option (`ignoreTransactions`)
* - The same option passed to the integration directly via @param options
*
* Events filtered by this integration will not be sent to Sentry.
*
* @deprecated this integration was renamed and will be removed in a future major version.
* Use `eventFiltersIntegration` instead.
*/
export const inboundFiltersIntegration = defineIntegration(((options: Partial<EventFiltersOptions> = {}) => {
return {
...eventFiltersIntegration(options),
name: 'InboundFilters',
};
}) satisfies IntegrationFn);

function _mergeOptions(
internalOptions: Partial<InboundFiltersOptions> = {},
clientOptions: Partial<InboundFiltersOptions> = {},
): Partial<InboundFiltersOptions> {
internalOptions: Partial<EventFiltersOptions> = {},
clientOptions: Partial<EventFiltersOptions> = {},
): Partial<EventFiltersOptions> {
return {
allowUrls: [...(internalOptions.allowUrls || []), ...(clientOptions.allowUrls || [])],
denyUrls: [...(internalOptions.denyUrls || []), ...(clientOptions.denyUrls || [])],
Expand All@@ -64,7 +101,7 @@ function _mergeOptions(
};
}

function _shouldDropEvent(event: Event, options: Partial<InboundFiltersOptions>): boolean {
function _shouldDropEvent(event: Event, options: Partial<EventFiltersOptions>): boolean {
if (options.ignoreInternal && _isSentryError(event)) {
DEBUG_BUILD &&
logger.warn(`Event dropped due to being internal Sentry Error.\nEvent: ${getEventDescription(event)}`);
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import {
defaultStackParser,
functionToStringIntegration,
httpContextIntegration,
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
makeFetchTransport,
} from '@sentry/browser';
Expand All@@ -16,7 +16,7 @@ const integrations = [
functionToStringIntegration(),
dedupeIntegration(),
httpContextIntegration(),
inboundFiltersIntegration(),
eventFiltersIntegration(),
linkedErrorsIntegration(),
];

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ sentryTest('allows to setup a client manually & capture exceptions', async ({ ge
environment: 'local',
release: '0.0.1',
sdk: {
integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'InboundFilters', 'LinkedErrors'],
integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'EventFilters', 'LinkedErrors'],
name: 'sentry.javascript.browser',
version: expect.any(String),
packages: [{ name: expect.any(String), version: expect.any(String) }],
Expand Down
2 changes: 2 additions & 0 deletions packages/angular/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ export function getDefaultIntegrations(_options: BrowserOptions = {}): Integrati
// - https://github.com/getsentry/sentry-javascript/issues/5417#issuecomment-1453407097
// - https://github.com/getsentry/sentry-javascript/issues/2744
return [
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
breadcrumbsIntegration(),
Expand Down
2 changes: 2 additions & 0 deletions packages/astro/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,9 @@ export {
graphqlIntegration,
hapiIntegration,
httpIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
isInitialized,
kafkaIntegration,
Expand Down
2 changes: 2 additions & 0 deletions packages/aws-serverless/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,9 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
getActiveSpan,
Expand Down
2 changes: 2 additions & 0 deletions packages/browser/src/exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,9 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
parameterize,
startSession,
Expand Down
2 changes: 2 additions & 0 deletions packages/browser/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
* `getDefaultIntegrations` but with an adjusted set of integrations.
*/
return [
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
browserApiErrorsIntegration(),
Expand Down
6 changes: 3 additions & 3 deletions packages/browser/test/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,10 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import {
SDK_VERSION,
eventFiltersIntegration,
getGlobalScope,
getIsolationScope,
getReportDialogEndpoint,
inboundFiltersIntegration,
lastEventId,
} from '@sentry/core';
import * as utils from '@sentry/core';
Expand DownExpand Up@@ -304,12 +304,12 @@ describe('SentryBrowser', () => {
expect(localBeforeSend).toHaveBeenCalledTimes(2);
});

it('should use inboundfilter rules of bound client', async () => {
it('should use eventFilters rules of bound client', async () => {
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
integrations: [inboundFiltersIntegration({ ignoreErrors: ['capture'] })],
integrations: [eventFiltersIntegration({ ignoreErrors: ['capture'] })],
});
const client = new BrowserClient(options);
setCurrentClient(client);
Expand Down
2 changes: 2 additions & 0 deletions packages/bun/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,9 @@ export {
requestDataIntegration,
fsIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
getActiveSpan,
Expand Down
2 changes: 2 additions & 0 deletions packages/bun/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// We return a copy of the defaultIntegrations here to avoid mutating this
return [
// Common
// TODO(v10): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,9 @@ export {
getSpanDescendants,
continueTrace,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
extraErrorDataIntegration,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,8 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
const sendDefaultPii = options.sendDefaultPii ?? false;
return [
dedupeIntegration(),
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,7 +96,9 @@ export {
export { DEFAULT_ENVIRONMENT } from './constants';
export { addBreadcrumb } from './breadcrumbs';
export { functionToStringIntegration } from './integrations/functiontostring';
export { inboundFiltersIntegration } from './integrations/inboundfilters';
// eslint-disable-next-line deprecation/deprecation
export { inboundFiltersIntegration } from './integrations/eventFilters';
export { eventFiltersIntegration } from './integrations/eventFilters';
export { linkedErrorsIntegration } from './integrations/linkederrors';
export { moduleMetadataIntegration } from './integrations/metadata';
export { requestDataIntegration } from './integrations/requestdata';
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,8 @@ const DEFAULT_IGNORE_ERRORS = [
/^Java exception was raised during method invocation$/, // error from Facebook Mobile browser (https://github.com/getsentry/sentry-javascript/issues/15065)
];

/** Options for the InboundFilters integration */
export interface InboundFiltersOptions {
/** Options for the EventFilters integration */
export interface EventFiltersOptions {
allowUrls: Array<string | RegExp>;
denyUrls: Array<string | RegExp>;
ignoreErrors: Array<string | RegExp>;
Expand All@@ -33,8 +33,9 @@ export interface InboundFiltersOptions {
disableErrorDefaults: boolean;
}

const INTEGRATION_NAME = 'InboundFilters';
const _inboundFiltersIntegration = ((options: Partial<InboundFiltersOptions> = {}) => {
const INTEGRATION_NAME = 'EventFilters';

const _eventFiltersIntegration = ((options: Partial<EventFiltersOptions> = {}) => {
return {
name: INTEGRATION_NAME,
processEvent(event, _hint, client) {
Expand All@@ -45,12 +46,48 @@ const _inboundFiltersIntegration = ((options: Partial<InboundFiltersOptions> = {
};
}) satisfies IntegrationFn;

export const inboundFiltersIntegration = defineIntegration(_inboundFiltersIntegration);
/**
* An integration that filters out events (errors and transactions) based on:
*
* - (Errors) A curated list of known low-value or irrelevant errors (see {@link DEFAULT_IGNORE_ERRORS})
* - (Errors) A list of error messages or urls/filenames passed in via
* - Top level Sentry.init options (`ignoreErrors`, `denyUrls`, `allowUrls`)
* - The same options passed to the integration directly via @param options
* - (Transactions/Spans) A list of root span (transaction) names passed in via
* - Top level Sentry.init option (`ignoreTransactions`)
* - The same option passed to the integration directly via @param options
*
* Events filtered by this integration will not be sent to Sentry.
*/
export const eventFiltersIntegration = defineIntegration(_eventFiltersIntegration);

/**
* An integration that filters out events (errors and transactions) based on:
*
* - (Errors) A curated list of known low-value or irrelevant errors (see {@link DEFAULT_IGNORE_ERRORS})
* - (Errors) A list of error messages or urls/filenames passed in via
* - Top level Sentry.init options (`ignoreErrors`, `denyUrls`, `allowUrls`)
* - The same options passed to the integration directly via @param options
* - (Transactions/Spans) A list of root span (transaction) names passed in via
* - Top level Sentry.init option (`ignoreTransactions`)
* - The same option passed to the integration directly via @param options
*
* Events filtered by this integration will not be sent to Sentry.
*
* @deprecated this integration was renamed and will be removed in a future major version.
* Use `eventFiltersIntegration` instead.
*/
export const inboundFiltersIntegration = defineIntegration(((options: Partial<EventFiltersOptions> = {}) => {
return {
...eventFiltersIntegration(options),
name: 'InboundFilters',
};
}) satisfies IntegrationFn);

function _mergeOptions(
internalOptions: Partial<InboundFiltersOptions> = {},
clientOptions: Partial<InboundFiltersOptions> = {},
): Partial<InboundFiltersOptions> {
internalOptions: Partial<EventFiltersOptions> = {},
clientOptions: Partial<EventFiltersOptions> = {},
): Partial<EventFiltersOptions> {
return {
allowUrls: [...(internalOptions.allowUrls || []), ...(clientOptions.allowUrls || [])],
denyUrls: [...(internalOptions.denyUrls || []), ...(clientOptions.denyUrls || [])],
Expand All@@ -64,7 +101,7 @@ function _mergeOptions(
};
}

function _shouldDropEvent(event: Event, options: Partial<InboundFiltersOptions>): boolean {
function _shouldDropEvent(event: Event, options: Partial<EventFiltersOptions>): boolean {
if (options.ignoreInternal && _isSentryError(event)) {
DEBUG_BUILD &&
logger.warn(`Event dropped due to being internal Sentry Error.\nEvent: ${getEventDescription(event)}`);
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import {
defaultStackParser,
functionToStringIntegration,
httpContextIntegration,
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
makeFetchTransport,
} from '@sentry/browser';
Expand All@@ -16,7 +16,7 @@ const integrations = [
functionToStringIntegration(),
dedupeIntegration(),
httpContextIntegration(),
inboundFiltersIntegration(),
eventFiltersIntegration(),
linkedErrorsIntegration(),
];

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ sentryTest('allows to setup a client manually & capture exceptions', async ({ ge
environment: 'local',
release: '0.0.1',
sdk: {
integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'InboundFilters', 'LinkedErrors'],
integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'EventFilters', 'LinkedErrors'],
name: 'sentry.javascript.browser',
version: expect.any(String),
packages: [{ name: expect.any(String), version: expect.any(String) }],
Expand Down
2 changes: 2 additions & 0 deletions packages/angular/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ export function getDefaultIntegrations(_options: BrowserOptions = {}): Integrati
// - https://github.com/getsentry/sentry-javascript/issues/5417#issuecomment-1453407097
// - https://github.com/getsentry/sentry-javascript/issues/2744
return [
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
breadcrumbsIntegration(),
Expand Down
2 changes: 2 additions & 0 deletions packages/astro/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,9 @@ export {
graphqlIntegration,
hapiIntegration,
httpIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
isInitialized,
kafkaIntegration,
Expand Down
2 changes: 2 additions & 0 deletions packages/aws-serverless/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,9 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
getActiveSpan,
Expand Down
2 changes: 2 additions & 0 deletions packages/browser/src/exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,9 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
parameterize,
startSession,
Expand Down
2 changes: 2 additions & 0 deletions packages/browser/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
* `getDefaultIntegrations` but with an adjusted set of integrations.
*/
return [
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
browserApiErrorsIntegration(),
Expand Down
6 changes: 3 additions & 3 deletions packages/browser/test/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,10 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import {
SDK_VERSION,
eventFiltersIntegration,
getGlobalScope,
getIsolationScope,
getReportDialogEndpoint,
inboundFiltersIntegration,
lastEventId,
} from '@sentry/core';
import * as utils from '@sentry/core';
Expand DownExpand Up@@ -304,12 +304,12 @@ describe('SentryBrowser', () => {
expect(localBeforeSend).toHaveBeenCalledTimes(2);
});

it('should use inboundfilter rules of bound client', async () => {
it('should use eventFilters rules of bound client', async () => {
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
integrations: [inboundFiltersIntegration({ ignoreErrors: ['capture'] })],
integrations: [eventFiltersIntegration({ ignoreErrors: ['capture'] })],
});
const client = new BrowserClient(options);
setCurrentClient(client);
Expand Down
2 changes: 2 additions & 0 deletions packages/bun/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,9 @@ export {
requestDataIntegration,
fsIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
getActiveSpan,
Expand Down
2 changes: 2 additions & 0 deletions packages/bun/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// We return a copy of the defaultIntegrations here to avoid mutating this
return [
// Common
// TODO(v10): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,9 @@ export {
getSpanDescendants,
continueTrace,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
extraErrorDataIntegration,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,8 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
const sendDefaultPii = options.sendDefaultPii ?? false;
return [
dedupeIntegration(),
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,7 +96,9 @@ export {
export { DEFAULT_ENVIRONMENT } from './constants';
export { addBreadcrumb } from './breadcrumbs';
export { functionToStringIntegration } from './integrations/functiontostring';
export { inboundFiltersIntegration } from './integrations/inboundfilters';
// eslint-disable-next-line deprecation/deprecation
export { inboundFiltersIntegration } from './integrations/eventFilters';
export { eventFiltersIntegration } from './integrations/eventFilters';
export { linkedErrorsIntegration } from './integrations/linkederrors';
export { moduleMetadataIntegration } from './integrations/metadata';
export { requestDataIntegration } from './integrations/requestdata';
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,8 @@ const DEFAULT_IGNORE_ERRORS = [
/^Java exception was raised during method invocation$/, // error from Facebook Mobile browser (https://github.com/getsentry/sentry-javascript/issues/15065)
];

/** Options for the InboundFilters integration */
export interface InboundFiltersOptions {
/** Options for the EventFilters integration */
export interface EventFiltersOptions {
allowUrls: Array<string | RegExp>;
denyUrls: Array<string | RegExp>;
ignoreErrors: Array<string | RegExp>;
Expand All@@ -33,8 +33,9 @@ export interface InboundFiltersOptions {
disableErrorDefaults: boolean;
}

const INTEGRATION_NAME = 'InboundFilters';
const _inboundFiltersIntegration = ((options: Partial<InboundFiltersOptions> = {}) => {
const INTEGRATION_NAME = 'EventFilters';

const _eventFiltersIntegration = ((options: Partial<EventFiltersOptions> = {}) => {
return {
name: INTEGRATION_NAME,
processEvent(event, _hint, client) {
Expand All@@ -45,12 +46,48 @@ const _inboundFiltersIntegration = ((options: Partial<InboundFiltersOptions> = {
};
}) satisfies IntegrationFn;

export const inboundFiltersIntegration = defineIntegration(_inboundFiltersIntegration);
/**
* An integration that filters out events (errors and transactions) based on:
*
* - (Errors) A curated list of known low-value or irrelevant errors (see {@link DEFAULT_IGNORE_ERRORS})
* - (Errors) A list of error messages or urls/filenames passed in via
* - Top level Sentry.init options (`ignoreErrors`, `denyUrls`, `allowUrls`)
* - The same options passed to the integration directly via @param options
* - (Transactions/Spans) A list of root span (transaction) names passed in via
* - Top level Sentry.init option (`ignoreTransactions`)
* - The same option passed to the integration directly via @param options
*
* Events filtered by this integration will not be sent to Sentry.
*/
export const eventFiltersIntegration = defineIntegration(_eventFiltersIntegration);

/**
* An integration that filters out events (errors and transactions) based on:
*
* - (Errors) A curated list of known low-value or irrelevant errors (see {@link DEFAULT_IGNORE_ERRORS})
* - (Errors) A list of error messages or urls/filenames passed in via
* - Top level Sentry.init options (`ignoreErrors`, `denyUrls`, `allowUrls`)
* - The same options passed to the integration directly via @param options
* - (Transactions/Spans) A list of root span (transaction) names passed in via
* - Top level Sentry.init option (`ignoreTransactions`)
* - The same option passed to the integration directly via @param options
*
* Events filtered by this integration will not be sent to Sentry.
*
* @deprecated this integration was renamed and will be removed in a future major version.
* Use `eventFiltersIntegration` instead.
*/
export const inboundFiltersIntegration = defineIntegration(((options: Partial<EventFiltersOptions> = {}) => {
return {
...eventFiltersIntegration(options),
name: 'InboundFilters',
};
}) satisfies IntegrationFn);

function _mergeOptions(
internalOptions: Partial<InboundFiltersOptions> = {},
clientOptions: Partial<InboundFiltersOptions> = {},
): Partial<InboundFiltersOptions> {
internalOptions: Partial<EventFiltersOptions> = {},
clientOptions: Partial<EventFiltersOptions> = {},
): Partial<EventFiltersOptions> {
return {
allowUrls: [...(internalOptions.allowUrls || []), ...(clientOptions.allowUrls || [])],
denyUrls: [...(internalOptions.denyUrls || []), ...(clientOptions.denyUrls || [])],
Expand All@@ -64,7 +101,7 @@ function _mergeOptions(
};
}

function _shouldDropEvent(event: Event, options: Partial<InboundFiltersOptions>): boolean {
function _shouldDropEvent(event: Event, options: Partial<EventFiltersOptions>): boolean {
if (options.ignoreInternal && _isSentryError(event)) {
DEBUG_BUILD &&
logger.warn(`Event dropped due to being internal Sentry Error.\nEvent: ${getEventDescription(event)}`);
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import {
defaultStackParser,
functionToStringIntegration,
httpContextIntegration,
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
makeFetchTransport,
} from '@sentry/browser';
Expand All@@ -16,7 +16,7 @@ const integrations = [
functionToStringIntegration(),
dedupeIntegration(),
httpContextIntegration(),
inboundFiltersIntegration(),
eventFiltersIntegration(),
linkedErrorsIntegration(),
];

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ sentryTest('allows to setup a client manually & capture exceptions', async ({ ge
environment: 'local',
release: '0.0.1',
sdk: {
integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'InboundFilters', 'LinkedErrors'],
integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'EventFilters', 'LinkedErrors'],
name: 'sentry.javascript.browser',
version: expect.any(String),
packages: [{ name: expect.any(String), version: expect.any(String) }],
Expand Down
2 changes: 2 additions & 0 deletions packages/angular/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ export function getDefaultIntegrations(_options: BrowserOptions = {}): Integrati
// - https://github.com/getsentry/sentry-javascript/issues/5417#issuecomment-1453407097
// - https://github.com/getsentry/sentry-javascript/issues/2744
return [
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
breadcrumbsIntegration(),
Expand Down
2 changes: 2 additions & 0 deletions packages/astro/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,9 @@ export {
graphqlIntegration,
hapiIntegration,
httpIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
isInitialized,
kafkaIntegration,
Expand Down
2 changes: 2 additions & 0 deletions packages/aws-serverless/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,9 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
getActiveSpan,
Expand Down
2 changes: 2 additions & 0 deletions packages/browser/src/exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,9 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
parameterize,
startSession,
Expand Down
2 changes: 2 additions & 0 deletions packages/browser/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
* `getDefaultIntegrations` but with an adjusted set of integrations.
*/
return [
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
browserApiErrorsIntegration(),
Expand Down
6 changes: 3 additions & 3 deletions packages/browser/test/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,10 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import {
SDK_VERSION,
eventFiltersIntegration,
getGlobalScope,
getIsolationScope,
getReportDialogEndpoint,
inboundFiltersIntegration,
lastEventId,
} from '@sentry/core';
import * as utils from '@sentry/core';
Expand DownExpand Up@@ -304,12 +304,12 @@ describe('SentryBrowser', () => {
expect(localBeforeSend).toHaveBeenCalledTimes(2);
});

it('should use inboundfilter rules of bound client', async () => {
it('should use eventFilters rules of bound client', async () => {
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
integrations: [inboundFiltersIntegration({ ignoreErrors: ['capture'] })],
integrations: [eventFiltersIntegration({ ignoreErrors: ['capture'] })],
});
const client = new BrowserClient(options);
setCurrentClient(client);
Expand Down
2 changes: 2 additions & 0 deletions packages/bun/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,9 @@ export {
requestDataIntegration,
fsIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
getActiveSpan,
Expand Down
2 changes: 2 additions & 0 deletions packages/bun/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// We return a copy of the defaultIntegrations here to avoid mutating this
return [
// Common
// TODO(v10): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,9 @@ export {
getSpanDescendants,
continueTrace,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
extraErrorDataIntegration,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,8 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
const sendDefaultPii = options.sendDefaultPii ?? false;
return [
dedupeIntegration(),
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,7 +96,9 @@ export {
export { DEFAULT_ENVIRONMENT } from './constants';
export { addBreadcrumb } from './breadcrumbs';
export { functionToStringIntegration } from './integrations/functiontostring';
export { inboundFiltersIntegration } from './integrations/inboundfilters';
// eslint-disable-next-line deprecation/deprecation
export { inboundFiltersIntegration } from './integrations/eventFilters';
export { eventFiltersIntegration } from './integrations/eventFilters';
export { linkedErrorsIntegration } from './integrations/linkederrors';
export { moduleMetadataIntegration } from './integrations/metadata';
export { requestDataIntegration } from './integrations/requestdata';
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,8 @@ const DEFAULT_IGNORE_ERRORS = [
/^Java exception was raised during method invocation$/, // error from Facebook Mobile browser (https://github.com/getsentry/sentry-javascript/issues/15065)
];

/** Options for the InboundFilters integration */
export interface InboundFiltersOptions {
/** Options for the EventFilters integration */
export interface EventFiltersOptions {
allowUrls: Array<string | RegExp>;
denyUrls: Array<string | RegExp>;
ignoreErrors: Array<string | RegExp>;
Expand All@@ -33,8 +33,9 @@ export interface InboundFiltersOptions {
disableErrorDefaults: boolean;
}

const INTEGRATION_NAME = 'InboundFilters';
const _inboundFiltersIntegration = ((options: Partial<InboundFiltersOptions> = {}) => {
const INTEGRATION_NAME = 'EventFilters';

const _eventFiltersIntegration = ((options: Partial<EventFiltersOptions> = {}) => {
return {
name: INTEGRATION_NAME,
processEvent(event, _hint, client) {
Expand All@@ -45,12 +46,48 @@ const _inboundFiltersIntegration = ((options: Partial<InboundFiltersOptions> = {
};
}) satisfies IntegrationFn;

export const inboundFiltersIntegration = defineIntegration(_inboundFiltersIntegration);
/**
* An integration that filters out events (errors and transactions) based on:
*
* - (Errors) A curated list of known low-value or irrelevant errors (see {@link DEFAULT_IGNORE_ERRORS})
* - (Errors) A list of error messages or urls/filenames passed in via
* - Top level Sentry.init options (`ignoreErrors`, `denyUrls`, `allowUrls`)
* - The same options passed to the integration directly via @param options
* - (Transactions/Spans) A list of root span (transaction) names passed in via
* - Top level Sentry.init option (`ignoreTransactions`)
* - The same option passed to the integration directly via @param options
*
* Events filtered by this integration will not be sent to Sentry.
*/
export const eventFiltersIntegration = defineIntegration(_eventFiltersIntegration);

/**
* An integration that filters out events (errors and transactions) based on:
*
* - (Errors) A curated list of known low-value or irrelevant errors (see {@link DEFAULT_IGNORE_ERRORS})
* - (Errors) A list of error messages or urls/filenames passed in via
* - Top level Sentry.init options (`ignoreErrors`, `denyUrls`, `allowUrls`)
* - The same options passed to the integration directly via @param options
* - (Transactions/Spans) A list of root span (transaction) names passed in via
* - Top level Sentry.init option (`ignoreTransactions`)
* - The same option passed to the integration directly via @param options
*
* Events filtered by this integration will not be sent to Sentry.
*
* @deprecated this integration was renamed and will be removed in a future major version.
* Use `eventFiltersIntegration` instead.
*/
export const inboundFiltersIntegration = defineIntegration(((options: Partial<EventFiltersOptions> = {}) => {
return {
...eventFiltersIntegration(options),
name: 'InboundFilters',
};
}) satisfies IntegrationFn);

function _mergeOptions(
internalOptions: Partial<InboundFiltersOptions> = {},
clientOptions: Partial<InboundFiltersOptions> = {},
): Partial<InboundFiltersOptions> {
internalOptions: Partial<EventFiltersOptions> = {},
clientOptions: Partial<EventFiltersOptions> = {},
): Partial<EventFiltersOptions> {
return {
allowUrls: [...(internalOptions.allowUrls || []), ...(clientOptions.allowUrls || [])],
denyUrls: [...(internalOptions.denyUrls || []), ...(clientOptions.denyUrls || [])],
Expand All@@ -64,7 +101,7 @@ function _mergeOptions(
};
}

function _shouldDropEvent(event: Event, options: Partial<InboundFiltersOptions>): boolean {
function _shouldDropEvent(event: Event, options: Partial<EventFiltersOptions>): boolean {
if (options.ignoreInternal && _isSentryError(event)) {
DEBUG_BUILD &&
logger.warn(`Event dropped due to being internal Sentry Error.\nEvent: ${getEventDescription(event)}`);
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import {
defaultStackParser,
functionToStringIntegration,
httpContextIntegration,
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
makeFetchTransport,
} from '@sentry/browser';
Expand All@@ -16,7 +16,7 @@ const integrations = [
functionToStringIntegration(),
dedupeIntegration(),
httpContextIntegration(),
inboundFiltersIntegration(),
eventFiltersIntegration(),
linkedErrorsIntegration(),
];

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ sentryTest('allows to setup a client manually & capture exceptions', async ({ ge
environment: 'local',
release: '0.0.1',
sdk: {
integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'InboundFilters', 'LinkedErrors'],
integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'EventFilters', 'LinkedErrors'],
name: 'sentry.javascript.browser',
version: expect.any(String),
packages: [{ name: expect.any(String), version: expect.any(String) }],
Expand Down
2 changes: 2 additions & 0 deletions packages/angular/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ export function getDefaultIntegrations(_options: BrowserOptions = {}): Integrati
// - https://github.com/getsentry/sentry-javascript/issues/5417#issuecomment-1453407097
// - https://github.com/getsentry/sentry-javascript/issues/2744
return [
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
breadcrumbsIntegration(),
Expand Down
2 changes: 2 additions & 0 deletions packages/astro/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,9 @@ export {
graphqlIntegration,
hapiIntegration,
httpIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
isInitialized,
kafkaIntegration,
Expand Down
2 changes: 2 additions & 0 deletions packages/aws-serverless/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,9 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
getActiveSpan,
Expand Down
2 changes: 2 additions & 0 deletions packages/browser/src/exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,9 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
parameterize,
startSession,
Expand Down
2 changes: 2 additions & 0 deletions packages/browser/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
* `getDefaultIntegrations` but with an adjusted set of integrations.
*/
return [
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
browserApiErrorsIntegration(),
Expand Down
6 changes: 3 additions & 3 deletions packages/browser/test/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,10 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import {
SDK_VERSION,
eventFiltersIntegration,
getGlobalScope,
getIsolationScope,
getReportDialogEndpoint,
inboundFiltersIntegration,
lastEventId,
} from '@sentry/core';
import * as utils from '@sentry/core';
Expand DownExpand Up@@ -304,12 +304,12 @@ describe('SentryBrowser', () => {
expect(localBeforeSend).toHaveBeenCalledTimes(2);
});

it('should use inboundfilter rules of bound client', async () => {
it('should use eventFilters rules of bound client', async () => {
const localBeforeSend = vi.fn();
const options = getDefaultBrowserClientOptions({
beforeSend: localBeforeSend,
dsn,
integrations: [inboundFiltersIntegration({ ignoreErrors: ['capture'] })],
integrations: [eventFiltersIntegration({ ignoreErrors: ['capture'] })],
});
const client = new BrowserClient(options);
setCurrentClient(client);
Expand Down
2 changes: 2 additions & 0 deletions packages/bun/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,9 @@ export {
requestDataIntegration,
fsIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
getActiveSpan,
Expand Down
2 changes: 2 additions & 0 deletions packages/bun/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// We return a copy of the defaultIntegrations here to avoid mutating this
return [
// Common
// TODO(v10): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,9 @@ export {
getSpanDescendants,
continueTrace,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
extraErrorDataIntegration,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,8 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
const sendDefaultPii = options.sendDefaultPii ?? false;
return [
dedupeIntegration(),
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,7 +96,9 @@ export {
export { DEFAULT_ENVIRONMENT } from './constants';
export { addBreadcrumb } from './breadcrumbs';
export { functionToStringIntegration } from './integrations/functiontostring';
export { inboundFiltersIntegration } from './integrations/inboundfilters';
// eslint-disable-next-line deprecation/deprecation
export { inboundFiltersIntegration } from './integrations/eventFilters';
export { eventFiltersIntegration } from './integrations/eventFilters';
export { linkedErrorsIntegration } from './integrations/linkederrors';
export { moduleMetadataIntegration } from './integrations/metadata';
export { requestDataIntegration } from './integrations/requestdata';
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,8 @@ const DEFAULT_IGNORE_ERRORS = [
/^Java exception was raised during method invocation$/, // error from Facebook Mobile browser (https://github.com/getsentry/sentry-javascript/issues/15065)
];

/** Options for the InboundFilters integration */
export interface InboundFiltersOptions {
/** Options for the EventFilters integration */
export interface EventFiltersOptions {
allowUrls: Array<string | RegExp>;
denyUrls: Array<string | RegExp>;
ignoreErrors: Array<string | RegExp>;
Expand All@@ -33,8 +33,9 @@ export interface InboundFiltersOptions {
disableErrorDefaults: boolean;
}

const INTEGRATION_NAME = 'InboundFilters';
const _inboundFiltersIntegration = ((options: Partial<InboundFiltersOptions> = {}) => {
const INTEGRATION_NAME = 'EventFilters';

const _eventFiltersIntegration = ((options: Partial<EventFiltersOptions> = {}) => {
return {
name: INTEGRATION_NAME,
processEvent(event, _hint, client) {
Expand All@@ -45,12 +46,48 @@ const _inboundFiltersIntegration = ((options: Partial<InboundFiltersOptions> = {
};
}) satisfies IntegrationFn;

export const inboundFiltersIntegration = defineIntegration(_inboundFiltersIntegration);
/**
* An integration that filters out events (errors and transactions) based on:
*
* - (Errors) A curated list of known low-value or irrelevant errors (see {@link DEFAULT_IGNORE_ERRORS})
* - (Errors) A list of error messages or urls/filenames passed in via
* - Top level Sentry.init options (`ignoreErrors`, `denyUrls`, `allowUrls`)
* - The same options passed to the integration directly via @param options
* - (Transactions/Spans) A list of root span (transaction) names passed in via
* - Top level Sentry.init option (`ignoreTransactions`)
* - The same option passed to the integration directly via @param options
*
* Events filtered by this integration will not be sent to Sentry.
*/
export const eventFiltersIntegration = defineIntegration(_eventFiltersIntegration);

/**
* An integration that filters out events (errors and transactions) based on:
*
* - (Errors) A curated list of known low-value or irrelevant errors (see {@link DEFAULT_IGNORE_ERRORS})
* - (Errors) A list of error messages or urls/filenames passed in via
* - Top level Sentry.init options (`ignoreErrors`, `denyUrls`, `allowUrls`)
* - The same options passed to the integration directly via @param options
* - (Transactions/Spans) A list of root span (transaction) names passed in via
* - Top level Sentry.init option (`ignoreTransactions`)
* - The same option passed to the integration directly via @param options
*
* Events filtered by this integration will not be sent to Sentry.
*
* @deprecated this integration was renamed and will be removed in a future major version.
* Use `eventFiltersIntegration` instead.
*/
export const inboundFiltersIntegration = defineIntegration(((options: Partial<EventFiltersOptions> = {}) => {
return {
...eventFiltersIntegration(options),
name: 'InboundFilters',
};
}) satisfies IntegrationFn);

function _mergeOptions(
internalOptions: Partial<InboundFiltersOptions> = {},
clientOptions: Partial<InboundFiltersOptions> = {},
): Partial<InboundFiltersOptions> {
internalOptions: Partial<EventFiltersOptions> = {},
clientOptions: Partial<EventFiltersOptions> = {},
): Partial<EventFiltersOptions> {
return {
allowUrls: [...(internalOptions.allowUrls || []), ...(clientOptions.allowUrls || [])],
denyUrls: [...(internalOptions.denyUrls || []), ...(clientOptions.denyUrls || [])],
Expand All@@ -64,7 +101,7 @@ function _mergeOptions(
};
}

function _shouldDropEvent(event: Event, options: Partial<InboundFiltersOptions>): boolean {
function _shouldDropEvent(event: Event, options: Partial<EventFiltersOptions>): boolean {
if (options.ignoreInternal && _isSentryError(event)) {
DEBUG_BUILD &&
logger.warn(`Event dropped due to being internal Sentry Error.\nEvent: ${getEventDescription(event)}`);
Expand Down
Loading