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
18 changes: 18 additions & 0 deletions MIGRATION.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -821,6 +821,24 @@ import { inboundFiltersIntegration } from '@sentry/browser';
import { eventFiltersIntegration } from '@sentry/browser';
```

All SDKs now also set up `eventFiltersIntegration` instead of `inboundFiltersIntegration` as a default
integration, so the integration reports itself as `EventFilters` (e.g. in the `sdk.integrations` payload of
events). If you disable the integration by its previous name, update the reference:

```js
// before
Sentry.init({
integrations: integrations => integrations.filter(integration => integration.name !== 'InboundFilters'),
});

// after
Sentry.init({
integrations: integrations => integrations.filter(integration => integration.name !== 'EventFilters'),
});
```

The same applies when looking the integration up by name, e.g. via `client.getIntegrationByName('InboundFilters')`.

### `instrumentLangGraph` renamed to `instrumentStateGraph`

Affected SDKs: SDKs with LangGraph instrumentation.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ sentryTest(
async ({ getLocalTestUrl, page, browserName }) => {
if (browserName === 'webkit') {
// The error we're throwing in this test is thrown as "Script error." in Webkit.
// We filter "Script error." out by default in `InboundFilters`.
// I don't think there's much value to disable InboundFilters defaults for this test,
// We filter "Script error." out by default in `EventFilters`.
// I don't think there's much value to disable EventFilters defaults for this test,
// given that most of our users won't do that either.
// Let's skip it instead for Webkit.
sentryTest.skip();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ sentryTest(
async ({ getLocalTestUrl, page, browserName }) => {
if (browserName === 'webkit') {
// The error we're throwing in this test is thrown as "Script error." in Webkit.
// We filter "Script error." out by default in `InboundFilters`.
// I don't think there's much value to disable InboundFilters defaults for this test,
// We filter "Script error." out by default in `EventFilters`.
// I don't think there's much value to disable EventFilters defaults for this test,
// given that most of our users won't do that either.
// Let's skip it instead for Webkit.
sentryTest.skip();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ sentryTest('logs debug messages correctly', async ({ getLocalTestUrl, page }) =>
expect(consoleMessages).toEqual(
hasDebug
? [
'Sentry Logger [log]: Integration installed: InboundFilters',
'Sentry Logger [log]: Integration installed: EventFilters',
'Sentry Logger [log]: Integration installed: FunctionToString',
'Sentry Logger [log]: Integration installed: ConversationId',
'Sentry Logger [log]: Integration installed: BrowserApiErrors',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand DownExpand Up@@ -91,7 +91,7 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand DownExpand Up@@ -91,7 +91,7 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ const DEFAULT_REPLAY_EVENT = {
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
6 changes: 2 additions & 4 deletions packages/angular/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@ import {
conversationIdIntegration,
debug,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
inboundFiltersIntegration,
} from '@sentry/core';
import { IS_DEBUG_BUILD } from './flags';

Expand All@@ -34,9 +34,7 @@ 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(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
breadcrumbsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/astro/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,8 +66,6 @@ export {
httpIntegration,
httpServerIntegration,
httpServerSpansIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
isInitialized,
Expand Down
2 changes: 0 additions & 2 deletions packages/aws-serverless/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,8 +70,6 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
Expand Down
2 changes: 0 additions & 2 deletions packages/browser/src/exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,6 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
parameterize,
Expand Down
6 changes: 2 additions & 4 deletions packages/browser/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ import type { Client, Integration, Options } from '@sentry/core/browser';
import {
conversationIdIntegration,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
inboundFiltersIntegration,
initAndBind,
setNormalizeStringifier,
stackParserFromStackParserOptions,
Expand DownExpand Up@@ -35,9 +35,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
* `getDefaultIntegrations` but with an adjusted set of integrations.
*/
return [
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
browserApiErrorsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/bun/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,8 +91,6 @@ export {
requestDataIntegration,
fsIntegration,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
Expand Down
6 changes: 2 additions & 4 deletions packages/bun/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ import * as os from 'node:os';
import type { Integration, Options } from '@sentry/core';
import {
applySdkMetadata,
eventFiltersIntegration,
functionToStringIntegration,
hasSpansEnabled,
inboundFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
Expand DownExpand Up@@ -69,9 +69,7 @@ export function getDefaultIntegrationsWithoutPerformance(): Integration[] {
// Return a fresh array on each call so callers can safely mutate the result.
return [
// Common
// TODO(v11): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
requestDataIntegration(),
Expand Down
6 changes: 2 additions & 4 deletions packages/cloudflare/src/baseSdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@ import {
consoleIntegration,
conversationIdIntegration,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
GLOBAL_OBJ,
inboundFiltersIntegration,
initAndBind,
linkedErrorsIntegration,
requestDataIntegration,
Expand DownExpand Up@@ -52,9 +52,7 @@ export function getBaseDefaultIntegrations(options: CloudflareOptions): Integrat
// The Dedupe integration should not be used in workflows because we want to
// capture all step failures, even if they are the same error.
...(options.enableDedupe === false ? [] : [dedupeIntegration()]),
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
linkedErrorsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,6 @@ export {
getSpanDescendants,
continueTrace,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
Expand Down
24 changes: 0 additions & 24 deletions packages/core/src/integrations/eventFilters.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { DEBUG_BUILD } from '../debug-build';
import { defineIntegration } from '../integration';
import type { Event } from '../types/event';
import type { IntegrationFn } from '../types/integration';
import type { StackFrame } from '../types/stackframe';
import { debug } from '../utils/debug-logger';
import { getPossibleEventMessages } from '../utils/eventUtils';
Expand DownExpand Up@@ -67,29 +66,6 @@ export const eventFiltersIntegration = defineIntegration((options: Partial<Event
};
});

/**
* 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' as const,
};
}) satisfies IntegrationFn);

function _mergeOptions(
internalOptions: Partial<EventFiltersOptions> = {},
clientOptions: Partial<EventFiltersOptions> = {},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/semanticAttributes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME = 'sentry.sdk.name';
* @deprecated Use `SENTRY_SDK_VERSION` `@sentry/conventions/attributes` instead.
*/
export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION = 'sentry.sdk.version';
/** The list of integrations enabled in the Sentry SDK (e.g., ["InboundFilters", "BrowserTracing"]) */
/** The list of integrations enabled in the Sentry SDK (e.g., ["EventFilters", "BrowserTracing"]) */
export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS = 'sentry.sdk.integrations';

/** The user ID */
Expand Down
2 changes: 0 additions & 2 deletions packages/core/src/shared-exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,8 +144,6 @@ export { spanKindToName } from './spanKind';
export type { SpanKind, SpanKindNumber } from './spanKind';
export { addBreadcrumb } from './breadcrumbs';
export { functionToStringIntegration } from './integrations/functiontostring';
// eslint-disable-next-line typescript/no-deprecated
export { inboundFiltersIntegration } from './integrations/eventFilters';
export { eventFiltersIntegration } from './integrations/eventFilters';
export { linkedErrorsIntegration } from './integrations/linkederrors';
export { moduleMetadataIntegration } from './integrations/moduleMetadata';
Expand Down
11 changes: 4 additions & 7 deletions packages/core/test/lib/integrations/eventFilters.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { describe, expect, it } from 'vitest';
import type { EventFiltersOptions } from '../../../src/integrations/eventFilters';
import { eventFiltersIntegration, inboundFiltersIntegration } from '../../../src/integrations/eventFilters';
import { eventFiltersIntegration } from '../../../src/integrations/eventFilters';
import type { Event } from '../../../src/types/event';
import type { EventProcessor } from '../../../src/types/eventprocessor';
import type { Integration } from '../../../src/types/integration';
Expand All@@ -23,7 +23,7 @@ const PUBLIC_DSN = 'https://username@domain/123';
* expect(eventProcessor(SOME_EXCEPTION_EVENT)).toBe(null);
* ```
*
* @param options options passed into the InboundFilters integration
* @param options options passed into the EventFilters integration
* @param clientOptions options passed into the mock Sentry client
*/
function createEventFiltersEventProcessor(
Expand DownExpand Up@@ -409,11 +409,8 @@ function createUndefinedIsNotAnObjectEvent(evaluatingStr: string): Event {
};
}

describe.each([
// eslint-disable-next-line typescript/no-deprecated
['InboundFilters', inboundFiltersIntegration],
['EventFilters', eventFiltersIntegration],
])('%s', (_, integrationFn) => {
describe('EventFilters', () => {
const integrationFn = eventFiltersIntegration;
describe('ignoreErrors', () => {
it('string filter with partial match', () => {
const eventProcessor = createEventFiltersEventProcessor(integrationFn, {
Expand Down
6 changes: 3 additions & 3 deletions packages/core/test/lib/tracing/spans/captureSpan.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,7 +324,7 @@ describe('captureSpan', () => {
release: '1.0.0',
environment: 'staging',
integrations: [
{ name: 'InboundFilters', setupOnce: () => {} },
{ name: 'EventFilters', setupOnce: () => {} },
{ name: 'BrowserTracing', setupOnce: () => {} },
],
_metadata: {
Expand DownExpand Up@@ -369,7 +369,7 @@ describe('captureSpan', () => {
[SENTRY_SDK_VERSION]: { value: '9.0.0', type: 'string' },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS]: {
type: 'array',
value: ['InboundFilters', 'BrowserTracing'],
value: ['EventFilters', 'BrowserTracing'],
},
},
_segmentSpan: span,
Expand All@@ -381,7 +381,7 @@ describe('captureSpan', () => {
getDefaultTestClientOptions({
dsn: 'https://dsn@ingest.f00.f00/1',
tracesSampleRate: 1,
integrations: [{ name: 'InboundFilters', setupOnce: () => {} }],
integrations: [{ name: 'EventFilters', setupOnce: () => {} }],
}),
);
client.init();
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions MIGRATION.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -821,6 +821,24 @@ import { inboundFiltersIntegration } from '@sentry/browser';
import { eventFiltersIntegration } from '@sentry/browser';
```

All SDKs now also set up `eventFiltersIntegration` instead of `inboundFiltersIntegration` as a default
integration, so the integration reports itself as `EventFilters` (e.g. in the `sdk.integrations` payload of
events). If you disable the integration by its previous name, update the reference:

```js
// before
Sentry.init({
integrations: integrations => integrations.filter(integration => integration.name !== 'InboundFilters'),
});

// after
Sentry.init({
integrations: integrations => integrations.filter(integration => integration.name !== 'EventFilters'),
});
```

The same applies when looking the integration up by name, e.g. via `client.getIntegrationByName('InboundFilters')`.

### `instrumentLangGraph` renamed to `instrumentStateGraph`

Affected SDKs: SDKs with LangGraph instrumentation.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ sentryTest(
async ({ getLocalTestUrl, page, browserName }) => {
if (browserName === 'webkit') {
// The error we're throwing in this test is thrown as "Script error." in Webkit.
// We filter "Script error." out by default in `InboundFilters`.
// I don't think there's much value to disable InboundFilters defaults for this test,
// We filter "Script error." out by default in `EventFilters`.
// I don't think there's much value to disable EventFilters defaults for this test,
// given that most of our users won't do that either.
// Let's skip it instead for Webkit.
sentryTest.skip();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ sentryTest(
async ({ getLocalTestUrl, page, browserName }) => {
if (browserName === 'webkit') {
// The error we're throwing in this test is thrown as "Script error." in Webkit.
// We filter "Script error." out by default in `InboundFilters`.
// I don't think there's much value to disable InboundFilters defaults for this test,
// We filter "Script error." out by default in `EventFilters`.
// I don't think there's much value to disable EventFilters defaults for this test,
// given that most of our users won't do that either.
// Let's skip it instead for Webkit.
sentryTest.skip();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ sentryTest('logs debug messages correctly', async ({ getLocalTestUrl, page }) =>
expect(consoleMessages).toEqual(
hasDebug
? [
'Sentry Logger [log]: Integration installed: InboundFilters',
'Sentry Logger [log]: Integration installed: EventFilters',
'Sentry Logger [log]: Integration installed: FunctionToString',
'Sentry Logger [log]: Integration installed: ConversationId',
'Sentry Logger [log]: Integration installed: BrowserApiErrors',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand DownExpand Up@@ -91,7 +91,7 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand DownExpand Up@@ -91,7 +91,7 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ const DEFAULT_REPLAY_EVENT = {
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
6 changes: 2 additions & 4 deletions packages/angular/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@ import {
conversationIdIntegration,
debug,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
inboundFiltersIntegration,
} from '@sentry/core';
import { IS_DEBUG_BUILD } from './flags';

Expand All@@ -34,9 +34,7 @@ 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(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
breadcrumbsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/astro/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,8 +66,6 @@ export {
httpIntegration,
httpServerIntegration,
httpServerSpansIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
isInitialized,
Expand Down
2 changes: 0 additions & 2 deletions packages/aws-serverless/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,8 +70,6 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
Expand Down
2 changes: 0 additions & 2 deletions packages/browser/src/exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,6 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
parameterize,
Expand Down
6 changes: 2 additions & 4 deletions packages/browser/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ import type { Client, Integration, Options } from '@sentry/core/browser';
import {
conversationIdIntegration,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
inboundFiltersIntegration,
initAndBind,
setNormalizeStringifier,
stackParserFromStackParserOptions,
Expand DownExpand Up@@ -35,9 +35,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
* `getDefaultIntegrations` but with an adjusted set of integrations.
*/
return [
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
browserApiErrorsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/bun/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,8 +91,6 @@ export {
requestDataIntegration,
fsIntegration,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
Expand Down
6 changes: 2 additions & 4 deletions packages/bun/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ import * as os from 'node:os';
import type { Integration, Options } from '@sentry/core';
import {
applySdkMetadata,
eventFiltersIntegration,
functionToStringIntegration,
hasSpansEnabled,
inboundFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
Expand DownExpand Up@@ -69,9 +69,7 @@ export function getDefaultIntegrationsWithoutPerformance(): Integration[] {
// Return a fresh array on each call so callers can safely mutate the result.
return [
// Common
// TODO(v11): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
requestDataIntegration(),
Expand Down
6 changes: 2 additions & 4 deletions packages/cloudflare/src/baseSdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@ import {
consoleIntegration,
conversationIdIntegration,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
GLOBAL_OBJ,
inboundFiltersIntegration,
initAndBind,
linkedErrorsIntegration,
requestDataIntegration,
Expand DownExpand Up@@ -52,9 +52,7 @@ export function getBaseDefaultIntegrations(options: CloudflareOptions): Integrat
// The Dedupe integration should not be used in workflows because we want to
// capture all step failures, even if they are the same error.
...(options.enableDedupe === false ? [] : [dedupeIntegration()]),
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
linkedErrorsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,6 @@ export {
getSpanDescendants,
continueTrace,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
Expand Down
24 changes: 0 additions & 24 deletions packages/core/src/integrations/eventFilters.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { DEBUG_BUILD } from '../debug-build';
import { defineIntegration } from '../integration';
import type { Event } from '../types/event';
import type { IntegrationFn } from '../types/integration';
import type { StackFrame } from '../types/stackframe';
import { debug } from '../utils/debug-logger';
import { getPossibleEventMessages } from '../utils/eventUtils';
Expand DownExpand Up@@ -67,29 +66,6 @@ export const eventFiltersIntegration = defineIntegration((options: Partial<Event
};
});

/**
* 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' as const,
};
}) satisfies IntegrationFn);

function _mergeOptions(
internalOptions: Partial<EventFiltersOptions> = {},
clientOptions: Partial<EventFiltersOptions> = {},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/semanticAttributes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME = 'sentry.sdk.name';
* @deprecated Use `SENTRY_SDK_VERSION` `@sentry/conventions/attributes` instead.
*/
export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION = 'sentry.sdk.version';
/** The list of integrations enabled in the Sentry SDK (e.g., ["InboundFilters", "BrowserTracing"]) */
/** The list of integrations enabled in the Sentry SDK (e.g., ["EventFilters", "BrowserTracing"]) */
export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS = 'sentry.sdk.integrations';

/** The user ID */
Expand Down
2 changes: 0 additions & 2 deletions packages/core/src/shared-exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,8 +144,6 @@ export { spanKindToName } from './spanKind';
export type { SpanKind, SpanKindNumber } from './spanKind';
export { addBreadcrumb } from './breadcrumbs';
export { functionToStringIntegration } from './integrations/functiontostring';
// eslint-disable-next-line typescript/no-deprecated
export { inboundFiltersIntegration } from './integrations/eventFilters';
export { eventFiltersIntegration } from './integrations/eventFilters';
export { linkedErrorsIntegration } from './integrations/linkederrors';
export { moduleMetadataIntegration } from './integrations/moduleMetadata';
Expand Down
11 changes: 4 additions & 7 deletions packages/core/test/lib/integrations/eventFilters.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { describe, expect, it } from 'vitest';
import type { EventFiltersOptions } from '../../../src/integrations/eventFilters';
import { eventFiltersIntegration, inboundFiltersIntegration } from '../../../src/integrations/eventFilters';
import { eventFiltersIntegration } from '../../../src/integrations/eventFilters';
import type { Event } from '../../../src/types/event';
import type { EventProcessor } from '../../../src/types/eventprocessor';
import type { Integration } from '../../../src/types/integration';
Expand All@@ -23,7 +23,7 @@ const PUBLIC_DSN = 'https://username@domain/123';
* expect(eventProcessor(SOME_EXCEPTION_EVENT)).toBe(null);
* ```
*
* @param options options passed into the InboundFilters integration
* @param options options passed into the EventFilters integration
* @param clientOptions options passed into the mock Sentry client
*/
function createEventFiltersEventProcessor(
Expand DownExpand Up@@ -409,11 +409,8 @@ function createUndefinedIsNotAnObjectEvent(evaluatingStr: string): Event {
};
}

describe.each([
// eslint-disable-next-line typescript/no-deprecated
['InboundFilters', inboundFiltersIntegration],
['EventFilters', eventFiltersIntegration],
])('%s', (_, integrationFn) => {
describe('EventFilters', () => {
const integrationFn = eventFiltersIntegration;
describe('ignoreErrors', () => {
it('string filter with partial match', () => {
const eventProcessor = createEventFiltersEventProcessor(integrationFn, {
Expand Down
6 changes: 3 additions & 3 deletions packages/core/test/lib/tracing/spans/captureSpan.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,7 +324,7 @@ describe('captureSpan', () => {
release: '1.0.0',
environment: 'staging',
integrations: [
{ name: 'InboundFilters', setupOnce: () => {} },
{ name: 'EventFilters', setupOnce: () => {} },
{ name: 'BrowserTracing', setupOnce: () => {} },
],
_metadata: {
Expand DownExpand Up@@ -369,7 +369,7 @@ describe('captureSpan', () => {
[SENTRY_SDK_VERSION]: { value: '9.0.0', type: 'string' },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS]: {
type: 'array',
value: ['InboundFilters', 'BrowserTracing'],
value: ['EventFilters', 'BrowserTracing'],
},
},
_segmentSpan: span,
Expand All@@ -381,7 +381,7 @@ describe('captureSpan', () => {
getDefaultTestClientOptions({
dsn: 'https://dsn@ingest.f00.f00/1',
tracesSampleRate: 1,
integrations: [{ name: 'InboundFilters', setupOnce: () => {} }],
integrations: [{ name: 'EventFilters', setupOnce: () => {} }],
}),
);
client.init();
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
18 changes: 18 additions & 0 deletions MIGRATION.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -821,6 +821,24 @@ import { inboundFiltersIntegration } from '@sentry/browser';
import { eventFiltersIntegration } from '@sentry/browser';
```

All SDKs now also set up `eventFiltersIntegration` instead of `inboundFiltersIntegration` as a default
integration, so the integration reports itself as `EventFilters` (e.g. in the `sdk.integrations` payload of
events). If you disable the integration by its previous name, update the reference:

```js
// before
Sentry.init({
integrations: integrations => integrations.filter(integration => integration.name !== 'InboundFilters'),
});

// after
Sentry.init({
integrations: integrations => integrations.filter(integration => integration.name !== 'EventFilters'),
});
```

The same applies when looking the integration up by name, e.g. via `client.getIntegrationByName('InboundFilters')`.

### `instrumentLangGraph` renamed to `instrumentStateGraph`

Affected SDKs: SDKs with LangGraph instrumentation.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ sentryTest(
async ({ getLocalTestUrl, page, browserName }) => {
if (browserName === 'webkit') {
// The error we're throwing in this test is thrown as "Script error." in Webkit.
// We filter "Script error." out by default in `InboundFilters`.
// I don't think there's much value to disable InboundFilters defaults for this test,
// We filter "Script error." out by default in `EventFilters`.
// I don't think there's much value to disable EventFilters defaults for this test,
// given that most of our users won't do that either.
// Let's skip it instead for Webkit.
sentryTest.skip();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ sentryTest(
async ({ getLocalTestUrl, page, browserName }) => {
if (browserName === 'webkit') {
// The error we're throwing in this test is thrown as "Script error." in Webkit.
// We filter "Script error." out by default in `InboundFilters`.
// I don't think there's much value to disable InboundFilters defaults for this test,
// We filter "Script error." out by default in `EventFilters`.
// I don't think there's much value to disable EventFilters defaults for this test,
// given that most of our users won't do that either.
// Let's skip it instead for Webkit.
sentryTest.skip();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ sentryTest('logs debug messages correctly', async ({ getLocalTestUrl, page }) =>
expect(consoleMessages).toEqual(
hasDebug
? [
'Sentry Logger [log]: Integration installed: InboundFilters',
'Sentry Logger [log]: Integration installed: EventFilters',
'Sentry Logger [log]: Integration installed: FunctionToString',
'Sentry Logger [log]: Integration installed: ConversationId',
'Sentry Logger [log]: Integration installed: BrowserApiErrors',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand DownExpand Up@@ -91,7 +91,7 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand DownExpand Up@@ -91,7 +91,7 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ const DEFAULT_REPLAY_EVENT = {
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
6 changes: 2 additions & 4 deletions packages/angular/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@ import {
conversationIdIntegration,
debug,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
inboundFiltersIntegration,
} from '@sentry/core';
import { IS_DEBUG_BUILD } from './flags';

Expand All@@ -34,9 +34,7 @@ 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(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
breadcrumbsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/astro/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,8 +66,6 @@ export {
httpIntegration,
httpServerIntegration,
httpServerSpansIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
isInitialized,
Expand Down
2 changes: 0 additions & 2 deletions packages/aws-serverless/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,8 +70,6 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
Expand Down
2 changes: 0 additions & 2 deletions packages/browser/src/exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,6 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
parameterize,
Expand Down
6 changes: 2 additions & 4 deletions packages/browser/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ import type { Client, Integration, Options } from '@sentry/core/browser';
import {
conversationIdIntegration,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
inboundFiltersIntegration,
initAndBind,
setNormalizeStringifier,
stackParserFromStackParserOptions,
Expand DownExpand Up@@ -35,9 +35,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
* `getDefaultIntegrations` but with an adjusted set of integrations.
*/
return [
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
browserApiErrorsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/bun/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,8 +91,6 @@ export {
requestDataIntegration,
fsIntegration,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
Expand Down
6 changes: 2 additions & 4 deletions packages/bun/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ import * as os from 'node:os';
import type { Integration, Options } from '@sentry/core';
import {
applySdkMetadata,
eventFiltersIntegration,
functionToStringIntegration,
hasSpansEnabled,
inboundFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
Expand DownExpand Up@@ -69,9 +69,7 @@ export function getDefaultIntegrationsWithoutPerformance(): Integration[] {
// Return a fresh array on each call so callers can safely mutate the result.
return [
// Common
// TODO(v11): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
requestDataIntegration(),
Expand Down
6 changes: 2 additions & 4 deletions packages/cloudflare/src/baseSdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@ import {
consoleIntegration,
conversationIdIntegration,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
GLOBAL_OBJ,
inboundFiltersIntegration,
initAndBind,
linkedErrorsIntegration,
requestDataIntegration,
Expand DownExpand Up@@ -52,9 +52,7 @@ export function getBaseDefaultIntegrations(options: CloudflareOptions): Integrat
// The Dedupe integration should not be used in workflows because we want to
// capture all step failures, even if they are the same error.
...(options.enableDedupe === false ? [] : [dedupeIntegration()]),
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
linkedErrorsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,6 @@ export {
getSpanDescendants,
continueTrace,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
Expand Down
24 changes: 0 additions & 24 deletions packages/core/src/integrations/eventFilters.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { DEBUG_BUILD } from '../debug-build';
import { defineIntegration } from '../integration';
import type { Event } from '../types/event';
import type { IntegrationFn } from '../types/integration';
import type { StackFrame } from '../types/stackframe';
import { debug } from '../utils/debug-logger';
import { getPossibleEventMessages } from '../utils/eventUtils';
Expand DownExpand Up@@ -67,29 +66,6 @@ export const eventFiltersIntegration = defineIntegration((options: Partial<Event
};
});

/**
* 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' as const,
};
}) satisfies IntegrationFn);

function _mergeOptions(
internalOptions: Partial<EventFiltersOptions> = {},
clientOptions: Partial<EventFiltersOptions> = {},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/semanticAttributes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME = 'sentry.sdk.name';
* @deprecated Use `SENTRY_SDK_VERSION` `@sentry/conventions/attributes` instead.
*/
export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION = 'sentry.sdk.version';
/** The list of integrations enabled in the Sentry SDK (e.g., ["InboundFilters", "BrowserTracing"]) */
/** The list of integrations enabled in the Sentry SDK (e.g., ["EventFilters", "BrowserTracing"]) */
export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS = 'sentry.sdk.integrations';

/** The user ID */
Expand Down
2 changes: 0 additions & 2 deletions packages/core/src/shared-exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,8 +144,6 @@ export { spanKindToName } from './spanKind';
export type { SpanKind, SpanKindNumber } from './spanKind';
export { addBreadcrumb } from './breadcrumbs';
export { functionToStringIntegration } from './integrations/functiontostring';
// eslint-disable-next-line typescript/no-deprecated
export { inboundFiltersIntegration } from './integrations/eventFilters';
export { eventFiltersIntegration } from './integrations/eventFilters';
export { linkedErrorsIntegration } from './integrations/linkederrors';
export { moduleMetadataIntegration } from './integrations/moduleMetadata';
Expand Down
11 changes: 4 additions & 7 deletions packages/core/test/lib/integrations/eventFilters.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { describe, expect, it } from 'vitest';
import type { EventFiltersOptions } from '../../../src/integrations/eventFilters';
import { eventFiltersIntegration, inboundFiltersIntegration } from '../../../src/integrations/eventFilters';
import { eventFiltersIntegration } from '../../../src/integrations/eventFilters';
import type { Event } from '../../../src/types/event';
import type { EventProcessor } from '../../../src/types/eventprocessor';
import type { Integration } from '../../../src/types/integration';
Expand All@@ -23,7 +23,7 @@ const PUBLIC_DSN = 'https://username@domain/123';
* expect(eventProcessor(SOME_EXCEPTION_EVENT)).toBe(null);
* ```
*
* @param options options passed into the InboundFilters integration
* @param options options passed into the EventFilters integration
* @param clientOptions options passed into the mock Sentry client
*/
function createEventFiltersEventProcessor(
Expand DownExpand Up@@ -409,11 +409,8 @@ function createUndefinedIsNotAnObjectEvent(evaluatingStr: string): Event {
};
}

describe.each([
// eslint-disable-next-line typescript/no-deprecated
['InboundFilters', inboundFiltersIntegration],
['EventFilters', eventFiltersIntegration],
])('%s', (_, integrationFn) => {
describe('EventFilters', () => {
const integrationFn = eventFiltersIntegration;
describe('ignoreErrors', () => {
it('string filter with partial match', () => {
const eventProcessor = createEventFiltersEventProcessor(integrationFn, {
Expand Down
6 changes: 3 additions & 3 deletions packages/core/test/lib/tracing/spans/captureSpan.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,7 +324,7 @@ describe('captureSpan', () => {
release: '1.0.0',
environment: 'staging',
integrations: [
{ name: 'InboundFilters', setupOnce: () => {} },
{ name: 'EventFilters', setupOnce: () => {} },
{ name: 'BrowserTracing', setupOnce: () => {} },
],
_metadata: {
Expand DownExpand Up@@ -369,7 +369,7 @@ describe('captureSpan', () => {
[SENTRY_SDK_VERSION]: { value: '9.0.0', type: 'string' },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS]: {
type: 'array',
value: ['InboundFilters', 'BrowserTracing'],
value: ['EventFilters', 'BrowserTracing'],
},
},
_segmentSpan: span,
Expand All@@ -381,7 +381,7 @@ describe('captureSpan', () => {
getDefaultTestClientOptions({
dsn: 'https://dsn@ingest.f00.f00/1',
tracesSampleRate: 1,
integrations: [{ name: 'InboundFilters', setupOnce: () => {} }],
integrations: [{ name: 'EventFilters', setupOnce: () => {} }],
}),
);
client.init();
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions MIGRATION.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -821,6 +821,24 @@ import { inboundFiltersIntegration } from '@sentry/browser';
import { eventFiltersIntegration } from '@sentry/browser';
```

All SDKs now also set up `eventFiltersIntegration` instead of `inboundFiltersIntegration` as a default
integration, so the integration reports itself as `EventFilters` (e.g. in the `sdk.integrations` payload of
events). If you disable the integration by its previous name, update the reference:

```js
// before
Sentry.init({
integrations: integrations => integrations.filter(integration => integration.name !== 'InboundFilters'),
});

// after
Sentry.init({
integrations: integrations => integrations.filter(integration => integration.name !== 'EventFilters'),
});
```

The same applies when looking the integration up by name, e.g. via `client.getIntegrationByName('InboundFilters')`.

### `instrumentLangGraph` renamed to `instrumentStateGraph`

Affected SDKs: SDKs with LangGraph instrumentation.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ sentryTest(
async ({ getLocalTestUrl, page, browserName }) => {
if (browserName === 'webkit') {
// The error we're throwing in this test is thrown as "Script error." in Webkit.
// We filter "Script error." out by default in `InboundFilters`.
// I don't think there's much value to disable InboundFilters defaults for this test,
// We filter "Script error." out by default in `EventFilters`.
// I don't think there's much value to disable EventFilters defaults for this test,
// given that most of our users won't do that either.
// Let's skip it instead for Webkit.
sentryTest.skip();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ sentryTest(
async ({ getLocalTestUrl, page, browserName }) => {
if (browserName === 'webkit') {
// The error we're throwing in this test is thrown as "Script error." in Webkit.
// We filter "Script error." out by default in `InboundFilters`.
// I don't think there's much value to disable InboundFilters defaults for this test,
// We filter "Script error." out by default in `EventFilters`.
// I don't think there's much value to disable EventFilters defaults for this test,
// given that most of our users won't do that either.
// Let's skip it instead for Webkit.
sentryTest.skip();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ sentryTest('logs debug messages correctly', async ({ getLocalTestUrl, page }) =>
expect(consoleMessages).toEqual(
hasDebug
? [
'Sentry Logger [log]: Integration installed: InboundFilters',
'Sentry Logger [log]: Integration installed: EventFilters',
'Sentry Logger [log]: Integration installed: FunctionToString',
'Sentry Logger [log]: Integration installed: ConversationId',
'Sentry Logger [log]: Integration installed: BrowserApiErrors',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand DownExpand Up@@ -91,7 +91,7 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand DownExpand Up@@ -91,7 +91,7 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ const DEFAULT_REPLAY_EVENT = {
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
6 changes: 2 additions & 4 deletions packages/angular/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@ import {
conversationIdIntegration,
debug,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
inboundFiltersIntegration,
} from '@sentry/core';
import { IS_DEBUG_BUILD } from './flags';

Expand All@@ -34,9 +34,7 @@ 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(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
breadcrumbsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/astro/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,8 +66,6 @@ export {
httpIntegration,
httpServerIntegration,
httpServerSpansIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
isInitialized,
Expand Down
2 changes: 0 additions & 2 deletions packages/aws-serverless/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,8 +70,6 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
Expand Down
2 changes: 0 additions & 2 deletions packages/browser/src/exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,6 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
parameterize,
Expand Down
6 changes: 2 additions & 4 deletions packages/browser/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ import type { Client, Integration, Options } from '@sentry/core/browser';
import {
conversationIdIntegration,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
inboundFiltersIntegration,
initAndBind,
setNormalizeStringifier,
stackParserFromStackParserOptions,
Expand DownExpand Up@@ -35,9 +35,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
* `getDefaultIntegrations` but with an adjusted set of integrations.
*/
return [
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
browserApiErrorsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/bun/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,8 +91,6 @@ export {
requestDataIntegration,
fsIntegration,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
Expand Down
6 changes: 2 additions & 4 deletions packages/bun/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ import * as os from 'node:os';
import type { Integration, Options } from '@sentry/core';
import {
applySdkMetadata,
eventFiltersIntegration,
functionToStringIntegration,
hasSpansEnabled,
inboundFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
Expand DownExpand Up@@ -69,9 +69,7 @@ export function getDefaultIntegrationsWithoutPerformance(): Integration[] {
// Return a fresh array on each call so callers can safely mutate the result.
return [
// Common
// TODO(v11): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
requestDataIntegration(),
Expand Down
6 changes: 2 additions & 4 deletions packages/cloudflare/src/baseSdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@ import {
consoleIntegration,
conversationIdIntegration,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
GLOBAL_OBJ,
inboundFiltersIntegration,
initAndBind,
linkedErrorsIntegration,
requestDataIntegration,
Expand DownExpand Up@@ -52,9 +52,7 @@ export function getBaseDefaultIntegrations(options: CloudflareOptions): Integrat
// The Dedupe integration should not be used in workflows because we want to
// capture all step failures, even if they are the same error.
...(options.enableDedupe === false ? [] : [dedupeIntegration()]),
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
linkedErrorsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,6 @@ export {
getSpanDescendants,
continueTrace,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
Expand Down
24 changes: 0 additions & 24 deletions packages/core/src/integrations/eventFilters.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { DEBUG_BUILD } from '../debug-build';
import { defineIntegration } from '../integration';
import type { Event } from '../types/event';
import type { IntegrationFn } from '../types/integration';
import type { StackFrame } from '../types/stackframe';
import { debug } from '../utils/debug-logger';
import { getPossibleEventMessages } from '../utils/eventUtils';
Expand DownExpand Up@@ -67,29 +66,6 @@ export const eventFiltersIntegration = defineIntegration((options: Partial<Event
};
});

/**
* 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' as const,
};
}) satisfies IntegrationFn);

function _mergeOptions(
internalOptions: Partial<EventFiltersOptions> = {},
clientOptions: Partial<EventFiltersOptions> = {},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/semanticAttributes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME = 'sentry.sdk.name';
* @deprecated Use `SENTRY_SDK_VERSION` `@sentry/conventions/attributes` instead.
*/
export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION = 'sentry.sdk.version';
/** The list of integrations enabled in the Sentry SDK (e.g., ["InboundFilters", "BrowserTracing"]) */
/** The list of integrations enabled in the Sentry SDK (e.g., ["EventFilters", "BrowserTracing"]) */
export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS = 'sentry.sdk.integrations';

/** The user ID */
Expand Down
2 changes: 0 additions & 2 deletions packages/core/src/shared-exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,8 +144,6 @@ export { spanKindToName } from './spanKind';
export type { SpanKind, SpanKindNumber } from './spanKind';
export { addBreadcrumb } from './breadcrumbs';
export { functionToStringIntegration } from './integrations/functiontostring';
// eslint-disable-next-line typescript/no-deprecated
export { inboundFiltersIntegration } from './integrations/eventFilters';
export { eventFiltersIntegration } from './integrations/eventFilters';
export { linkedErrorsIntegration } from './integrations/linkederrors';
export { moduleMetadataIntegration } from './integrations/moduleMetadata';
Expand Down
11 changes: 4 additions & 7 deletions packages/core/test/lib/integrations/eventFilters.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { describe, expect, it } from 'vitest';
import type { EventFiltersOptions } from '../../../src/integrations/eventFilters';
import { eventFiltersIntegration, inboundFiltersIntegration } from '../../../src/integrations/eventFilters';
import { eventFiltersIntegration } from '../../../src/integrations/eventFilters';
import type { Event } from '../../../src/types/event';
import type { EventProcessor } from '../../../src/types/eventprocessor';
import type { Integration } from '../../../src/types/integration';
Expand All@@ -23,7 +23,7 @@ const PUBLIC_DSN = 'https://username@domain/123';
* expect(eventProcessor(SOME_EXCEPTION_EVENT)).toBe(null);
* ```
*
* @param options options passed into the InboundFilters integration
* @param options options passed into the EventFilters integration
* @param clientOptions options passed into the mock Sentry client
*/
function createEventFiltersEventProcessor(
Expand DownExpand Up@@ -409,11 +409,8 @@ function createUndefinedIsNotAnObjectEvent(evaluatingStr: string): Event {
};
}

describe.each([
// eslint-disable-next-line typescript/no-deprecated
['InboundFilters', inboundFiltersIntegration],
['EventFilters', eventFiltersIntegration],
])('%s', (_, integrationFn) => {
describe('EventFilters', () => {
const integrationFn = eventFiltersIntegration;
describe('ignoreErrors', () => {
it('string filter with partial match', () => {
const eventProcessor = createEventFiltersEventProcessor(integrationFn, {
Expand Down
6 changes: 3 additions & 3 deletions packages/core/test/lib/tracing/spans/captureSpan.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,7 +324,7 @@ describe('captureSpan', () => {
release: '1.0.0',
environment: 'staging',
integrations: [
{ name: 'InboundFilters', setupOnce: () => {} },
{ name: 'EventFilters', setupOnce: () => {} },
{ name: 'BrowserTracing', setupOnce: () => {} },
],
_metadata: {
Expand DownExpand Up@@ -369,7 +369,7 @@ describe('captureSpan', () => {
[SENTRY_SDK_VERSION]: { value: '9.0.0', type: 'string' },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS]: {
type: 'array',
value: ['InboundFilters', 'BrowserTracing'],
value: ['EventFilters', 'BrowserTracing'],
},
},
_segmentSpan: span,
Expand All@@ -381,7 +381,7 @@ describe('captureSpan', () => {
getDefaultTestClientOptions({
dsn: 'https://dsn@ingest.f00.f00/1',
tracesSampleRate: 1,
integrations: [{ name: 'InboundFilters', setupOnce: () => {} }],
integrations: [{ name: 'EventFilters', setupOnce: () => {} }],
}),
);
client.init();
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
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
18 changes: 18 additions & 0 deletions MIGRATION.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -821,6 +821,24 @@ import { inboundFiltersIntegration } from '@sentry/browser';
import { eventFiltersIntegration } from '@sentry/browser';
```

All SDKs now also set up `eventFiltersIntegration` instead of `inboundFiltersIntegration` as a default
integration, so the integration reports itself as `EventFilters` (e.g. in the `sdk.integrations` payload of
events). If you disable the integration by its previous name, update the reference:

```js
// before
Sentry.init({
integrations: integrations => integrations.filter(integration => integration.name !== 'InboundFilters'),
});

// after
Sentry.init({
integrations: integrations => integrations.filter(integration => integration.name !== 'EventFilters'),
});
```

The same applies when looking the integration up by name, e.g. via `client.getIntegrationByName('InboundFilters')`.

### `instrumentLangGraph` renamed to `instrumentStateGraph`

Affected SDKs: SDKs with LangGraph instrumentation.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ sentryTest(
async ({ getLocalTestUrl, page, browserName }) => {
if (browserName === 'webkit') {
// The error we're throwing in this test is thrown as "Script error." in Webkit.
// We filter "Script error." out by default in `InboundFilters`.
// I don't think there's much value to disable InboundFilters defaults for this test,
// We filter "Script error." out by default in `EventFilters`.
// I don't think there's much value to disable EventFilters defaults for this test,
// given that most of our users won't do that either.
// Let's skip it instead for Webkit.
sentryTest.skip();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ sentryTest(
async ({ getLocalTestUrl, page, browserName }) => {
if (browserName === 'webkit') {
// The error we're throwing in this test is thrown as "Script error." in Webkit.
// We filter "Script error." out by default in `InboundFilters`.
// I don't think there's much value to disable InboundFilters defaults for this test,
// We filter "Script error." out by default in `EventFilters`.
// I don't think there's much value to disable EventFilters defaults for this test,
// given that most of our users won't do that either.
// Let's skip it instead for Webkit.
sentryTest.skip();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ sentryTest('logs debug messages correctly', async ({ getLocalTestUrl, page }) =>
expect(consoleMessages).toEqual(
hasDebug
? [
'Sentry Logger [log]: Integration installed: InboundFilters',
'Sentry Logger [log]: Integration installed: EventFilters',
'Sentry Logger [log]: Integration installed: FunctionToString',
'Sentry Logger [log]: Integration installed: ConversationId',
'Sentry Logger [log]: Integration installed: BrowserApiErrors',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand DownExpand Up@@ -91,7 +91,7 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand DownExpand Up@@ -91,7 +91,7 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ const DEFAULT_REPLAY_EVENT = {
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
6 changes: 2 additions & 4 deletions packages/angular/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@ import {
conversationIdIntegration,
debug,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
inboundFiltersIntegration,
} from '@sentry/core';
import { IS_DEBUG_BUILD } from './flags';

Expand All@@ -34,9 +34,7 @@ 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(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
breadcrumbsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/astro/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,8 +66,6 @@ export {
httpIntegration,
httpServerIntegration,
httpServerSpansIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
isInitialized,
Expand Down
2 changes: 0 additions & 2 deletions packages/aws-serverless/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,8 +70,6 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
Expand Down
2 changes: 0 additions & 2 deletions packages/browser/src/exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,6 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
parameterize,
Expand Down
6 changes: 2 additions & 4 deletions packages/browser/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ import type { Client, Integration, Options } from '@sentry/core/browser';
import {
conversationIdIntegration,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
inboundFiltersIntegration,
initAndBind,
setNormalizeStringifier,
stackParserFromStackParserOptions,
Expand DownExpand Up@@ -35,9 +35,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
* `getDefaultIntegrations` but with an adjusted set of integrations.
*/
return [
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
browserApiErrorsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/bun/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,8 +91,6 @@ export {
requestDataIntegration,
fsIntegration,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
Expand Down
6 changes: 2 additions & 4 deletions packages/bun/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ import * as os from 'node:os';
import type { Integration, Options } from '@sentry/core';
import {
applySdkMetadata,
eventFiltersIntegration,
functionToStringIntegration,
hasSpansEnabled,
inboundFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
Expand DownExpand Up@@ -69,9 +69,7 @@ export function getDefaultIntegrationsWithoutPerformance(): Integration[] {
// Return a fresh array on each call so callers can safely mutate the result.
return [
// Common
// TODO(v11): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
requestDataIntegration(),
Expand Down
6 changes: 2 additions & 4 deletions packages/cloudflare/src/baseSdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@ import {
consoleIntegration,
conversationIdIntegration,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
GLOBAL_OBJ,
inboundFiltersIntegration,
initAndBind,
linkedErrorsIntegration,
requestDataIntegration,
Expand DownExpand Up@@ -52,9 +52,7 @@ export function getBaseDefaultIntegrations(options: CloudflareOptions): Integrat
// The Dedupe integration should not be used in workflows because we want to
// capture all step failures, even if they are the same error.
...(options.enableDedupe === false ? [] : [dedupeIntegration()]),
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
linkedErrorsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,6 @@ export {
getSpanDescendants,
continueTrace,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
Expand Down
24 changes: 0 additions & 24 deletions packages/core/src/integrations/eventFilters.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { DEBUG_BUILD } from '../debug-build';
import { defineIntegration } from '../integration';
import type { Event } from '../types/event';
import type { IntegrationFn } from '../types/integration';
import type { StackFrame } from '../types/stackframe';
import { debug } from '../utils/debug-logger';
import { getPossibleEventMessages } from '../utils/eventUtils';
Expand DownExpand Up@@ -67,29 +66,6 @@ export const eventFiltersIntegration = defineIntegration((options: Partial<Event
};
});

/**
* 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' as const,
};
}) satisfies IntegrationFn);

function _mergeOptions(
internalOptions: Partial<EventFiltersOptions> = {},
clientOptions: Partial<EventFiltersOptions> = {},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/semanticAttributes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME = 'sentry.sdk.name';
* @deprecated Use `SENTRY_SDK_VERSION` `@sentry/conventions/attributes` instead.
*/
export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION = 'sentry.sdk.version';
/** The list of integrations enabled in the Sentry SDK (e.g., ["InboundFilters", "BrowserTracing"]) */
/** The list of integrations enabled in the Sentry SDK (e.g., ["EventFilters", "BrowserTracing"]) */
export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS = 'sentry.sdk.integrations';

/** The user ID */
Expand Down
2 changes: 0 additions & 2 deletions packages/core/src/shared-exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,8 +144,6 @@ export { spanKindToName } from './spanKind';
export type { SpanKind, SpanKindNumber } from './spanKind';
export { addBreadcrumb } from './breadcrumbs';
export { functionToStringIntegration } from './integrations/functiontostring';
// eslint-disable-next-line typescript/no-deprecated
export { inboundFiltersIntegration } from './integrations/eventFilters';
export { eventFiltersIntegration } from './integrations/eventFilters';
export { linkedErrorsIntegration } from './integrations/linkederrors';
export { moduleMetadataIntegration } from './integrations/moduleMetadata';
Expand Down
11 changes: 4 additions & 7 deletions packages/core/test/lib/integrations/eventFilters.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { describe, expect, it } from 'vitest';
import type { EventFiltersOptions } from '../../../src/integrations/eventFilters';
import { eventFiltersIntegration, inboundFiltersIntegration } from '../../../src/integrations/eventFilters';
import { eventFiltersIntegration } from '../../../src/integrations/eventFilters';
import type { Event } from '../../../src/types/event';
import type { EventProcessor } from '../../../src/types/eventprocessor';
import type { Integration } from '../../../src/types/integration';
Expand All@@ -23,7 +23,7 @@ const PUBLIC_DSN = 'https://username@domain/123';
* expect(eventProcessor(SOME_EXCEPTION_EVENT)).toBe(null);
* ```
*
* @param options options passed into the InboundFilters integration
* @param options options passed into the EventFilters integration
* @param clientOptions options passed into the mock Sentry client
*/
function createEventFiltersEventProcessor(
Expand DownExpand Up@@ -409,11 +409,8 @@ function createUndefinedIsNotAnObjectEvent(evaluatingStr: string): Event {
};
}

describe.each([
// eslint-disable-next-line typescript/no-deprecated
['InboundFilters', inboundFiltersIntegration],
['EventFilters', eventFiltersIntegration],
])('%s', (_, integrationFn) => {
describe('EventFilters', () => {
const integrationFn = eventFiltersIntegration;
describe('ignoreErrors', () => {
it('string filter with partial match', () => {
const eventProcessor = createEventFiltersEventProcessor(integrationFn, {
Expand Down
6 changes: 3 additions & 3 deletions packages/core/test/lib/tracing/spans/captureSpan.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,7 +324,7 @@ describe('captureSpan', () => {
release: '1.0.0',
environment: 'staging',
integrations: [
{ name: 'InboundFilters', setupOnce: () => {} },
{ name: 'EventFilters', setupOnce: () => {} },
{ name: 'BrowserTracing', setupOnce: () => {} },
],
_metadata: {
Expand DownExpand Up@@ -369,7 +369,7 @@ describe('captureSpan', () => {
[SENTRY_SDK_VERSION]: { value: '9.0.0', type: 'string' },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS]: {
type: 'array',
value: ['InboundFilters', 'BrowserTracing'],
value: ['EventFilters', 'BrowserTracing'],
},
},
_segmentSpan: span,
Expand All@@ -381,7 +381,7 @@ describe('captureSpan', () => {
getDefaultTestClientOptions({
dsn: 'https://dsn@ingest.f00.f00/1',
tracesSampleRate: 1,
integrations: [{ name: 'InboundFilters', setupOnce: () => {} }],
integrations: [{ name: 'EventFilters', setupOnce: () => {} }],
}),
);
client.init();
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
18 changes: 18 additions & 0 deletions MIGRATION.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -821,6 +821,24 @@ import { inboundFiltersIntegration } from '@sentry/browser';
import { eventFiltersIntegration } from '@sentry/browser';
```

All SDKs now also set up `eventFiltersIntegration` instead of `inboundFiltersIntegration` as a default
integration, so the integration reports itself as `EventFilters` (e.g. in the `sdk.integrations` payload of
events). If you disable the integration by its previous name, update the reference:

```js
// before
Sentry.init({
integrations: integrations => integrations.filter(integration => integration.name !== 'InboundFilters'),
});

// after
Sentry.init({
integrations: integrations => integrations.filter(integration => integration.name !== 'EventFilters'),
});
```

The same applies when looking the integration up by name, e.g. via `client.getIntegrationByName('InboundFilters')`.

### `instrumentLangGraph` renamed to `instrumentStateGraph`

Affected SDKs: SDKs with LangGraph instrumentation.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ sentryTest(
async ({ getLocalTestUrl, page, browserName }) => {
if (browserName === 'webkit') {
// The error we're throwing in this test is thrown as "Script error." in Webkit.
// We filter "Script error." out by default in `InboundFilters`.
// I don't think there's much value to disable InboundFilters defaults for this test,
// We filter "Script error." out by default in `EventFilters`.
// I don't think there's much value to disable EventFilters defaults for this test,
// given that most of our users won't do that either.
// Let's skip it instead for Webkit.
sentryTest.skip();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ sentryTest(
async ({ getLocalTestUrl, page, browserName }) => {
if (browserName === 'webkit') {
// The error we're throwing in this test is thrown as "Script error." in Webkit.
// We filter "Script error." out by default in `InboundFilters`.
// I don't think there's much value to disable InboundFilters defaults for this test,
// We filter "Script error." out by default in `EventFilters`.
// I don't think there's much value to disable EventFilters defaults for this test,
// given that most of our users won't do that either.
// Let's skip it instead for Webkit.
sentryTest.skip();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ sentryTest('logs debug messages correctly', async ({ getLocalTestUrl, page }) =>
expect(consoleMessages).toEqual(
hasDebug
? [
'Sentry Logger [log]: Integration installed: InboundFilters',
'Sentry Logger [log]: Integration installed: EventFilters',
'Sentry Logger [log]: Integration installed: FunctionToString',
'Sentry Logger [log]: Integration installed: ConversationId',
'Sentry Logger [log]: Integration installed: BrowserApiErrors',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand DownExpand Up@@ -91,7 +91,7 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand DownExpand Up@@ -91,7 +91,7 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ const DEFAULT_REPLAY_EVENT = {
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
6 changes: 2 additions & 4 deletions packages/angular/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@ import {
conversationIdIntegration,
debug,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
inboundFiltersIntegration,
} from '@sentry/core';
import { IS_DEBUG_BUILD } from './flags';

Expand All@@ -34,9 +34,7 @@ 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(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
breadcrumbsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/astro/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,8 +66,6 @@ export {
httpIntegration,
httpServerIntegration,
httpServerSpansIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
isInitialized,
Expand Down
2 changes: 0 additions & 2 deletions packages/aws-serverless/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,8 +70,6 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
Expand Down
2 changes: 0 additions & 2 deletions packages/browser/src/exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,6 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
parameterize,
Expand Down
6 changes: 2 additions & 4 deletions packages/browser/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ import type { Client, Integration, Options } from '@sentry/core/browser';
import {
conversationIdIntegration,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
inboundFiltersIntegration,
initAndBind,
setNormalizeStringifier,
stackParserFromStackParserOptions,
Expand DownExpand Up@@ -35,9 +35,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
* `getDefaultIntegrations` but with an adjusted set of integrations.
*/
return [
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
browserApiErrorsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/bun/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,8 +91,6 @@ export {
requestDataIntegration,
fsIntegration,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
Expand Down
6 changes: 2 additions & 4 deletions packages/bun/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ import * as os from 'node:os';
import type { Integration, Options } from '@sentry/core';
import {
applySdkMetadata,
eventFiltersIntegration,
functionToStringIntegration,
hasSpansEnabled,
inboundFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
Expand DownExpand Up@@ -69,9 +69,7 @@ export function getDefaultIntegrationsWithoutPerformance(): Integration[] {
// Return a fresh array on each call so callers can safely mutate the result.
return [
// Common
// TODO(v11): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
requestDataIntegration(),
Expand Down
6 changes: 2 additions & 4 deletions packages/cloudflare/src/baseSdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@ import {
consoleIntegration,
conversationIdIntegration,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
GLOBAL_OBJ,
inboundFiltersIntegration,
initAndBind,
linkedErrorsIntegration,
requestDataIntegration,
Expand DownExpand Up@@ -52,9 +52,7 @@ export function getBaseDefaultIntegrations(options: CloudflareOptions): Integrat
// The Dedupe integration should not be used in workflows because we want to
// capture all step failures, even if they are the same error.
...(options.enableDedupe === false ? [] : [dedupeIntegration()]),
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
linkedErrorsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,6 @@ export {
getSpanDescendants,
continueTrace,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
Expand Down
24 changes: 0 additions & 24 deletions packages/core/src/integrations/eventFilters.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { DEBUG_BUILD } from '../debug-build';
import { defineIntegration } from '../integration';
import type { Event } from '../types/event';
import type { IntegrationFn } from '../types/integration';
import type { StackFrame } from '../types/stackframe';
import { debug } from '../utils/debug-logger';
import { getPossibleEventMessages } from '../utils/eventUtils';
Expand DownExpand Up@@ -67,29 +66,6 @@ export const eventFiltersIntegration = defineIntegration((options: Partial<Event
};
});

/**
* 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' as const,
};
}) satisfies IntegrationFn);

function _mergeOptions(
internalOptions: Partial<EventFiltersOptions> = {},
clientOptions: Partial<EventFiltersOptions> = {},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/semanticAttributes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME = 'sentry.sdk.name';
* @deprecated Use `SENTRY_SDK_VERSION` `@sentry/conventions/attributes` instead.
*/
export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION = 'sentry.sdk.version';
/** The list of integrations enabled in the Sentry SDK (e.g., ["InboundFilters", "BrowserTracing"]) */
/** The list of integrations enabled in the Sentry SDK (e.g., ["EventFilters", "BrowserTracing"]) */
export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS = 'sentry.sdk.integrations';

/** The user ID */
Expand Down
2 changes: 0 additions & 2 deletions packages/core/src/shared-exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,8 +144,6 @@ export { spanKindToName } from './spanKind';
export type { SpanKind, SpanKindNumber } from './spanKind';
export { addBreadcrumb } from './breadcrumbs';
export { functionToStringIntegration } from './integrations/functiontostring';
// eslint-disable-next-line typescript/no-deprecated
export { inboundFiltersIntegration } from './integrations/eventFilters';
export { eventFiltersIntegration } from './integrations/eventFilters';
export { linkedErrorsIntegration } from './integrations/linkederrors';
export { moduleMetadataIntegration } from './integrations/moduleMetadata';
Expand Down
11 changes: 4 additions & 7 deletions packages/core/test/lib/integrations/eventFilters.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { describe, expect, it } from 'vitest';
import type { EventFiltersOptions } from '../../../src/integrations/eventFilters';
import { eventFiltersIntegration, inboundFiltersIntegration } from '../../../src/integrations/eventFilters';
import { eventFiltersIntegration } from '../../../src/integrations/eventFilters';
import type { Event } from '../../../src/types/event';
import type { EventProcessor } from '../../../src/types/eventprocessor';
import type { Integration } from '../../../src/types/integration';
Expand All@@ -23,7 +23,7 @@ const PUBLIC_DSN = 'https://username@domain/123';
* expect(eventProcessor(SOME_EXCEPTION_EVENT)).toBe(null);
* ```
*
* @param options options passed into the InboundFilters integration
* @param options options passed into the EventFilters integration
* @param clientOptions options passed into the mock Sentry client
*/
function createEventFiltersEventProcessor(
Expand DownExpand Up@@ -409,11 +409,8 @@ function createUndefinedIsNotAnObjectEvent(evaluatingStr: string): Event {
};
}

describe.each([
// eslint-disable-next-line typescript/no-deprecated
['InboundFilters', inboundFiltersIntegration],
['EventFilters', eventFiltersIntegration],
])('%s', (_, integrationFn) => {
describe('EventFilters', () => {
const integrationFn = eventFiltersIntegration;
describe('ignoreErrors', () => {
it('string filter with partial match', () => {
const eventProcessor = createEventFiltersEventProcessor(integrationFn, {
Expand Down
6 changes: 3 additions & 3 deletions packages/core/test/lib/tracing/spans/captureSpan.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,7 +324,7 @@ describe('captureSpan', () => {
release: '1.0.0',
environment: 'staging',
integrations: [
{ name: 'InboundFilters', setupOnce: () => {} },
{ name: 'EventFilters', setupOnce: () => {} },
{ name: 'BrowserTracing', setupOnce: () => {} },
],
_metadata: {
Expand DownExpand Up@@ -369,7 +369,7 @@ describe('captureSpan', () => {
[SENTRY_SDK_VERSION]: { value: '9.0.0', type: 'string' },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS]: {
type: 'array',
value: ['InboundFilters', 'BrowserTracing'],
value: ['EventFilters', 'BrowserTracing'],
},
},
_segmentSpan: span,
Expand All@@ -381,7 +381,7 @@ describe('captureSpan', () => {
getDefaultTestClientOptions({
dsn: 'https://dsn@ingest.f00.f00/1',
tracesSampleRate: 1,
integrations: [{ name: 'InboundFilters', setupOnce: () => {} }],
integrations: [{ name: 'EventFilters', setupOnce: () => {} }],
}),
);
client.init();
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
18 changes: 18 additions & 0 deletions MIGRATION.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -821,6 +821,24 @@ import { inboundFiltersIntegration } from '@sentry/browser';
import { eventFiltersIntegration } from '@sentry/browser';
```

All SDKs now also set up `eventFiltersIntegration` instead of `inboundFiltersIntegration` as a default
integration, so the integration reports itself as `EventFilters` (e.g. in the `sdk.integrations` payload of
events). If you disable the integration by its previous name, update the reference:

```js
// before
Sentry.init({
integrations: integrations => integrations.filter(integration => integration.name !== 'InboundFilters'),
});

// after
Sentry.init({
integrations: integrations => integrations.filter(integration => integration.name !== 'EventFilters'),
});
```

The same applies when looking the integration up by name, e.g. via `client.getIntegrationByName('InboundFilters')`.

### `instrumentLangGraph` renamed to `instrumentStateGraph`

Affected SDKs: SDKs with LangGraph instrumentation.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ sentryTest(
async ({ getLocalTestUrl, page, browserName }) => {
if (browserName === 'webkit') {
// The error we're throwing in this test is thrown as "Script error." in Webkit.
// We filter "Script error." out by default in `InboundFilters`.
// I don't think there's much value to disable InboundFilters defaults for this test,
// We filter "Script error." out by default in `EventFilters`.
// I don't think there's much value to disable EventFilters defaults for this test,
// given that most of our users won't do that either.
// Let's skip it instead for Webkit.
sentryTest.skip();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ sentryTest(
async ({ getLocalTestUrl, page, browserName }) => {
if (browserName === 'webkit') {
// The error we're throwing in this test is thrown as "Script error." in Webkit.
// We filter "Script error." out by default in `InboundFilters`.
// I don't think there's much value to disable InboundFilters defaults for this test,
// We filter "Script error." out by default in `EventFilters`.
// I don't think there's much value to disable EventFilters defaults for this test,
// given that most of our users won't do that either.
// Let's skip it instead for Webkit.
sentryTest.skip();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ sentryTest('logs debug messages correctly', async ({ getLocalTestUrl, page }) =>
expect(consoleMessages).toEqual(
hasDebug
? [
'Sentry Logger [log]: Integration installed: InboundFilters',
'Sentry Logger [log]: Integration installed: EventFilters',
'Sentry Logger [log]: Integration installed: FunctionToString',
'Sentry Logger [log]: Integration installed: ConversationId',
'Sentry Logger [log]: Integration installed: BrowserApiErrors',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand DownExpand Up@@ -91,7 +91,7 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand DownExpand Up@@ -91,7 +91,7 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ const DEFAULT_REPLAY_EVENT = {
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
6 changes: 2 additions & 4 deletions packages/angular/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@ import {
conversationIdIntegration,
debug,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
inboundFiltersIntegration,
} from '@sentry/core';
import { IS_DEBUG_BUILD } from './flags';

Expand All@@ -34,9 +34,7 @@ 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(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
breadcrumbsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/astro/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,8 +66,6 @@ export {
httpIntegration,
httpServerIntegration,
httpServerSpansIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
isInitialized,
Expand Down
2 changes: 0 additions & 2 deletions packages/aws-serverless/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,8 +70,6 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
Expand Down
2 changes: 0 additions & 2 deletions packages/browser/src/exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,6 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
parameterize,
Expand Down
6 changes: 2 additions & 4 deletions packages/browser/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ import type { Client, Integration, Options } from '@sentry/core/browser';
import {
conversationIdIntegration,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
inboundFiltersIntegration,
initAndBind,
setNormalizeStringifier,
stackParserFromStackParserOptions,
Expand DownExpand Up@@ -35,9 +35,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
* `getDefaultIntegrations` but with an adjusted set of integrations.
*/
return [
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
browserApiErrorsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/bun/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,8 +91,6 @@ export {
requestDataIntegration,
fsIntegration,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
Expand Down
6 changes: 2 additions & 4 deletions packages/bun/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ import * as os from 'node:os';
import type { Integration, Options } from '@sentry/core';
import {
applySdkMetadata,
eventFiltersIntegration,
functionToStringIntegration,
hasSpansEnabled,
inboundFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
Expand DownExpand Up@@ -69,9 +69,7 @@ export function getDefaultIntegrationsWithoutPerformance(): Integration[] {
// Return a fresh array on each call so callers can safely mutate the result.
return [
// Common
// TODO(v11): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
requestDataIntegration(),
Expand Down
6 changes: 2 additions & 4 deletions packages/cloudflare/src/baseSdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@ import {
consoleIntegration,
conversationIdIntegration,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
GLOBAL_OBJ,
inboundFiltersIntegration,
initAndBind,
linkedErrorsIntegration,
requestDataIntegration,
Expand DownExpand Up@@ -52,9 +52,7 @@ export function getBaseDefaultIntegrations(options: CloudflareOptions): Integrat
// The Dedupe integration should not be used in workflows because we want to
// capture all step failures, even if they are the same error.
...(options.enableDedupe === false ? [] : [dedupeIntegration()]),
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
linkedErrorsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,6 @@ export {
getSpanDescendants,
continueTrace,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
Expand Down
24 changes: 0 additions & 24 deletions packages/core/src/integrations/eventFilters.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { DEBUG_BUILD } from '../debug-build';
import { defineIntegration } from '../integration';
import type { Event } from '../types/event';
import type { IntegrationFn } from '../types/integration';
import type { StackFrame } from '../types/stackframe';
import { debug } from '../utils/debug-logger';
import { getPossibleEventMessages } from '../utils/eventUtils';
Expand DownExpand Up@@ -67,29 +66,6 @@ export const eventFiltersIntegration = defineIntegration((options: Partial<Event
};
});

/**
* 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' as const,
};
}) satisfies IntegrationFn);

function _mergeOptions(
internalOptions: Partial<EventFiltersOptions> = {},
clientOptions: Partial<EventFiltersOptions> = {},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/semanticAttributes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME = 'sentry.sdk.name';
* @deprecated Use `SENTRY_SDK_VERSION` `@sentry/conventions/attributes` instead.
*/
export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION = 'sentry.sdk.version';
/** The list of integrations enabled in the Sentry SDK (e.g., ["InboundFilters", "BrowserTracing"]) */
/** The list of integrations enabled in the Sentry SDK (e.g., ["EventFilters", "BrowserTracing"]) */
export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS = 'sentry.sdk.integrations';

/** The user ID */
Expand Down
2 changes: 0 additions & 2 deletions packages/core/src/shared-exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,8 +144,6 @@ export { spanKindToName } from './spanKind';
export type { SpanKind, SpanKindNumber } from './spanKind';
export { addBreadcrumb } from './breadcrumbs';
export { functionToStringIntegration } from './integrations/functiontostring';
// eslint-disable-next-line typescript/no-deprecated
export { inboundFiltersIntegration } from './integrations/eventFilters';
export { eventFiltersIntegration } from './integrations/eventFilters';
export { linkedErrorsIntegration } from './integrations/linkederrors';
export { moduleMetadataIntegration } from './integrations/moduleMetadata';
Expand Down
11 changes: 4 additions & 7 deletions packages/core/test/lib/integrations/eventFilters.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { describe, expect, it } from 'vitest';
import type { EventFiltersOptions } from '../../../src/integrations/eventFilters';
import { eventFiltersIntegration, inboundFiltersIntegration } from '../../../src/integrations/eventFilters';
import { eventFiltersIntegration } from '../../../src/integrations/eventFilters';
import type { Event } from '../../../src/types/event';
import type { EventProcessor } from '../../../src/types/eventprocessor';
import type { Integration } from '../../../src/types/integration';
Expand All@@ -23,7 +23,7 @@ const PUBLIC_DSN = 'https://username@domain/123';
* expect(eventProcessor(SOME_EXCEPTION_EVENT)).toBe(null);
* ```
*
* @param options options passed into the InboundFilters integration
* @param options options passed into the EventFilters integration
* @param clientOptions options passed into the mock Sentry client
*/
function createEventFiltersEventProcessor(
Expand DownExpand Up@@ -409,11 +409,8 @@ function createUndefinedIsNotAnObjectEvent(evaluatingStr: string): Event {
};
}

describe.each([
// eslint-disable-next-line typescript/no-deprecated
['InboundFilters', inboundFiltersIntegration],
['EventFilters', eventFiltersIntegration],
])('%s', (_, integrationFn) => {
describe('EventFilters', () => {
const integrationFn = eventFiltersIntegration;
describe('ignoreErrors', () => {
it('string filter with partial match', () => {
const eventProcessor = createEventFiltersEventProcessor(integrationFn, {
Expand Down
6 changes: 3 additions & 3 deletions packages/core/test/lib/tracing/spans/captureSpan.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,7 +324,7 @@ describe('captureSpan', () => {
release: '1.0.0',
environment: 'staging',
integrations: [
{ name: 'InboundFilters', setupOnce: () => {} },
{ name: 'EventFilters', setupOnce: () => {} },
{ name: 'BrowserTracing', setupOnce: () => {} },
],
_metadata: {
Expand DownExpand Up@@ -369,7 +369,7 @@ describe('captureSpan', () => {
[SENTRY_SDK_VERSION]: { value: '9.0.0', type: 'string' },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS]: {
type: 'array',
value: ['InboundFilters', 'BrowserTracing'],
value: ['EventFilters', 'BrowserTracing'],
},
},
_segmentSpan: span,
Expand All@@ -381,7 +381,7 @@ describe('captureSpan', () => {
getDefaultTestClientOptions({
dsn: 'https://dsn@ingest.f00.f00/1',
tracesSampleRate: 1,
integrations: [{ name: 'InboundFilters', setupOnce: () => {} }],
integrations: [{ name: 'EventFilters', setupOnce: () => {} }],
}),
);
client.init();
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
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
18 changes: 18 additions & 0 deletions MIGRATION.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -821,6 +821,24 @@ import { inboundFiltersIntegration } from '@sentry/browser';
import { eventFiltersIntegration } from '@sentry/browser';
```

All SDKs now also set up `eventFiltersIntegration` instead of `inboundFiltersIntegration` as a default
integration, so the integration reports itself as `EventFilters` (e.g. in the `sdk.integrations` payload of
events). If you disable the integration by its previous name, update the reference:

```js
// before
Sentry.init({
integrations: integrations => integrations.filter(integration => integration.name !== 'InboundFilters'),
});

// after
Sentry.init({
integrations: integrations => integrations.filter(integration => integration.name !== 'EventFilters'),
});
```

The same applies when looking the integration up by name, e.g. via `client.getIntegrationByName('InboundFilters')`.

### `instrumentLangGraph` renamed to `instrumentStateGraph`

Affected SDKs: SDKs with LangGraph instrumentation.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ sentryTest(
async ({ getLocalTestUrl, page, browserName }) => {
if (browserName === 'webkit') {
// The error we're throwing in this test is thrown as "Script error." in Webkit.
// We filter "Script error." out by default in `InboundFilters`.
// I don't think there's much value to disable InboundFilters defaults for this test,
// We filter "Script error." out by default in `EventFilters`.
// I don't think there's much value to disable EventFilters defaults for this test,
// given that most of our users won't do that either.
// Let's skip it instead for Webkit.
sentryTest.skip();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ sentryTest(
async ({ getLocalTestUrl, page, browserName }) => {
if (browserName === 'webkit') {
// The error we're throwing in this test is thrown as "Script error." in Webkit.
// We filter "Script error." out by default in `InboundFilters`.
// I don't think there's much value to disable InboundFilters defaults for this test,
// We filter "Script error." out by default in `EventFilters`.
// I don't think there's much value to disable EventFilters defaults for this test,
// given that most of our users won't do that either.
// Let's skip it instead for Webkit.
sentryTest.skip();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ sentryTest('logs debug messages correctly', async ({ getLocalTestUrl, page }) =>
expect(consoleMessages).toEqual(
hasDebug
? [
'Sentry Logger [log]: Integration installed: InboundFilters',
'Sentry Logger [log]: Integration installed: EventFilters',
'Sentry Logger [log]: Integration installed: FunctionToString',
'Sentry Logger [log]: Integration installed: ConversationId',
'Sentry Logger [log]: Integration installed: BrowserApiErrors',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand DownExpand Up@@ -91,7 +91,7 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand DownExpand Up@@ -91,7 +91,7 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ const DEFAULT_REPLAY_EVENT = {
},
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ test.describe('client-side errors', () => {
timestamp: expect.any(Number),
sdk: {
integrations: expect.arrayContaining([
'InboundFilters',
'EventFilters',
'FunctionToString',
'BrowserApiErrors',
'Breadcrumbs',
Expand Down
6 changes: 2 additions & 4 deletions packages/angular/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@ import {
conversationIdIntegration,
debug,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
inboundFiltersIntegration,
} from '@sentry/core';
import { IS_DEBUG_BUILD } from './flags';

Expand All@@ -34,9 +34,7 @@ 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(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
breadcrumbsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/astro/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,8 +66,6 @@ export {
httpIntegration,
httpServerIntegration,
httpServerSpansIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
isInitialized,
Expand Down
2 changes: 0 additions & 2 deletions packages/aws-serverless/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,8 +70,6 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
Expand Down
2 changes: 0 additions & 2 deletions packages/browser/src/exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,6 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
parameterize,
Expand Down
6 changes: 2 additions & 4 deletions packages/browser/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ import type { Client, Integration, Options } from '@sentry/core/browser';
import {
conversationIdIntegration,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
inboundFiltersIntegration,
initAndBind,
setNormalizeStringifier,
stackParserFromStackParserOptions,
Expand DownExpand Up@@ -35,9 +35,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
* `getDefaultIntegrations` but with an adjusted set of integrations.
*/
return [
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
browserApiErrorsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/bun/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,8 +91,6 @@ export {
requestDataIntegration,
fsIntegration,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
setMeasurement,
Expand Down
6 changes: 2 additions & 4 deletions packages/bun/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@ import * as os from 'node:os';
import type { Integration, Options } from '@sentry/core';
import {
applySdkMetadata,
eventFiltersIntegration,
functionToStringIntegration,
hasSpansEnabled,
inboundFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
Expand DownExpand Up@@ -69,9 +69,7 @@ export function getDefaultIntegrationsWithoutPerformance(): Integration[] {
// Return a fresh array on each call so callers can safely mutate the result.
return [
// Common
// TODO(v11): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
requestDataIntegration(),
Expand Down
6 changes: 2 additions & 4 deletions packages/cloudflare/src/baseSdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,10 @@ import {
consoleIntegration,
conversationIdIntegration,
dedupeIntegration,
eventFiltersIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
GLOBAL_OBJ,
inboundFiltersIntegration,
initAndBind,
linkedErrorsIntegration,
requestDataIntegration,
Expand DownExpand Up@@ -52,9 +52,7 @@ export function getBaseDefaultIntegrations(options: CloudflareOptions): Integrat
// The Dedupe integration should not be used in workflows because we want to
// capture all step failures, even if they are the same error.
...(options.enableDedupe === false ? [] : [dedupeIntegration()]),
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration(),
eventFiltersIntegration(),
functionToStringIntegration(),
conversationIdIntegration(),
linkedErrorsIntegration(),
Expand Down
2 changes: 0 additions & 2 deletions packages/cloudflare/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,6 @@ export {
getSpanDescendants,
continueTrace,
functionToStringIntegration,
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
Expand Down
24 changes: 0 additions & 24 deletions packages/core/src/integrations/eventFilters.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { DEBUG_BUILD } from '../debug-build';
import { defineIntegration } from '../integration';
import type { Event } from '../types/event';
import type { IntegrationFn } from '../types/integration';
import type { StackFrame } from '../types/stackframe';
import { debug } from '../utils/debug-logger';
import { getPossibleEventMessages } from '../utils/eventUtils';
Expand DownExpand Up@@ -67,29 +66,6 @@ export const eventFiltersIntegration = defineIntegration((options: Partial<Event
};
});

/**
* 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' as const,
};
}) satisfies IntegrationFn);

function _mergeOptions(
internalOptions: Partial<EventFiltersOptions> = {},
clientOptions: Partial<EventFiltersOptions> = {},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/semanticAttributes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME = 'sentry.sdk.name';
* @deprecated Use `SENTRY_SDK_VERSION` `@sentry/conventions/attributes` instead.
*/
export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION = 'sentry.sdk.version';
/** The list of integrations enabled in the Sentry SDK (e.g., ["InboundFilters", "BrowserTracing"]) */
/** The list of integrations enabled in the Sentry SDK (e.g., ["EventFilters", "BrowserTracing"]) */
export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS = 'sentry.sdk.integrations';

/** The user ID */
Expand Down
2 changes: 0 additions & 2 deletions packages/core/src/shared-exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,8 +144,6 @@ export { spanKindToName } from './spanKind';
export type { SpanKind, SpanKindNumber } from './spanKind';
export { addBreadcrumb } from './breadcrumbs';
export { functionToStringIntegration } from './integrations/functiontostring';
// eslint-disable-next-line typescript/no-deprecated
export { inboundFiltersIntegration } from './integrations/eventFilters';
export { eventFiltersIntegration } from './integrations/eventFilters';
export { linkedErrorsIntegration } from './integrations/linkederrors';
export { moduleMetadataIntegration } from './integrations/moduleMetadata';
Expand Down
11 changes: 4 additions & 7 deletions packages/core/test/lib/integrations/eventFilters.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { describe, expect, it } from 'vitest';
import type { EventFiltersOptions } from '../../../src/integrations/eventFilters';
import { eventFiltersIntegration, inboundFiltersIntegration } from '../../../src/integrations/eventFilters';
import { eventFiltersIntegration } from '../../../src/integrations/eventFilters';
import type { Event } from '../../../src/types/event';
import type { EventProcessor } from '../../../src/types/eventprocessor';
import type { Integration } from '../../../src/types/integration';
Expand All@@ -23,7 +23,7 @@ const PUBLIC_DSN = 'https://username@domain/123';
* expect(eventProcessor(SOME_EXCEPTION_EVENT)).toBe(null);
* ```
*
* @param options options passed into the InboundFilters integration
* @param options options passed into the EventFilters integration
* @param clientOptions options passed into the mock Sentry client
*/
function createEventFiltersEventProcessor(
Expand DownExpand Up@@ -409,11 +409,8 @@ function createUndefinedIsNotAnObjectEvent(evaluatingStr: string): Event {
};
}

describe.each([
// eslint-disable-next-line typescript/no-deprecated
['InboundFilters', inboundFiltersIntegration],
['EventFilters', eventFiltersIntegration],
])('%s', (_, integrationFn) => {
describe('EventFilters', () => {
const integrationFn = eventFiltersIntegration;
describe('ignoreErrors', () => {
it('string filter with partial match', () => {
const eventProcessor = createEventFiltersEventProcessor(integrationFn, {
Expand Down
6 changes: 3 additions & 3 deletions packages/core/test/lib/tracing/spans/captureSpan.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,7 +324,7 @@ describe('captureSpan', () => {
release: '1.0.0',
environment: 'staging',
integrations: [
{ name: 'InboundFilters', setupOnce: () => {} },
{ name: 'EventFilters', setupOnce: () => {} },
{ name: 'BrowserTracing', setupOnce: () => {} },
],
_metadata: {
Expand DownExpand Up@@ -369,7 +369,7 @@ describe('captureSpan', () => {
[SENTRY_SDK_VERSION]: { value: '9.0.0', type: 'string' },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS]: {
type: 'array',
value: ['InboundFilters', 'BrowserTracing'],
value: ['EventFilters', 'BrowserTracing'],
},
},
_segmentSpan: span,
Expand All@@ -381,7 +381,7 @@ describe('captureSpan', () => {
getDefaultTestClientOptions({
dsn: 'https://dsn@ingest.f00.f00/1',
tracesSampleRate: 1,
integrations: [{ name: 'InboundFilters', setupOnce: () => {} }],
integrations: [{ name: 'EventFilters', setupOnce: () => {} }],
}),
);
client.init();
Expand Down
Loading
Loading