feat(ai): Mark some AI attributes as PII maybe (#4860)

The default scrubbers are too eager on these fields, rendering the
experience often unusable.
We're moving the specified attributes to PII maybe which means that
we'll be not scrubbing them by default, but people will be able to add
it to scrubbing in settings if they wish to do so. This will be properly
documented in product docs.

---------

Co-authored-by: David Herberth <david.herberth@sentry.io>
Co-authored-by: Vjeran Grozdanic <vjeran.grozdanic@sentry.io>

Author: 3 people

CHANGELOG.md

@@ -16,6 +16,7 @@
 - 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))
+- Change pii scrubbing on some AI attributes to optional ([#4860](https://github.com/getsentry/relay/pull/4860))
 
 ## 25.6.1
 

relay-event-schema/src/protocol/span.rs

@@ -502,6 +502,34 @@ pub struct SpanData {
     #[metastructure(field = "gen_ai.usage.total_cost", legacy_alias = "ai.total_cost")]
     pub gen_ai_usage_total_cost: Annotated<Value>,
 
+    /// Prompt passed to LLM (Vercel AI SDK)
+    #[metastructure(field = "gen_ai.prompt", pii = "maybe")]
+    pub gen_ai_prompt: Annotated<Value>,
+
+    /// Prompt passed to LLM
+    #[metastructure(field = "gen_ai.request.messages", pii = "maybe")]
+    pub gen_ai_request_messages: Annotated<Value>,
+
+    /// Tool call arguments
+    #[metastructure(field = "gen_ai.tool.input", pii = "maybe")]
+    pub gen_ai_tool_input: Annotated<Value>,
+
+    /// Tool call result
+    #[metastructure(field = "gen_ai.tool.output", pii = "maybe")]
+    pub gen_ai_tool_output: Annotated<Value>,
+
+    /// LLM decisions to use calls
+    #[metastructure(field = "gen_ai.response.tool_calls", pii = "maybe")]
+    pub gen_ai_response_tool_calls: Annotated<Value>,
+
+    /// LLM response text (Vercel AI, generateText)
+    #[metastructure(field = "gen_ai.response.text", pii = "maybe")]
+    pub gen_ai_response_text: Annotated<Value>,
+
+    /// LLM response object (Vercel AI, generateObject)
+    #[metastructure(field = "gen_ai.response.object", pii = "maybe")]
+    pub gen_ai_response_object: Annotated<Value>,
+
     /// The client's browser name.
     #[metastructure(field = "browser.name")]
     pub browser_name: Annotated<String>,
@@ -1292,6 +1320,13 @@ mod tests {
             gen_ai_response_model: ~,
             gen_ai_request_model: ~,
             gen_ai_usage_total_cost: ~,
+            gen_ai_prompt: ~,
+            gen_ai_request_messages: ~,
+            gen_ai_tool_input: ~,
+            gen_ai_tool_output: ~,
+            gen_ai_response_tool_calls: ~,
+            gen_ai_response_text: ~,
+            gen_ai_response_object: ~,
             browser_name: ~,
             code_filepath: String(
                 "task.py",

relay-event-schema/src/protocol/span/convert.rs

@@ -164,6 +164,13 @@ mod tests {
                 gen_ai_response_model: ~,
                 gen_ai_request_model: ~,
                 gen_ai_usage_total_cost: ~,
+                gen_ai_prompt: ~,
+                gen_ai_request_messages: ~,
+                gen_ai_tool_input: ~,
+                gen_ai_tool_output: ~,
+                gen_ai_response_tool_calls: ~,
+                gen_ai_response_text: ~,
+                gen_ai_response_object: ~,
                 browser_name: "Chrome",
                 code_filepath: ~,
                 code_lineno: ~,

relay-server/src/metrics_extraction/snapshots/relay_server__metrics_extraction__event__tests__extract_span_metrics_mobile.snap

@@ -146,6 +146,13 @@ expression: "(&event.value().unwrap().spans, metrics.project_metrics)"
                 gen_ai_response_model: ~,
                 gen_ai_request_model: ~,
                 gen_ai_usage_total_cost: ~,
+                gen_ai_prompt: ~,
+                gen_ai_request_messages: ~,
+                gen_ai_tool_input: ~,
+                gen_ai_tool_output: ~,
+                gen_ai_response_tool_calls: ~,
+                gen_ai_response_text: ~,
+                gen_ai_response_object: ~,
                 browser_name: ~,
                 code_filepath: ~,
                 code_lineno: ~,
@@ -809,6 +816,13 @@ expression: "(&event.value().unwrap().spans, metrics.project_metrics)"
                 gen_ai_response_model: ~,
                 gen_ai_request_model: ~,
                 gen_ai_usage_total_cost: ~,
+                gen_ai_prompt: ~,
+                gen_ai_request_messages: ~,
+                gen_ai_tool_input: ~,
+                gen_ai_tool_output: ~,
+                gen_ai_response_tool_calls: ~,
+                gen_ai_response_text: ~,
+                gen_ai_response_object: ~,
                 browser_name: ~,
                 code_filepath: ~,
                 code_lineno: ~,
@@ -999,6 +1013,13 @@ expression: "(&event.value().unwrap().spans, metrics.project_metrics)"
                 gen_ai_response_model: ~,
                 gen_ai_request_model: ~,
                 gen_ai_usage_total_cost: ~,
+                gen_ai_prompt: ~,
+                gen_ai_request_messages: ~,
+                gen_ai_tool_input: ~,
+                gen_ai_tool_output: ~,
+                gen_ai_response_tool_calls: ~,
+                gen_ai_response_text: ~,
+                gen_ai_response_object: ~,
                 browser_name: ~,
                 code_filepath: ~,
                 code_lineno: ~,
@@ -1298,6 +1319,13 @@ expression: "(&event.value().unwrap().spans, metrics.project_metrics)"
                 gen_ai_response_model: ~,
                 gen_ai_request_model: ~,
                 gen_ai_usage_total_cost: ~,
+                gen_ai_prompt: ~,
+                gen_ai_request_messages: ~,
+                gen_ai_tool_input: ~,
+                gen_ai_tool_output: ~,
+                gen_ai_response_tool_calls: ~,
+                gen_ai_response_text: ~,
+                gen_ai_response_object: ~,
                 browser_name: ~,
                 code_filepath: ~,
                 code_lineno: ~,
@@ -1488,6 +1516,13 @@ expression: "(&event.value().unwrap().spans, metrics.project_metrics)"
                 gen_ai_response_model: ~,
                 gen_ai_request_model: ~,
                 gen_ai_usage_total_cost: ~,
+                gen_ai_prompt: ~,
+                gen_ai_request_messages: ~,
+                gen_ai_tool_input: ~,
+                gen_ai_tool_output: ~,
+                gen_ai_response_tool_calls: ~,
+                gen_ai_response_text: ~,
+                gen_ai_response_object: ~,
                 browser_name: ~,
                 code_filepath: ~,
                 code_lineno: ~,