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
2 changes: 1 addition & 1 deletion dev-packages/browser-integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@sentry/browser": "11.0.0",
"@sentry/replay": "11.0.0",
"@sentry/opentelemetry": "11.0.0",
"@sentry/conventions": "0.23.0",
"@sentry/conventions": "0.24.0",
"@supabase/supabase-js": "2.109.0",
"axios": "1.18.0",
"babel-loader": "^10.1.1",
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/cloudflare-integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@cloudflare/workers-types": "^4.20260426.0",
"@cloudflare/workers-types-v5": "npm:@cloudflare/workers-types@5.20260710.1",
"@sentry-internal/test-utils": "11.0.0",
"@sentry/conventions": "0.23.0",
"@sentry/conventions": "0.24.0",
"eslint-plugin-regexp": "^3.1.0",
"prisma": "6.15.0",
"vite": "7.3.5",
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/node-integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
},
"devDependencies": {
"@opentelemetry/instrumentation-http": "0.220.0",
"@sentry/conventions": "0.23.0",
"@sentry/conventions": "0.24.0",
"@sentry-internal/test-utils": "11.0.0",
"@types/amqplib": "^0.10.5",
"@types/node-cron": "^3.0.11",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"dependencies": {
"@sentry/browser": "11.0.0",
"@sentry/core": "11.0.0",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"tslib": "^2.4.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"dependencies": {
"@sentry/browser": "11.0.0",
"@sentry/core": "11.0.0",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/node": "11.0.0",
"@sentry/server-runtime-injection": "11.0.0",
"@sentry/server-utils": "11.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-serverless/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"access": "public"
},
"dependencies": {
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/core": "11.0.0",
"@sentry/node": "11.0.0",
"@sentry/server-runtime-injection": "11.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/browser-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"dependencies": {
"@sentry/core": "11.0.0",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"web-vitals": "^6.1.1"
},
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion packages/browser-utils/src/performance/interactions.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
BROWSER_WEB_VITAL_INP_TARGET,
HTTP_ROUTE,
ROUTER_NAVIGATION_ROUTE_ID,
SENTRY_IDLE_SPAN_FINISH_REASON,
Expand Down Expand Up @@ -254,7 +255,7 @@ function trackInteractionsAsSpans(client: Client): void {
attributes: {
[SENTRY_OP]: UI_INTERACTION_CLICK,
[SENTRY_ORIGIN]: 'auto.browser.interactions',
...(selector && selector !== UNKNOWN_ELEMENT_NAME && { 'browser.web_vital.inp.target': selector }),
...(selector && selector !== UNKNOWN_ELEMENT_NAME && { [BROWSER_WEB_VITAL_INP_TARGET]: selector }),
},
};

Expand Down
12 changes: 8 additions & 4 deletions packages/browser-utils/src/web-vitals/spans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ import {
addLcpInstrumentationHandler,
} from '../instrumentation/performanceObserver';
import type { LargestContentfulPaint, LayoutShift } from './emitSpan';
import { BROWSER_NAVIGATION_TYPE, UI_COMPONENT_NAME } from '@sentry/conventions/attributes';
import {
BROWSER_NAVIGATION_TYPE,
BROWSER_WEB_VITAL_INP_INTERACTION_TYPE,
BROWSER_WEB_VITAL_INP_TARGET,
UI_COMPONENT_NAME,
} from '@sentry/conventions/attributes';
import { _emitWebVitalSpan } from './emitSpan';
import { isValidLcpMetric } from './lcp';
import { listenForWebVitalReportEvents } from './reportEvents';
Expand Down Expand Up @@ -437,9 +442,8 @@ export function _sendInpSpan(
// say whether there was an interaction to describe. These attributes can: they are only set for
// what was actually observed. The name no longer holds the selector either, now that it is the
// component name or the op's fallback under span streaming.
// TODO: use the `@sentry/conventions` constants once getsentry/sentry-conventions#641 is released.
selector && selector !== UNKNOWN_ELEMENT_NAME && (attributes['browser.web_vital.inp.target'] = selector);
entryInteractionType && (attributes['browser.web_vital.inp.interaction_type'] = entryInteractionType);
selector && selector !== UNKNOWN_ELEMENT_NAME && (attributes[BROWSER_WEB_VITAL_INP_TARGET] = selector);
entryInteractionType && (attributes[BROWSER_WEB_VITAL_INP_INTERACTION_TYPE] = entryInteractionType);

if (componentName) {
attributes[UI_COMPONENT_NAME] = componentName;
Expand Down
2 changes: 1 addition & 1 deletion packages/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"dependencies": {
"@sentry/browser-utils": "11.0.0",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/feedback": "11.0.0",
"@sentry/replay": "11.0.0",
"@sentry/replay-canvas": "11.0.0",
Expand Down
10 changes: 8 additions & 2 deletions packages/browser/src/integrations/httpcontext.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
import { _INTERNAL_filterKeyValueData, defineIntegration, safeSetSpanJSONAttributes } from '@sentry/core';
import { getHttpRequestData, WINDOW } from '../helpers';
import { filterCollectedUrl } from '@sentry/core';
import { HTTP_REQUEST_HEADER_KEY_BASE, SENTRY_OP, URL_FULL, USER_AGENT_ORIGINAL } from '@sentry/conventions/attributes';
import {
HTTP_REQUEST_HEADER_KEY_BASE,
SENTRY_IS_LOCALHOST,
SENTRY_OP,
URL_FULL,
USER_AGENT_ORIGINAL,
} from '@sentry/conventions/attributes';

/**
* Collects information about HTTP request headers and
Expand Down Expand Up @@ -61,7 +67,7 @@ export const httpContextIntegration = defineIntegration(() => {
// Likewise for the "Filter out localhost events" feature. Deliberately inlined rather than
// sharing the server-side helper, which costs bundle size for request headers and IPs that
// don't exist here. Mirrors Relay's localhost filter (relay-filter/src/localhost.rs).
'sentry.is_localhost':
[SENTRY_IS_LOCALHOST]:
protocol === 'file:' ||
hostname === 'localhost' ||
hostname === '127.0.0.1' ||
Expand Down
3 changes: 2 additions & 1 deletion packages/browser/src/integrations/spotlight.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { Client, Envelope, IntegrationFn } from '@sentry/core';
import { debug, defineIntegration, serializeEnvelope } from '@sentry/core';
import { getNativeImplementation } from '@sentry/browser-utils';
import { BROWSER_WEB_VITAL_INP_TARGET } from '@sentry/conventions/attributes';
import { UI_INTERACTION_CLICK } from '@sentry/conventions/op';
import { DEBUG_BUILD } from '../debug-build';
import type { WINDOW } from '../helpers';
Expand All @@ -17,7 +18,7 @@ export const INTEGRATION_NAME = 'SpotlightBrowser' as const;

export const SPOTLIGHT_IGNORE_SPANS = [
{ op: UI_INTERACTION_CLICK, name: '#sentry-spotlight' },
{ op: UI_INTERACTION_CLICK, attributes: { 'browser.web_vital.inp.target': '#sentry-spotlight' } },
{ op: UI_INTERACTION_CLICK, attributes: { [BROWSER_WEB_VITAL_INP_TARGET]: '#sentry-spotlight' } },
];

const _spotlightIntegration = ((options: Partial<SpotlightConnectionOptions> = {}) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/bun/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"dependencies": {
"@sentry/core": "11.0.0",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/node": "11.0.0",
"@sentry/server-utils": "11.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cloudflare/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
},
"dependencies": {
"@opentelemetry/api": "^1.9.1",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/core": "11.0.0",
"@sentry/opentelemetry": "11.0.0",
"@sentry/server-utils": "11.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@
"zod": "^3.24.1"
},
"dependencies": {
"@sentry/conventions": "^0.23.0"
"@sentry/conventions": "^0.24.0"
}
}
4 changes: 2 additions & 2 deletions packages/core/src/integrations/requestdata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { filterCookiePairs, httpHeadersToSpanAttributes } from '../utils/request
import { getUrlQuery } from '../utils/url';
import { getClientIPAddress, ipHeaderNames } from '../vendor/getIpAddress';
import { safeSetSpanJSONAttributes } from '../tracing/spans/captureSpan';
import { URL_FULL, URL_QUERY } from '@sentry/conventions/attributes';
import { SENTRY_IS_LOCALHOST, URL_FULL, URL_QUERY } from '@sentry/conventions/attributes';

type RequestDataIncludeOptions = {
cookies?: boolean;
Expand Down Expand Up @@ -100,7 +100,7 @@ const _requestDataIntegration = ((options: RequestDataIntegrationOptions = {}) =
// This attribute is used by the "Filter out localhost events" feature on the Sentry backend.
// Therefore, it's set on every span, not just the segment span.
safeSetSpanJSONAttributes(span, {
'sentry.is_localhost': isLocalhostSpan(sdkProcessingMetadata, user.ip_address),
[SENTRY_IS_LOCALHOST]: isLocalhostSpan(sdkProcessingMetadata, user.ip_address),
});
},
processSegmentSpan(span, client) {
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
],
"dependencies": {
"@opentelemetry/api": "^1.9.1",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/core": "11.0.0",
"@sentry/server-runtime-injection": "11.0.0",
"@sentry/server-utils": "11.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/effect/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
},
"dependencies": {
"@sentry/browser": "11.0.0",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/core": "11.0.0",
"@sentry/node": "11.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/elysia/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"dependencies": {
"@sentry/bun": "11.0.0",
"@sentry/core": "11.0.0",
"@sentry/conventions": "^0.23.0"
"@sentry/conventions": "^0.24.0"
},
"peerDependencies": {
"elysia": "^1.4.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/ember/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@embroider/addon-shim": "^1.10.2",
"@embroider/macros": "^1.20.2",
"@sentry/browser": "11.0.0",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/core": "11.0.0",
"decorator-transforms": "^2.3.2"
},
Expand Down
6 changes: 2 additions & 4 deletions packages/ember/src/utils/instrumentEmberGlobals.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { subscribe } from '@ember/instrumentation';
import { scheduleOnce } from '@ember/runloop';
import { SENTRY_DESCRIPTION, SENTRY_OP, UI_COMPONENT_NAME } from '@sentry/conventions/attributes';
import { UI_MOUNT, UI_RENDER, UI_TASK } from '@sentry/conventions/op';
import { UI_MOUNT, UI_RENDER, UI_RESOLVE, UI_TASK } from '@sentry/conventions/op';
import { getActiveSpan, getClient, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/browser';
import type { Span } from '@sentry/core';
import {
Expand Down Expand Up @@ -204,9 +204,7 @@ function _instrumentComponents(config: {
},

after(_name: string, _timestamp: number, payload: object) {
// TODO: Use the `UI_RESOLVE` const from `@sentry/conventions/op` once the op is released.
// See https://github.com/getsentry/sentry-conventions/pull/633
_processComponentRenderAfter(payload as Payload, beforeComponentDefinitionEntries, 'ui.resolve', 0);
_processComponentRenderAfter(payload as Payload, beforeComponentDefinitionEntries, UI_RESOLVE, 0);
},
});
}
Expand Down
2 changes: 1 addition & 1 deletion packages/google-cloud-serverless/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"access": "public"
},
"dependencies": {
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/core": "11.0.0",
"@sentry/node": "11.0.0",
"@sentry/server-runtime-injection": "11.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/hono/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"dependencies": {
"@opentelemetry/api": "^1.9.1",
"@sentry/core": "11.0.0",
"@sentry/conventions": "^0.23.0"
"@sentry/conventions": "^0.24.0"
},
"peerDependencies": {
"@cloudflare/workers-types": "^4.x || ^5.x",
Expand Down
2 changes: 1 addition & 1 deletion packages/nestjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"access": "public"
},
"dependencies": {
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/core": "11.0.0",
"@sentry/node": "11.0.0",
"@sentry/server-utils": "11.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"@rollup/plugin-commonjs": "28.0.1",
"@sentry/browser-utils": "11.0.0",
"@sentry/bundler-plugins": "11.0.0",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/core": "11.0.0",
"@sentry/node": "11.0.0",
"@sentry/opentelemetry": "11.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/nitro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"dependencies": {
"@sentry/bundler-plugins": "11.0.0",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/core": "11.0.0",
"@sentry/node": "11.0.0",
"@sentry/server-runtime-injection": "11.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
},
"dependencies": {
"@opentelemetry/api": "^1.9.1",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/core": "11.0.0",
"@sentry/opentelemetry": "11.0.0",
"@sentry/server-runtime-injection": "11.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@nuxt/kit": "^4.5.2",
"@sentry/browser": "11.0.0",
"@sentry/cloudflare": "11.0.0",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/core": "11.0.0",
"@sentry/node": "11.0.0",
"@sentry/bundler-plugins": "11.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"access": "public"
},
"dependencies": {
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/core": "11.0.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"dependencies": {
"@opentelemetry/api": "^1.9.1",
"@sentry/browser": "11.0.0",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/core": "11.0.0",
"@sentry/node": "11.0.0",
"@sentry/react": "11.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"dependencies": {
"@sentry/browser": "11.0.0",
"@sentry/core": "11.0.0",
"@sentry/conventions": "^0.23.0"
"@sentry/conventions": "^0.24.0"
},
"peerDependencies": {
"react": "17.x || 18.x || 19.x",
Expand Down
2 changes: 1 addition & 1 deletion packages/remix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"dependencies": {
"@remix-run/router": "^1.23.4",
"@sentry/bundler-plugins": "11.0.0",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/core": "11.0.0",
"@sentry/node": "11.0.0",
"@sentry/react": "11.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/server-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
},
"dependencies": {
"@opentelemetry/api": "^1.9.1",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/core": "11.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"dependencies": {
"@sentry/browser": "11.0.0",
"@sentry/core": "11.0.0",
"@sentry/conventions": "^0.23.0"
"@sentry/conventions": "^0.24.0"
},
"peerDependencies": {
"@solidjs/router": ">=0.13.4 <2.0.0-0",
Expand Down
2 changes: 1 addition & 1 deletion packages/solidstart/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"@sentry/server-utils": "11.0.0",
"@sentry/solid": "11.0.0",
"@sentry/bundler-plugins": "11.0.0",
"@sentry/conventions": "0.23.0"
"@sentry/conventions": "0.24.0"
},
"devDependencies": {
"@solidjs/router": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"dependencies": {
"@sentry/browser": "11.0.0",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/core": "11.0.0",
"magic-string": "~0.30.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/sveltekit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"dependencies": {
"@sentry/cloudflare": "11.0.0",
"@sentry/core": "11.0.0",
"@sentry/conventions": "^0.23.0",
"@sentry/conventions": "^0.24.0",
"@sentry/node": "11.0.0",
"@sentry/server-runtime-injection": "11.0.0",
"@sentry/server-utils": "11.0.0",
Expand Down
Loading
Loading