Merge branch 'master' into sebastian/trim-attributes

Author: loewenheim

CHANGELOG.md

@@ -9,6 +9,8 @@
 **Features**:
 
 - Updates `rdkafka` to 2.10 which fixes some protocol incompatibilities with Kafka 4. ([#5523](https://github.com/getsentry/relay/pull/5523))
+- Add sentry.category normalization for V2 spans. ([#5533](https://github.com/getsentry/relay/pull/5533))
+- Include cache write token cost in cost calculation for gen_ai spans. ([#5530](https://github.com/getsentry/relay/pull/5530))
 
 **Bug Fixes**:
 
@@ -21,6 +23,7 @@
 - Release Docker image to GHCR and DockerHub via Craft. ([#5509](https://github.com/getsentry/relay/pull/5509))
 - Tag span `usage` and `count_per_root_project` metrics with segment information. ([#5511](https://github.com/getsentry/relay/pull/5511))
 - Experimental support for loading configuration values from files. ([#5531](https://github.com/getsentry/relay/pull/5531))
+- Remove support for global quotas. ([#5534](https://github.com/getsentry/relay/pull/5534))
 
 ## 25.12.1
 

relay-conventions/sentry-conventions

@@ -41,6 +41,7 @@ convention_attributes!(
     GEN_AI_RESPONSE_TPS => "gen_ai.response.tokens_per_second",
     GEN_AI_SYSTEM => "gen_ai.system",
     GEN_AI_USAGE_INPUT_CACHED_TOKENS => "gen_ai.usage.input_tokens.cached",
+    GEN_AI_USAGE_INPUT_CACHE_WRITE_TOKENS => "gen_ai.usage.input_tokens.cache_write",
     GEN_AI_USAGE_INPUT_TOKENS => "gen_ai.usage.input_tokens",
     GEN_AI_USAGE_OUTPUT_REASONING_TOKENS => "gen_ai.usage.output_tokens.reasoning",
     GEN_AI_USAGE_OUTPUT_TOKENS => "gen_ai.usage.output_tokens",
@@ -61,17 +62,20 @@ convention_attributes!(
     PLATFORM => "sentry.platform",
     PROFILE_ID => "sentry.profile_id",
     RELEASE => "sentry.release",
+    RESOURCE_RENDER_BLOCKING_STATUS => "resource.render_blocking_status",
     RPC_GRPC_STATUS_CODE => "rpc.grpc.status_code",
     RPC_SERVICE => "rpc.service",
     SEGMENT_ID => "sentry.segment.id",
     SEGMENT_NAME => "sentry.segment.name",
     SENTRY_ACTION => "sentry.action",
+    SENTRY_CATEGORY => "sentry.category",
     SENTRY_DOMAIN => "sentry.domain",
     SENTRY_GROUP => "sentry.group",
     SENTRY_NORMALIZED_DESCRIPTION => "sentry.normalized_description",
     SERVER_ADDRESS => "server.address",
     SPAN_KIND => "sentry.kind",
     STATUS_MESSAGE => "sentry.status.message",
+    UI_COMPONENT_NAME => "ui.component_name",
     URL_FULL => "url.full",
     URL_PATH => "url.path",
     URL_SCHEME => "url.scheme",

relay-conventions/src/consts.rs

@@ -89,6 +89,7 @@ fn normalize_ai_costs(attributes: &mut Attributes, model_costs: Option<&ModelCos
     let tokens = ai::UsedTokens {
         input_tokens: get_tokens(GEN_AI_USAGE_INPUT_TOKENS),
         input_cached_tokens: get_tokens(GEN_AI_USAGE_INPUT_CACHED_TOKENS),
+        input_cache_write_tokens: get_tokens(GEN_AI_USAGE_INPUT_CACHE_WRITE_TOKENS),
         output_tokens: get_tokens(GEN_AI_USAGE_OUTPUT_TOKENS),
         output_reasoning_tokens: get_tokens(GEN_AI_USAGE_OUTPUT_REASONING_TOKENS),
     };
@@ -133,6 +134,7 @@ mod tests {
                         output_per_token: 0.02,
                         output_reasoning_per_token: 0.03,
                         input_cached_per_token: 0.04,
+                        input_cache_write_per_token: 0.0,
                     },
                 ),
                 (
@@ -142,6 +144,7 @@ mod tests {
                         output_per_token: 0.05,
                         output_reasoning_per_token: 0.0,
                         input_cached_per_token: 0.0,
+                        input_cache_write_per_token: 0.0,
                     },
                 ),
             ]),