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.4.0",
"@sentry/replay": "11.4.0",
"@sentry/opentelemetry": "11.4.0",
"@sentry/conventions": "0.25.0",
"@sentry/conventions": "0.26.0",
"@supabase/supabase-js": "2.109.0",
"axios": "1.20.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.4.0",
"@sentry/conventions": "0.25.0",
"@sentry/conventions": "0.26.0",
"eslint-plugin-regexp": "^3.1.0",
"prisma": "6.15.0",
"vite": "^8.3.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.63.0",
"@sentry/conventions": "0.25.0",
"@sentry/conventions": "0.26.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@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 @@ -26,7 +26,7 @@
},
"devDependencies": {
"@playwright/test": "~1.63.0",
"@sentry/conventions": "0.25.0",
"@sentry/conventions": "0.26.0",
"@sentry-internal/test-utils": "link:../../../test-utils"
},
"volta": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"devDependencies": {
"@playwright/test": "~1.63.0",
"@sentry/conventions": "0.25.0",
"@sentry/conventions": "0.26.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@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 @@ -108,7 +108,7 @@
},
"devDependencies": {
"@opentelemetry/instrumentation-http": "0.220.0",
"@sentry/conventions": "0.25.0",
"@sentry/conventions": "0.26.0",
"@sentry-internal/test-utils": "11.4.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.4.0",
"@sentry/core": "11.4.0",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.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.4.0",
"@sentry/core": "11.4.0",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/node": "11.4.0",
"@sentry/server-runtime-injection": "11.4.0",
"@sentry/server-utils": "11.4.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.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.0",
"@sentry/node": "11.4.0",
"@sentry/server-runtime-injection": "11.4.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.4.0",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"web-vitals": "^6.2.3"
},
"scripts": {
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.4.0",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/feedback": "11.4.0",
"@sentry/replay": "11.4.0",
"@sentry/replay-canvas": "11.4.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 @@ -43,7 +43,7 @@
},
"dependencies": {
"@sentry/core": "11.4.0",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/node": "11.4.0",
"@sentry/server-utils": "11.4.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.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.0",
"@sentry/opentelemetry": "11.4.0",
"@sentry/server-utils": "11.4.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.25.0"
"@sentry/conventions": "^0.26.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.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.0",
"@sentry/server-runtime-injection": "11.4.0",
"@sentry/server-utils": "11.4.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.4.0",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.0",
"@sentry/node": "11.4.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.4.0",
"@sentry/core": "11.4.0",
"@sentry/conventions": "^0.25.0"
"@sentry/conventions": "^0.26.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.4.0",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.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.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.0",
"@sentry/node": "11.4.0",
"@sentry/server-runtime-injection": "11.4.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.4.0",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/server-utils": "11.4.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 @@ -44,7 +44,7 @@
"access": "public"
},
"dependencies": {
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.0",
"@sentry/node": "11.4.0",
"@sentry/server-utils": "11.4.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.4.0",
"@sentry/bundler-plugins": "11.4.0",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.0",
"@sentry/node": "11.4.0",
"@sentry/opentelemetry": "11.4.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.4.0",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.0",
"@sentry/node": "11.4.0",
"@sentry/server-runtime-injection": "11.4.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.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.0",
"@sentry/opentelemetry": "11.4.0",
"@sentry/server-runtime-injection": "11.4.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.4.0",
"@sentry/cloudflare": "11.4.0",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.0",
"@sentry/node": "11.4.0",
"@sentry/bundler-plugins": "11.4.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.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.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 @@ -57,7 +57,7 @@
"dependencies": {
"@opentelemetry/api": "^1.9.1",
"@sentry/browser": "11.4.0",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.0",
"@sentry/node": "11.4.0",
"@sentry/react": "11.4.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.4.0",
"@sentry/core": "11.4.0",
"@sentry/conventions": "^0.25.0"
"@sentry/conventions": "^0.26.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 @@ -78,7 +78,7 @@
"@remix-run/router": "^1.23.4",
"@sentry/browser": "11.4.0",
"@sentry/bundler-plugins": "11.4.0",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.0",
"@sentry/node": "11.4.0",
"@sentry/react": "11.4.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 @@ -97,7 +97,7 @@
},
"dependencies": {
"@opentelemetry/api": "^1.9.1",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.0"
},
"devDependencies": {
Expand Down
5 changes: 3 additions & 2 deletions packages/server-utils/src/ai/typesafe/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ import {
GEN_AI_USAGE_TOTAL_TOKENS,
SENTRY_ORIGIN,
} from '@sentry/conventions/attributes';
import { GEN_AI_EVALUATE } from '@sentry/conventions/op';
import type { Span, SpanAttributes } from '@sentry/core';
import { isObjectLike, SPAN_STATUS_ERROR, startInactiveSpan, stringify, withActiveSpan } from '@sentry/core';
import type { GenAiOptions } from '../core/utils';
import { getGenAiSpanOp, resolveAIRecordingOptions } from '../core/utils';
import { resolveAIRecordingOptions } from '../core/utils';
import { TYPESAFE_ORIGIN, TYPESAFE_PROVIDER_NAME } from './constants';

/**
Expand All @@ -28,7 +29,7 @@ export function startEvaluateSpan(request: unknown, client: unknown, recordInput

return startInactiveSpan({
name: model ? `evaluate ${model}` : 'evaluate',
op: getGenAiSpanOp('evaluate'),
op: GEN_AI_EVALUATE,
attributes: getRequestAttributes(params, model, recordInputs),
});
}
Expand Down
11 changes: 3 additions & 8 deletions packages/server-utils/src/ai/workers-ai/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,11 @@ import {
GEN_AI_SYSTEM_INSTRUCTIONS,
SENTRY_ORIGIN,
} from '@sentry/conventions/attributes';
import { GEN_AI_CHAT, GEN_AI_EMBEDDINGS } from '@sentry/conventions/op';
import { GEN_AI_CHAT, GEN_AI_EMBEDDINGS, GEN_AI_EVALUATE } from '@sentry/conventions/op';
import { isObjectLike, stringify } from '@sentry/core';
import type { Span, SpanAttributeValue } from '@sentry/core';
import { GEN_AI_REQUEST_STREAM_ATTRIBUTE } from '../core/gen-ai-attributes';
import {
extractSystemInstructions,
getGenAiSpanOp,
setOutputMessagesAttribute,
setTokenUsageAttributes,
} from '../core/utils';
import { extractSystemInstructions, setOutputMessagesAttribute, setTokenUsageAttributes } from '../core/utils';
import { addResponseAttributes as addEvaluateResponseAttributes, getEvaluationInputMessages } from '../typesafe';
// Re-exported so `workers-ai/streaming.ts` keeps importing it from this module.
export { setOutputMessagesAttribute };
Expand All @@ -37,7 +32,7 @@ export type WorkersAiOperationName = 'chat' | 'embeddings' | 'evaluate';
export const WORKERS_AI_OPERATION_SPAN_OPS: Record<WorkersAiOperationName, string> = {
chat: GEN_AI_CHAT,
embeddings: GEN_AI_EMBEDDINGS,
evaluate: getGenAiSpanOp('evaluate'),
evaluate: GEN_AI_EVALUATE,
};

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
} from '@sentry/conventions/attributes';
import {
GEN_AI_EMBEDDINGS,
GEN_AI_EVALUATE,
GEN_AI_EXECUTE_TOOL,
GEN_AI_GENERATE_CONTENT,
GEN_AI_INVOKE_AGENT,
Expand Down Expand Up @@ -65,9 +66,6 @@ const AI_SDK_TELEMETRY_TRACING_CHANNEL = 'ai:telemetry';

const ORIGIN = 'auto.vercelai.channel';

// Not yet in `@sentry/conventions`.
const GEN_AI_EVALUATE = 'gen_ai.evaluate';

// `gen_ai.operation.name` values, keyed to the span op they map to.
const GEN_AI_OPERATION_SPAN_OPS = {
embeddings: GEN_AI_EMBEDDINGS,
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.4.0",
"@sentry/core": "11.4.0",
"@sentry/conventions": "^0.25.0"
"@sentry/conventions": "^0.26.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.4.0",
"@sentry/solid": "11.4.0",
"@sentry/bundler-plugins": "11.4.0",
"@sentry/conventions": "0.25.0"
"@sentry/conventions": "0.26.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.4.0",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.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 @@ -73,7 +73,7 @@
"@opentelemetry/api": "^1.9.1",
"@sentry/cloudflare": "11.4.0",
"@sentry/core": "11.4.0",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/node": "11.4.0",
"@sentry/server-runtime-injection": "11.4.0",
"@sentry/server-utils": "11.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/tanstackstart-react/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/browser-utils": "11.4.0",
"@sentry/conventions": "^0.25.0",
"@sentry/conventions": "^0.26.0",
"@sentry/core": "11.4.0",
"@sentry/node": "11.4.0",
"@sentry/react": "11.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"dependencies": {
"@sentry/browser": "11.4.0",
"@sentry/core": "11.4.0",
"@sentry/conventions": "^0.25.0"
"@sentry/conventions": "^0.26.0"
},
"peerDependencies": {
"@tanstack/vue-router": "^1.64.0",
Expand Down
Loading
Loading