Merge branch 'master' into tkdodo/ref/releases-endpoint-to-apiOptions

Author: TkDodo

migrations_lockfile.txt

@@ -31,7 +31,7 @@ replays: 0007_organizationmember_replay_access
 
 seer: 0005_delete_seerorganizationsettings
 
-sentry: 1064_eventattachment_date_expires_now
+sentry: 1065_delete_customdynamicsamplingrule
 
 social_auth: 0003_social_auth_json_field
 

src/sentry/db/router.py

@@ -76,6 +76,8 @@ class SiloRouter:
         "sentry_alertruleactivations": SiloMode.CELL,
         "sentry_alertruleactivationcondition": SiloMode.CELL,
         "sentry_code_review_event": SiloMode.CELL,
+        "sentry_customdynamicsamplingrule": SiloMode.CELL,
+        "sentry_customdynamicsamplingruleproject": SiloMode.CELL,
         "sentry_dashboardwidgetsnapshot": SiloMode.CELL,
         "sentry_datasecrecywaiver": SiloMode.CELL,
         "sentry_incidentseen": SiloMode.CELL,

src/sentry/hybridcloud/apigateway_async/proxy.py

@@ -12,7 +12,6 @@
 import httpx
 from asgiref.sync import sync_to_async
 from django.conf import settings
-from django.core.exceptions import RequestAborted
 from django.http import HttpRequest, HttpResponse, JsonResponse, StreamingHttpResponse
 from django.http.response import HttpResponseBase
 
@@ -199,7 +198,7 @@ async def proxy_cell_request(
                     return _adapt_response(resp, target_url)
             except asyncio.CancelledError:
                 metrics.incr("apigateway.proxy.request_aborted", tags=metric_tags)
-                raise RequestAborted()
+                raise
             except httpx.TimeoutException:
                 metrics.incr("apigateway.proxy.request_timeout", tags=metric_tags)
                 circuitbreaker.incr_failures()

src/sentry/migrations/1065_delete_customdynamicsamplingrule.py

@@ -0,0 +1,22 @@
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.models import SafeDeleteModel
+from sentry.new_migrations.monkey.state import DeletionAction
+
+
+class Migration(CheckedMigration):
+    is_post_deployment = False
+
+    dependencies = [
+        ("sentry", "1064_eventattachment_date_expires_now"),
+    ]
+
+    operations = [
+        SafeDeleteModel(
+            name="CustomDynamicSamplingRuleProject",
+            deletion_action=DeletionAction.DELETE,
+        ),
+        SafeDeleteModel(
+            name="CustomDynamicSamplingRule",
+            deletion_action=DeletionAction.DELETE,
+        ),
+    ]

src/sentry/utils/sdk.py

@@ -255,7 +255,10 @@ def before_send(event: Event, hint: Hint) -> Event | None:
         if settings.SENTRY_LOCAL_CELL:
             event["tags"]["sentry_region"] = settings.SENTRY_LOCAL_CELL
 
-    if hint.get("exc_info", [None])[0] == OperationalError:
+    event_exc: type[BaseException] | None = hint.get("exc_info", [None])[0]
+    if event_exc == asyncio.CancelledError:
+        return None
+    if event_exc == OperationalError:
         event["level"] = "warning"
 
     return event

static/app/views/dashboards/utils/prebuiltConfigs/ai/aiAgentsModels.ts

@@ -164,8 +164,8 @@ export const AI_AGENTS_MODELS_PREBUILT_CONFIG: PrebuiltDashboard = {
       {
         dataset: WidgetType.SPANS,
         tag: {
-          key: 'gen_ai.response.model',
-          name: 'gen_ai.response.model',
+          key: SpanFields.GEN_AI_RESPONSE_MODEL,
+          name: SpanFields.GEN_AI_RESPONSE_MODEL,
           kind: FieldKind.TAG,
         },
         value: '',

static/app/views/insights/pages/agents/components/llmCallsWidget.tsx

@@ -42,7 +42,7 @@ export function LLMCallsWidget() {
 
   const generationsRequest = useSpans(
     {
-      fields: ['gen_ai.request.model', 'count()'],
+      fields: [SpanFields.GEN_AI_RESPONSE_MODEL, 'count()'],
       sorts: [{field: 'count()', kind: 'desc'}],
       search: fullQuery,
       limit: 3,
@@ -54,7 +54,7 @@ export function LLMCallsWidget() {
     {
       ...pageFilterChartParams,
       query: fullQuery,
-      groupBy: [SpanFields.GEN_AI_REQUEST_MODEL],
+      groupBy: [SpanFields.GEN_AI_RESPONSE_MODEL],
       yAxis: ['count(span.duration)'],
       sort: {field: 'count(span.duration)', kind: 'desc'},
       topEvents: 3,
@@ -109,7 +109,7 @@ export function LLMCallsWidget() {
   const footer = hasData && (
     <WidgetFooterTable>
       {models?.map((item, index) => {
-        const modelId = item['gen_ai.request.model'];
+        const modelId = item[SpanFields.GEN_AI_RESPONSE_MODEL];
         return (
           <Fragment key={modelId}>
             <div>
@@ -149,7 +149,7 @@ export function LLMCallsWidget() {
                   yAxes: ['count(span.duration)'],
                 },
               ],
-              groupBy: ['gen_ai.request.model'],
+              groupBy: [SpanFields.GEN_AI_RESPONSE_MODEL],
               query: fullQuery,
               sort: '-count(span.duration)',
               interval: pageFilterChartParams.interval,

static/app/views/insights/pages/agents/components/modelCostWidget.tsx

@@ -41,7 +41,7 @@ export function ModelCostWidget() {
 
   const tokensRequest = useSpans(
     {
-      fields: ['gen_ai.request.model', 'sum(gen_ai.cost.total_tokens)'],
+      fields: [SpanFields.GEN_AI_RESPONSE_MODEL, 'sum(gen_ai.cost.total_tokens)'],
       sorts: [{field: 'sum(gen_ai.cost.total_tokens)', kind: 'desc'}],
       search: fullQuery,
       limit: 3,
@@ -53,7 +53,7 @@ export function ModelCostWidget() {
     {
       ...pageFilterChartParams,
       query: fullQuery,
-      groupBy: [SpanFields.GEN_AI_REQUEST_MODEL],
+      groupBy: [SpanFields.GEN_AI_RESPONSE_MODEL],
       yAxis: ['sum(gen_ai.cost.total_tokens)'],
       sort: {field: 'sum(gen_ai.cost.total_tokens)', kind: 'desc'},
       topEvents: 3,
@@ -111,7 +111,7 @@ export function ModelCostWidget() {
   const footer = hasData && (
     <WidgetFooterTable>
       {tokens?.map((item, index) => {
-        const modelId = `${item['gen_ai.request.model']}`;
+        const modelId = `${item[SpanFields.GEN_AI_RESPONSE_MODEL]}`;
         return (
           <Fragment key={modelId}>
             <div>
@@ -149,7 +149,7 @@ export function ModelCostWidget() {
                   yAxes: ['sum(gen_ai.cost.total_tokens)'],
                 },
               ],
-              groupBy: ['gen_ai.request.model'],
+              groupBy: [SpanFields.GEN_AI_RESPONSE_MODEL],
               query: fullQuery,
               sort: '-sum(gen_ai.cost.total_tokens)',
               interval: pageFilterChartParams.interval,

static/app/views/insights/pages/agents/components/modelsTable.tsx

@@ -38,6 +38,7 @@ import {getAIGenerationsFilter} from 'sentry/views/insights/pages/agents/utils/q
 import {Referrer} from 'sentry/views/insights/pages/agents/utils/referrers';
 import {DurationCell} from 'sentry/views/insights/pages/platform/shared/table/DurationCell';
 import {NumberCell} from 'sentry/views/insights/pages/platform/shared/table/NumberCell';
+import {SpanFields} from 'sentry/views/insights/types';
 
 interface TableData {
   avg: number;
@@ -100,7 +101,7 @@ export function ModelsTable() {
   const modelsRequest = useSpans(
     {
       fields: [
-        'gen_ai.request.model',
+        SpanFields.GEN_AI_RESPONSE_MODEL,
         'sum(gen_ai.usage.input_tokens)',
         'sum(gen_ai.usage.output_tokens)',
         'sum(gen_ai.usage.output_tokens.reasoning)',
@@ -126,7 +127,7 @@ export function ModelsTable() {
     }
 
     return modelsRequest.data.map(span => ({
-      model: span['gen_ai.request.model'],
+      model: span[SpanFields.GEN_AI_RESPONSE_MODEL],
       requests: span['count()'] ?? 0,
       avg: span['avg(span.duration)'] ?? 0,
       p95: span['p95(span.duration)'] ?? 0,
@@ -223,9 +224,9 @@ const BodyCell = memo(function BodyCell({
         yAxes: ['avg(span.duration)'],
       },
     ],
-    query: `gen_ai.request.model:${dataRow.model}`,
+    query: `${SpanFields.GEN_AI_RESPONSE_MODEL}:${dataRow.model}`,
     field: [
-      'gen_ai.request.model',
+      SpanFields.GEN_AI_RESPONSE_MODEL,
       'gen_ai.operation.name',
       'gen_ai.usage.input_tokens',
       'gen_ai.usage.output_tokens',
@@ -268,7 +269,7 @@ const BodyCell = memo(function BodyCell({
         <ErrorCell
           value={dataRow.errors}
           target={getExploreUrl({
-            query: `${query} span.status:internal_error gen_ai.request.model:"${dataRow.model}"`,
+            query: `${query} span.status:internal_error ${SpanFields.GEN_AI_RESPONSE_MODEL}:"${dataRow.model}"`,
             organization,
             selection,
             referrer: Referrer.MODELS_TABLE,

static/app/views/insights/pages/agents/components/tokenUsageWidget.tsx

@@ -42,7 +42,7 @@ export function TokenUsageWidget() {
 
   const tokensRequest = useSpans(
     {
-      fields: ['gen_ai.request.model', 'sum(gen_ai.usage.total_tokens)'],
+      fields: [SpanFields.GEN_AI_RESPONSE_MODEL, 'sum(gen_ai.usage.total_tokens)'],
       sorts: [{field: 'sum(gen_ai.usage.total_tokens)', kind: 'desc'}],
       search: fullQuery,
       limit: 3,
@@ -54,7 +54,7 @@ export function TokenUsageWidget() {
     {
       ...pageFilterChartParams,
       query: fullQuery,
-      groupBy: [SpanFields.GEN_AI_REQUEST_MODEL],
+      groupBy: [SpanFields.GEN_AI_RESPONSE_MODEL],
       yAxis: ['sum(gen_ai.usage.total_tokens)'],
       sort: {field: 'sum(gen_ai.usage.total_tokens)', kind: 'desc'},
       topEvents: 3,
@@ -112,7 +112,7 @@ export function TokenUsageWidget() {
   const footer = hasData && (
     <WidgetFooterTable>
       {tokens?.map((item, index) => {
-        const modelId = `${item['gen_ai.request.model']}`;
+        const modelId = `${item[SpanFields.GEN_AI_RESPONSE_MODEL]}`;
         return (
           <Fragment key={modelId}>
             <div>
@@ -152,7 +152,7 @@ export function TokenUsageWidget() {
                   yAxes: ['sum(gen_ai.usage.total_tokens)'],
                 },
               ],
-              groupBy: ['gen_ai.request.model'],
+              groupBy: [SpanFields.GEN_AI_RESPONSE_MODEL],
               query: fullQuery,
               sort: '-sum(gen_ai.usage.total_tokens)',
               interval: pageFilterChartParams.interval,