fix(ai): Consider gen_ai valid op prefix for AI spans

CHANGELOG.md

@@ -14,6 +14,7 @@
 - Take into account more types of tokens when doing AI cost calculation. ([#4840](https://github.com/getsentry/relay/pull/4840))
 - Use the `FiniteF64` type for measurements. ([#4828](https://github.com/getsentry/relay/pull/4828))
 - Derive a `sentry.description` attribute for V2 spans ([#4832](https://github.com/getsentry/relay/pull/4832))
+- Consider `gen_ai` also as AI span op prefix. ([#4859](https://github.com/getsentry/relay/pull/4859))
 
 ## 25.6.1
 

relay-dynamic-config/src/defaults.rs

@@ -112,7 +112,7 @@ pub fn add_span_metrics(project_config: &mut ProjectConfig) {
 /// These metrics are added to [`crate::GlobalConfig`] by the service and enabled
 /// by project configs in sentry.
 pub fn hardcoded_span_metrics() -> Vec<(GroupKey, Vec<MetricSpec>, Vec<TagMapping>)> {
-    let is_ai = RuleCondition::glob("span.op", "ai.*");
+    let is_ai = RuleCondition::glob("span.op", "ai.*") | RuleCondition::glob("span.op", "gen_ai.*");
 
     let is_db = RuleCondition::eq("span.sentry_tags.category", "db")
         & !RuleCondition::glob("span.op", DISABLED_DATABASES)

relay-event-normalization/src/event.rs

@@ -2312,6 +2312,106 @@ mod tests {
 
     #[test]
     fn test_ai_data() {
+        let json = r#"
+            {
+                "spans": [
+                    {
+                        "timestamp": 1702474613.0495,
+                        "start_timestamp": 1702474613.0175,
+                        "description": "OpenAI ",
+                        "op": "gen_ai.chat_completions.openai",
+                        "span_id": "9c01bd820a083e63",
+                        "parent_span_id": "a1e13f3f06239d69",
+                        "trace_id": "922dda2462ea4ac2b6a4b339bee90863",
+                        "data": {
+                            "gen_ai.usage.input_tokens": 1000,
+                            "gen_ai.usage.output_tokens": 2000,
+                            "gen_ai.usage.output_tokens.reasoning": 3000,
+                            "gen_ai.usage.input_tokens.cached": 4000,
+                            "gen_ai.request.model": "claude-2.1"
+                        }
+                    },
+                    {
+                        "timestamp": 1702474613.0495,
+                        "start_timestamp": 1702474613.0175,
+                        "description": "OpenAI ",
+                        "op": "gen_ai.chat_completions.openai",
+                        "span_id": "ac01bd820a083e63",
+                        "parent_span_id": "a1e13f3f06239d69",
+                        "trace_id": "922dda2462ea4ac2b6a4b339bee90863",
+                        "data": {
+                            "gen_ai.usage.input_tokens": 1000,
+                            "gen_ai.usage.output_tokens": 2000,
+                            "gen_ai.request.model": "gpt4-21-04"
+                        }
+                    }
+                ]
+            }
+        "#;
+
+        let mut event = Annotated::<Event>::from_json(json).unwrap();
+
+        normalize_event(
+            &mut event,
+            &NormalizationConfig {
+                ai_model_costs: Some(&ModelCosts {
+                    version: 2,
+                    costs: vec![],
+                    models: HashMap::from([
+                        (
+                            "claude-2.1".to_owned(),
+                            ModelCostV2 {
+                                input_per_token: 0.01,
+                                output_per_token: 0.02,
+                                output_reasoning_per_token: 0.03,
+                                input_cached_per_token: 0.0,
+                            },
+                        ),
+                        (
+                            "gpt4-21-04".to_owned(),
+                            ModelCostV2 {
+                                input_per_token: 0.09,
+                                output_per_token: 0.05,
+                                output_reasoning_per_token: 0.06,
+                                input_cached_per_token: 0.0,
+                            },
+                        ),
+                    ]),
+                }),
+                ..NormalizationConfig::default()
+            },
+        );
+
+        let spans = event.value().unwrap().spans.value().unwrap();
+        assert_eq!(spans.len(), 2);
+        assert_eq!(
+            spans
+                .first()
+                .and_then(|span| span.value())
+                .and_then(|span| span.data.value())
+                .and_then(|data| data.gen_ai_usage_total_cost.value()),
+            Some(&Value::F64(140.0))
+        );
+        assert_eq!(
+            spans
+                .get(1)
+                .and_then(|span| span.value())
+                .and_then(|span| span.data.value())
+                .and_then(|data| data.gen_ai_usage_total_cost.value()),
+            Some(&Value::F64(190.0))
+        );
+        assert_eq!(
+            spans
+                .get(1)
+                .and_then(|span| span.value())
+                .and_then(|span| span.data.value())
+                .and_then(|data| data.gen_ai_usage_total_tokens.value()),
+            Some(&Value::F64(3000.0))
+        );
+    }
+
+    #[test]
+    fn test_ai_data_with_ai_op_prefix() {
         let json = r#"
             {
                 "spans": [

relay-event-normalization/src/normalize/span/ai.rs

@@ -42,7 +42,7 @@ fn calculate_ai_model_cost(model_cost: Option<ModelCostV2>, data: &SpanData) ->
 
 /// Maps AI-related measurements (legacy) to span data.
 pub fn map_ai_measurements_to_data(span: &mut Span) {
-    if !span.op.value().is_some_and(|op| op.starts_with("ai.")) {
+    if !is_ai_span(span) {
         return;
     };
 
@@ -86,7 +86,7 @@ pub fn map_ai_measurements_to_data(span: &mut Span) {
 
 /// Extract the gen_ai_usage_total_cost data into the span
 pub fn extract_ai_data(span: &mut Span, ai_model_costs: &ModelCosts) {
-    if !span.op.value().is_some_and(|op| op.starts_with("ai.")) {
+    if !is_ai_span(span) {
         return;
     }
 
@@ -123,3 +123,11 @@ pub fn enrich_ai_span_data(event: &mut Event, model_costs: Option<&ModelCosts>)
         }
     }
 }
+
+/// Returns true if the span is an AI span.
+/// AI spans are spans with op starting with "ai." (legacy) or "gen_ai." (new).
+pub fn is_ai_span(span: &Span) -> bool {
+    span.op
+        .value()
+        .is_some_and(|op| op.starts_with("ai.") || op.starts_with("gen_ai."))
+}