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 @@ -61,7 +61,7 @@
"@playwright/test": "1.64.1",
"@sentry/browser": "11.11.0",
"@sentry/browser-utils": "11.11.0",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"@sentry/core": "11.11.0",
"@sentry/replay": "11.11.0",
"@sentry/replay-canvas": "11.11.0",
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 @@ -28,7 +28,7 @@
"@prisma/client": "6.15.0",
"@sentry-internal/test-utils": "11.11.0",
"@sentry/cloudflare": "11.11.0",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"@sentry/core": "11.11.0",
"@sentry/hono": "11.11.0",
"ai": "^6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/deno-integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"devDependencies": {
"@sentry-internal/node-integration-tests": "11.11.0",
"@sentry/conventions": "^0.30.0",
"@sentry/conventions": "^0.31.0",
"@sentry/core": "11.11.0",
"@sentry/deno": "11.11.0",
"mysql": "^2.18.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@angular/cli": "^19.0.0",
"@angular/compiler-cli": "^19.0.0",
"@playwright/test": "1.64.1",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"@sentry-internal/test-utils": "file:../../packed/sentry-internal-test-utils-packed.tgz",
"@sentry/core": "file:../../packed/sentry-core-packed.tgz",
"@types/jasmine": "~5.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@cloudflare/workers-types": "^4.20260426.0",
"@playwright/test": "1.64.1",
"@sentry-internal/test-utils": "file:../../packed/sentry-internal-test-utils-packed.tgz",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"typescript": "^5.5.2",
"vite": "7.3.5",
"wrangler": "^4.136.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@cloudflare/workers-types": "^5.20260727.1",
"@playwright/test": "1.64.1",
"@sentry-internal/test-utils": "file:../../packed/sentry-internal-test-utils-packed.tgz",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"@types/node": "^26.1.2",
"sentry": "~0.44.1",
"typescript": "~6.0.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@cloudflare/workers-types": "^4.20260426.0",
"@playwright/test": "1.64.1",
"@sentry-internal/test-utils": "file:../../packed/sentry-internal-test-utils-packed.tgz",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"@types/express": "^4.17.21",
"@types/node": "^18.19.1",
"tsx": "4.21.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"devDependencies": {
"@playwright/test": "1.64.1",
"@sentry-internal/test-utils": "file:../../packed/sentry-internal-test-utils-packed.tgz",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"@types/node": "^20",
"@types/react": "^19",
"@types/react-dom": "^19",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"devDependencies": {
"@playwright/test": "1.64.1",
"@sentry-internal/test-utils": "file:../../packed/sentry-internal-test-utils-packed.tgz",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"@types/node": "^20",
"@types/react": "^19",
"@types/react-dom": "^19",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"devDependencies": {
"@playwright/test": "1.64.1",
"@sentry-internal/test-utils": "file:../../packed/sentry-internal-test-utils-packed.tgz",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"@sentry/core": "latest || *",
"nitro": "^3.0.260522-beta",
"rolldown": "latest",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"devDependencies": {
"@playwright/test": "1.64.1",
"@sentry-internal/test-utils": "file:../../packed/sentry-internal-test-utils-packed.tgz",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"@sentry/core": "file:../../packed/sentry-core-packed.tgz",
"@types/node": "24.x",
"typescript": "~5.9.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"devDependencies": {
"@playwright/test": "1.64.1",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"@sentry-internal/test-utils": "file:../../packed/sentry-internal-test-utils-packed.tgz"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@mastra/deployer": "~1.74.0",
"@playwright/test": "1.64.1",
"@sentry-internal/test-utils": "file:../../packed/sentry-internal-test-utils-packed.tgz",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"@types/node": "24.x",
"mastra": "~1.28.0",
"typescript": "~5.9.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"devDependencies": {
"@playwright/test": "1.64.1",
"@sentry-internal/test-utils": "file:../../packed/sentry-internal-test-utils-packed.tgz",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"@types/express": "^4.17.21",
"@types/node": "^24.0.0",
"typescript": "~5.9.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"devDependencies": {
"@playwright/test": "1.64.1",
"@sentry-internal/test-utils": "file:../../packed/sentry-internal-test-utils-packed.tgz",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"@sentry/core": "file:../../packed/sentry-core-packed.tgz",
"@types/node": "24.x"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"devDependencies": {
"@playwright/test": "1.64.1",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"@sentry-internal/test-utils": "file:../../packed/sentry-internal-test-utils-packed.tgz"
},
"sentryTest": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"devDependencies": {
"@playwright/test": "1.64.1",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"@sentry-internal/test-utils": "file:../../packed/sentry-internal-test-utils-packed.tgz",
"@solidjs/meta": "^0.29.4",
"@solidjs/router": "^1.0.0",
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 @@ -61,7 +61,7 @@
"@sentry-internal/rollup-utils": "11.11.0",
"@sentry-internal/test-utils": "11.11.0",
"@sentry/aws-serverless": "11.11.0",
"@sentry/conventions": "0.30.0",
"@sentry/conventions": "0.31.0",
"@sentry/core": "11.11.0",
"@sentry/hono": "11.11.0",
"@sentry/node": "11.11.0",
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.11.0",
"@sentry/core": "11.11.0",
"@sentry/conventions": "^0.30.0",
"@sentry/conventions": "^0.31.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 @@ -59,7 +59,7 @@
"dependencies": {
"@sentry/browser": "11.11.0",
"@sentry/core": "11.11.0",
"@sentry/conventions": "^0.30.0",
"@sentry/conventions": "^0.31.0",
"@sentry/node": "11.11.0",
"@sentry/server-runtime-injection": "11.11.0",
"@sentry/server-utils": "11.11.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 @@ -66,7 +66,7 @@
"access": "public"
},
"dependencies": {
"@sentry/conventions": "^0.30.0",
"@sentry/conventions": "^0.31.0",
"@sentry/core": "11.11.0",
"@sentry/node": "11.11.0",
"@sentry/server-runtime-injection": "11.11.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.11.0",
"@sentry/conventions": "^0.30.0",
"@sentry/conventions": "^0.31.0",
"web-vitals": "^6.2.3"
},
"devDependencies": {
Expand Down
5 changes: 3 additions & 2 deletions packages/browser-utils/src/performance/elementTiming.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
UI_ELEMENT_URL,
UI_ELEMENT_WIDTH,
} from '@sentry/conventions/attributes';
import { UI_ELEMENT_LOAD_TIME, UI_ELEMENT_RENDER_TIME } from '@sentry/conventions/metrics';
import type { IntegrationFn } from '@sentry/core';
import { browserPerformanceTimeOrigin, defineIntegration, filterCollectedUrl, metrics } from '@sentry/core';
import { addPerformanceInstrumentationHandler } from '../instrumentation/performanceObserver';
Expand Down Expand Up @@ -80,14 +81,14 @@ const _elementTimingIntegration = (() => {
}

if (renderTime > 0) {
metrics.distribution(`ui.element.render_time`, renderTime, {
metrics.distribution(UI_ELEMENT_RENDER_TIME, renderTime, {
unit: 'millisecond',
attributes: metricAttributes,
});
}

if (loadTime > 0) {
metrics.distribution(`ui.element.load_time`, loadTime, {
metrics.distribution(UI_ELEMENT_LOAD_TIME, loadTime, {
unit: 'millisecond',
attributes: metricAttributes,
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as sentryCore from '@sentry/core';
import { UI_ELEMENT_LOAD_TIME, UI_ELEMENT_RENDER_TIME } from '@sentry/conventions/metrics';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { elementTimingIntegration, startTrackingElementTiming } from '../../src/performance/elementTiming';
import * as browserMetricsInstrumentation from '../../src/instrumentation/performanceObserver';
Expand Down Expand Up @@ -71,7 +72,7 @@ describe('elementTimingIntegration', () => {
});

expect(distributionSpy).toHaveBeenCalledTimes(1);
expect(distributionSpy).toHaveBeenCalledWith('ui.element.render_time', 150, {
expect(distributionSpy).toHaveBeenCalledWith(UI_ELEMENT_RENDER_TIME, 150, {
unit: 'millisecond',
attributes: {
'sentry.origin': 'auto.ui.browser.element_timing',
Expand Down Expand Up @@ -116,11 +117,11 @@ describe('elementTimingIntegration', () => {
'ui.element.width': 1920,
'ui.element.height': 1080,
};
expect(distributionSpy).toHaveBeenCalledWith('ui.element.render_time', 200, {
expect(distributionSpy).toHaveBeenCalledWith(UI_ELEMENT_RENDER_TIME, 200, {
unit: 'millisecond',
attributes: expectedAttributes,
});
expect(distributionSpy).toHaveBeenCalledWith('ui.element.load_time', 150, {
expect(distributionSpy).toHaveBeenCalledWith(UI_ELEMENT_LOAD_TIME, 150, {
unit: 'millisecond',
attributes: expectedAttributes,
});
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.11.0",
"@sentry/conventions": "^0.30.0",
"@sentry/conventions": "^0.31.0",
"@sentry/feedback": "11.11.0",
"@sentry/replay": "11.11.0",
"@sentry/replay-canvas": "11.11.0",
Expand Down
11 changes: 8 additions & 3 deletions packages/browser/src/integrations/bfcacheMetrics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ import {
BROWSER_BFCACHE_REASON,
SENTRY_ORIGIN,
} from '@sentry/conventions/attributes';
import {
BROWSER_BFCACHE_NAVIGATION,
BROWSER_BFCACHE_NOT_RESTORED,
BROWSER_BFCACHE_RELOAD_DURATION,
} from '@sentry/conventions/metrics';
import type { IntegrationFn, SpanAttributes } from '@sentry/core';
import { debug, defineIntegration, getCurrentScope, metrics } from '@sentry/core';
import { resolveCurrentRoute } from '@sentry/browser-utils';
Expand Down Expand Up @@ -82,7 +87,7 @@ export const bfcacheMetricsIntegration = defineIntegration(

// Measures how expensive the fallback reload was when a back/forward navigation missed bfcache.
if (typeof navigationEntry.duration === 'number' && navigationEntry.duration > 0) {
metrics.distribution('browser.bfcache.reload.duration', navigationEntry.duration, {
metrics.distribution(BROWSER_BFCACHE_RELOAD_DURATION, navigationEntry.duration, {
unit: 'millisecond',
attributes: _withOriginAttr({
[SENTRY_SEGMENT_NAME]: routeName,
Expand All @@ -106,7 +111,7 @@ export const bfcacheMetricsIntegration = defineIntegration(
* Captures a bf navigation as a metric and records the outcome and reason count.
*/
function _captureBFCacheNavigation(outcome: BFCacheOutcome, reasonCount: number, routeName?: string): void {
metrics.count('browser.bfcache.navigation', 1, {
metrics.count(BROWSER_BFCACHE_NAVIGATION, 1, {
attributes: _withOriginAttr({
[BROWSER_BFCACHE_OUTCOME]: outcome,
// Attribute should be present if reasons are >= 1
Expand All @@ -120,7 +125,7 @@ function _captureBFCacheNavigation(outcome: BFCacheOutcome, reasonCount: number,
* Maps a collected reason to a metric and captures/sends it.
*/
function _captureBFCacheReason({ reason, frame }: CollectedReason, routeName?: string) {
metrics.count('browser.bfcache.not_restored', 1, {
metrics.count(BROWSER_BFCACHE_NOT_RESTORED, 1, {
attributes: _withOriginAttr({
[BROWSER_BFCACHE_REASON]: reason,
[BROWSER_BFCACHE_FRAME]: frame,
Expand Down
2 changes: 1 addition & 1 deletion packages/bun/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"dependencies": {
"@sentry/bundler-plugins": "11.11.0",
"@sentry/core": "11.11.0",
"@sentry/conventions": "^0.30.0",
"@sentry/conventions": "^0.31.0",
"@sentry/node": "11.11.0",
"@sentry/server-utils": "11.11.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.30.0",
"@sentry/conventions": "^0.31.0",
"@sentry/core": "11.11.0",
"@sentry/opentelemetry": "11.11.0",
"@sentry/server-utils": "11.11.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 @@ -92,6 +92,6 @@
"zod": "^4.6.7"
},
"dependencies": {
"@sentry/conventions": "^0.30.0"
"@sentry/conventions": "^0.31.0"
}
}
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.30.0",
"@sentry/conventions": "^0.31.0",
"@sentry/core": "11.11.0",
"@sentry/server-runtime-injection": "11.11.0",
"@sentry/server-utils": "11.11.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.11.0",
"@sentry/conventions": "^0.30.0",
"@sentry/conventions": "^0.31.0",
"@sentry/core": "11.11.0",
"@sentry/node": "11.11.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.11.0",
"@sentry/core": "11.11.0",
"@sentry/conventions": "^0.30.0"
"@sentry/conventions": "^0.31.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.11.0",
"@embroider/macros": "^1.20.2",
"@sentry/browser": "11.11.0",
"@sentry/conventions": "^0.30.0",
"@sentry/conventions": "^0.31.0",
"@sentry/core": "11.11.0",
"decorator-transforms": "^2.3.2"
},
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.30.0",
"@sentry/conventions": "^0.31.0",
"@sentry/core": "11.11.0",
"@sentry/node": "11.11.0",
"@sentry/server-runtime-injection": "11.11.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.11.0",
"@sentry/conventions": "^0.30.0",
"@sentry/conventions": "^0.31.0",
"@sentry/server-utils": "11.11.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/nestjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"access": "public"
},
"dependencies": {
"@sentry/conventions": "^0.30.0",
"@sentry/conventions": "^0.31.0",
"@sentry/core": "11.11.0",
"@sentry/node": "11.11.0",
"@sentry/server-utils": "11.11.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 @@ -87,7 +87,7 @@
"@sentry/browser-utils": "11.11.0",
"@sentry/bundler-plugins": "11.11.0",
"@sentry/cloudflare": "11.11.0",
"@sentry/conventions": "^0.30.0",
"@sentry/conventions": "^0.31.0",
"@sentry/core": "11.11.0",
"@sentry/node": "11.11.0",
"@sentry/opentelemetry": "11.11.0",
Expand Down
Loading
Loading