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": "10.67.0",
"@sentry/replay": "10.67.0",
"@sentry/opentelemetry": "10.67.0",
"@sentry/conventions": "0.19.0",
"@sentry/conventions": "0.20.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": "10.67.0",
"@sentry/conventions": "0.19.0",
"@sentry/conventions": "0.20.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 @@ -103,7 +103,7 @@
},
"devDependencies": {
"@opentelemetry/instrumentation-http": "0.220.0",
"@sentry/conventions": "0.19.0",
"@sentry/conventions": "0.20.0",
"@sentry-internal/test-utils": "10.67.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": "10.67.0",
"@sentry/core": "10.67.0",
"@sentry/conventions": "^0.19.0",
"@sentry/conventions": "^0.20.0",
"tslib": "^2.4.1"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/src/tracing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
getAbsoluteUrl,
} from '@sentry/browser';
import { CODE_FUNCTION_NAME, SENTRY_OP, URL_FULL, URL_PATH, URL_TEMPLATE } from '@sentry/conventions/attributes';
import { GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import { FUNCTION } from '@sentry/conventions/op';
import type { Integration, Span } from '@sentry/core';
import {
debug,
Expand Down Expand Up @@ -399,7 +399,7 @@ export function TraceMethod(options?: TraceMethodOptions): MethodDecorator {
name: `<${options?.name ? options.name : 'unnamed'}>`,
startTime: now,
attributes: {
[SENTRY_OP]: GENERAL_FUNCTION_SPAN_OP,
[SENTRY_OP]: FUNCTION,
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.angular.trace_method_decorator',
[CODE_FUNCTION_NAME]: String(propertyKey),
},
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": "10.67.0",
"@sentry/core": "10.67.0",
"@sentry/conventions": "^0.19.0",
"@sentry/conventions": "^0.20.0",
"@sentry/node": "10.67.0",
"@sentry/server-utils": "10.67.0",
"@sentry/bundler-plugins": "10.67.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.19.0",
"@sentry/conventions": "^0.20.0",
"@sentry/core": "10.67.0",
"@sentry/node": "10.67.0",
"@sentry/server-utils": "10.67.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-serverless/src/requestSpanOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
SENTRY_OP,
URL_FULL,
} from '@sentry/conventions/attributes';
import { FAAS_FUNCTION_AWS_SPAN_OP } from '@sentry/conventions/op';
import { FUNCTION_AWS } from '@sentry/conventions/op';
import type { SpanAttributes, StartSpanOptions } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, filterCollectedUrl } from '@sentry/core';
import type { Context } from 'aws-lambda';
Expand All @@ -48,7 +48,7 @@ export function getRequestSpanOptions(event: unknown, context: Context, requestI
name: context.functionName,
forceTransaction: true,
attributes: {
[SENTRY_OP]: FAAS_FUNCTION_AWS_SPAN_OP,
[SENTRY_OP]: FUNCTION_AWS,
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.otel.aws_lambda',
[SENTRY_KIND]: 'server',
[ATTR_FAAS_EXECUTION]: context.awsRequestId,
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": "10.67.0",
"@sentry/conventions": "^0.19.0",
"@sentry/conventions": "^0.20.0",
"web-vitals": "^6.0.1"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions packages/browser-utils/src/performance/entries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
filterCollectedUrl,
} from '@sentry/core';
import { CODE_FILE_PATH, CODE_FUNCTION_NAME, SENTRY_OP, URL_FULL } from '@sentry/conventions/attributes';
import { BROWSER_BROWSER_PAINT_SPAN_OP } from '@sentry/conventions/op';
import { BROWSER_PAINT } from '@sentry/conventions/op';
import {
addPerformanceInstrumentationHandler,
type PerformanceLongAnimationFrameTiming,
Expand Down Expand Up @@ -250,7 +250,7 @@ function _addPaintSpan(
startAndEndSpan(span, startTimestamp, startTimestamp + duration, {
name: entry.name,
attributes: {
[SENTRY_OP]: BROWSER_BROWSER_PAINT_SPAN_OP,
[SENTRY_OP]: BROWSER_PAINT,
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.resource.browser.metrics',
},
});
Expand Down
12 changes: 5 additions & 7 deletions packages/browser-utils/src/performance/interactions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
SENTRY_SOURCE,
SENTRY_SEGMENT_NAME_SOURCE,
} from '@sentry/conventions/attributes';
import { BROWSER_UI_INTERACTION_CLICK_SPAN_OP, BROWSER_UI_ACTION_CLICK_SPAN_OP } from '@sentry/conventions/op';
import { UI_INTERACTION_CLICK, UI_ACTION_CLICK } from '@sentry/conventions/op';
import type { IntegrationFn, Span, StartSpanOptions, TransactionSource } from '@sentry/core';
import {
browserPerformanceTimeOrigin,
Expand Down Expand Up @@ -155,7 +155,7 @@ function registerInteractionListener(
if (getInflightRouteSpan()) {
DEBUG_BUILD &&
debug.warn(
`[Tracing] Did not create ${BROWSER_UI_ACTION_CLICK_SPAN_OP} span because a pageload or navigation span is in progress.`,
`[Tracing] Did not create ${UI_ACTION_CLICK} span because a pageload or navigation span is in progress.`,
);
return;
}
Expand All @@ -168,17 +168,15 @@ function registerInteractionListener(

if (!latestRoute.name) {
DEBUG_BUILD &&
debug.warn(
`[Tracing] Did not create ${BROWSER_UI_ACTION_CLICK_SPAN_OP} span because the latest route name is missing.`,
);
debug.warn(`[Tracing] Did not create ${UI_ACTION_CLICK} span because the latest route name is missing.`);
return;
}

inflightInteractionSpan = startIdleSpan(
{
name: latestRoute.name,
attributes: {
[SENTRY_OP]: BROWSER_UI_ACTION_CLICK_SPAN_OP,
[SENTRY_OP]: UI_ACTION_CLICK,
[SENTRY_SEGMENT_NAME_SOURCE]: latestRoute.source || 'url',
[SENTRY_ORIGIN]: 'auto.browser.interactions',
},
Expand Down Expand Up @@ -208,7 +206,7 @@ function trackInteractionsAsSpans(): void {
name: htmlTreeAsString(entry.target),
startTime: startTime,
attributes: {
[SENTRY_OP]: BROWSER_UI_INTERACTION_CLICK_SPAN_OP,
[SENTRY_OP]: UI_INTERACTION_CLICK,
[SENTRY_ORIGIN]: 'auto.browser.interactions',
},
};
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": "10.67.0",
"@sentry/conventions": "^0.19.0",
"@sentry/conventions": "^0.20.0",
"@sentry/feedback": "10.67.0",
"@sentry/replay": "10.67.0",
"@sentry/replay-canvas": "10.67.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/bun/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"dependencies": {
"@apm-js-collab/code-transformer-bundler-plugins": "^0.7.4",
"@sentry/core": "10.67.0",
"@sentry/conventions": "^0.19.0",
"@sentry/conventions": "^0.20.0",
"@sentry/node": "10.67.0",
"@sentry/server-utils": "10.67.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 @@ -48,7 +48,7 @@
},
"dependencies": {
"@opentelemetry/api": "^1.9.1",
"@sentry/conventions": "^0.19.0",
"@sentry/conventions": "^0.20.0",
"@sentry/core": "10.67.0",
"@sentry/server-utils": "10.67.0",
"magic-string": "~0.30.21"
Expand Down
8 changes: 4 additions & 4 deletions packages/cloudflare/src/durableobject.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/unbound-method */
import { WEB_SERVER_WEBSOCKET_SPAN_OP } from '@sentry/conventions/op';
import { WEBSOCKET } from '@sentry/conventions/op';
import { captureException, isObjectLike } from '@sentry/core';
import type { DurableObject } from 'cloudflare:workers';
import { setAsyncLocalStorageAsyncContextStrategy } from '@sentry/server-utils/no-diagnostic-channels';
Expand Down Expand Up @@ -200,7 +200,7 @@ function instrumentDurableObjectHandlers<E, T extends DurableObject<E>>(
options,
context,
spanName: 'webSocketMessage',
spanOp: WEB_SERVER_WEBSOCKET_SPAN_OP,
spanOp: WEBSOCKET,
origin: 'auto.faas.cloudflare.durable_object',
},
obj.webSocketMessage.bind(obj),
Expand All @@ -213,7 +213,7 @@ function instrumentDurableObjectHandlers<E, T extends DurableObject<E>>(
options,
context,
spanName: 'webSocketClose',
spanOp: WEB_SERVER_WEBSOCKET_SPAN_OP,
spanOp: WEBSOCKET,
origin: 'auto.faas.cloudflare.durable_object',
},
obj.webSocketClose.bind(obj),
Expand All @@ -226,7 +226,7 @@ function instrumentDurableObjectHandlers<E, T extends DurableObject<E>>(
options,
context,
spanName: 'webSocketError',
spanOp: WEB_SERVER_WEBSOCKET_SPAN_OP,
spanOp: WEBSOCKET,
origin: 'auto.faas.cloudflare.durable_object',
},
obj.webSocketError.bind(obj),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { EmailMessage } from '@cloudflare/workers-types';
import type { AnyExportedHandler } from '../../types';
import type { env as cloudflareEnv } from 'cloudflare:workers';
import { SENTRY_OP } from '@sentry/conventions/attributes';
import { GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import { FUNCTION } from '@sentry/conventions/op';
import {
captureException,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
Expand Down Expand Up @@ -40,7 +40,7 @@ function wrapEmailHandler(
{
name: `Handle Email ${emailMessage.to}`,
attributes: {
[SENTRY_OP]: GENERAL_FUNCTION_SPAN_OP,
[SENTRY_OP]: FUNCTION,
'faas.trigger': 'email',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.email',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { MessageBatch } from '@cloudflare/workers-types';
import type { AnyExportedHandler } from '../../types';
import type { env as cloudflareEnv, WorkerEntrypoint } from 'cloudflare:workers';
import { SENTRY_OP } from '@sentry/conventions/attributes';
import { MESSAGING_QUEUE_PROCESS_SPAN_OP } from '@sentry/conventions/op';
import { QUEUE_PROCESS } from '@sentry/conventions/op';
import {
captureException,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
Expand Down Expand Up @@ -40,7 +40,7 @@ function wrapQueueHandler(
{
name: `process ${batch.queue}`,
attributes: {
[SENTRY_OP]: MESSAGING_QUEUE_PROCESS_SPAN_OP,
[SENTRY_OP]: QUEUE_PROCESS,
'faas.trigger': 'pubsub',
'messaging.destination.name': batch.queue,
'messaging.system': 'cloudflare',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { RateLimit, RateLimitOptions, RateLimitOutcome } from '@cloudflare/workers-types';
import { RPC_SERVICE, SENTRY_OP } from '@sentry/conventions/attributes';
import { WEB_SERVER_RPC_SPAN_OP } from '@sentry/conventions/op';
import { RPC } from '@sentry/conventions/op';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startSpan } from '@sentry/core';

const ORIGIN = 'auto.faas.cloudflare.rate_limit';
Expand All @@ -23,7 +23,7 @@ export function instrumentRateLimit<T extends RateLimit>(rateLimit: T, bindingNa
{
name: `rate_limit ${bindingName}`,
attributes: {
[SENTRY_OP]: WEB_SERVER_RPC_SPAN_OP,
[SENTRY_OP]: RPC,
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN,
[RPC_SERVICE]: RATE_LIMIT_SERVICE,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { ScheduledController } from '@cloudflare/workers-types';
import type { AnyExportedHandler } from '../../types';
import type { env as cloudflareEnv, WorkerEntrypoint } from 'cloudflare:workers';
import { SENTRY_OP } from '@sentry/conventions/attributes';
import { GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import { FUNCTION } from '@sentry/conventions/op';
import {
captureException,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
Expand Down Expand Up @@ -37,7 +37,7 @@ function wrapScheduledHandler(
{
name: `Scheduled Cron ${controller.cron}`,
attributes: {
[SENTRY_OP]: GENERAL_FUNCTION_SPAN_OP,
[SENTRY_OP]: FUNCTION,
'faas.cron': controller.cron,
'faas.time': new Date(controller.scheduledTime).toISOString(),
'faas.trigger': 'timer',
Expand Down
4 changes: 2 additions & 2 deletions packages/cloudflare/src/workflows.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CODE_FUNCTION_NAME, SENTRY_OP } from '@sentry/conventions/attributes';
import { GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import { FUNCTION } from '@sentry/conventions/op';
import type { PropagationContext } from '@sentry/core';
import {
captureException,
Expand Down Expand Up @@ -123,7 +123,7 @@ class WrappedWorkflowStep implements WorkflowStep {
name,
scope: scopeForStep,
attributes: {
[SENTRY_OP]: GENERAL_FUNCTION_SPAN_OP,
[SENTRY_OP]: FUNCTION,
[CODE_FUNCTION_NAME]: name,
'workflow.step.name': name,
'cloudflare.workflow.timeout': config?.timeout,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,6 @@
"zod": "^3.24.1"
},
"dependencies": {
"@sentry/conventions": "^0.19.0"
"@sentry/conventions": "^0.20.0"
}
}
4 changes: 2 additions & 2 deletions packages/core/src/integrations/express/patch-layer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*/

import { SENTRY_OP } from '@sentry/conventions/attributes';
import { WEB_SERVER_MIDDLEWARE_SPAN_OP } from '@sentry/conventions/op';
import { MIDDLEWARE } from '@sentry/conventions/op';
import { DEBUG_BUILD } from '../../debug-build';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes';
import { SPAN_STATUS_ERROR, withActiveSpan } from '../../tracing';
Expand Down Expand Up @@ -63,7 +63,7 @@ import { setSDKProcessingMetadata } from './set-sdk-processing-metadata';

// TODO(conventions): Replace `'handler'` and `'router'` with their span op constants once they are released in `@sentry/conventions`.
const EXPRESS_TYPE_TO_SPAN_OP: Record<string, string> = {
[ExpressLayerType_MIDDLEWARE]: WEB_SERVER_MIDDLEWARE_SPAN_OP,
[ExpressLayerType_MIDDLEWARE]: MIDDLEWARE,
[ExpressLayerType_REQUEST_HANDLER]: 'handler',
[ExpressLayerType_ROUTER]: 'router',
};
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/trpc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
TRPC_PROCEDURE_PATH,
TRPC_PROCEDURE_TYPE,
} from '@sentry/conventions/attributes';
import { WEB_SERVER_RPC_SPAN_OP } from '@sentry/conventions/op';
import { RPC } from '@sentry/conventions/op';
import { getClient, withIsolationScope } from './currentScopes';
import { captureException } from './exports';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from './semanticAttributes';
Expand Down Expand Up @@ -94,7 +94,7 @@ export function trpcMiddleware(options: SentryTrpcMiddlewareOptions = {}) {
{
name: `trpc/${path}`,
attributes: {
[SENTRY_OP]: WEB_SERVER_RPC_SPAN_OP,
[SENTRY_OP]: RPC,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.rpc.trpc',
[RPC_SYSTEM_NAME]: 'trpc',
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.19.0",
"@sentry/conventions": "^0.20.0",
"@sentry/core": "10.67.0",
"@sentry/server-utils": "10.67.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": "10.67.0",
"@sentry/conventions": "^0.19.0",
"@sentry/conventions": "^0.20.0",
"@sentry/core": "10.67.0",
"@sentry/node": "10.67.0"
},
Expand Down
Loading
Loading