Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(llm-monitoring): Extract AI data from data instead of measurements #3630

Merged
merged 3 commits into from
May 22, 2024
Merged

chore(llm-monitoring): Extract AI data from data instead of measurements #3630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
997e5a2
Extract AI data from data instead of measurements
colin-sentry May 21, 2024
ea73fcb
fix test?
colin-sentry May 21, 2024
7d4ab32
CHANGELOG
colin-sentry May 21, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
**Internal**:

- Send microsecond precision timestamps. ([#3613](https://github.com/getsentry/relay/pull/3613))
- Pull AI token counts from the 'data' section as well. ([#3630](https://github.com/getsentry/relay/pull/3630))
- Map outcome reasons for dynamic sampling to reduced set of values. ([#3623](https://github.com/getsentry/relay/pull/3623))
- Extract status for spans. ([#3606](https://github.com/getsentry/relay/pull/3606))

Expand Down
128 changes: 104 additions & 24 deletions relay-event-normalization/src/normalize/span/tag_extraction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,20 +643,46 @@ pub fn extract_tags(
span_tags
}

fn value_to_f64(val: Option<&Value>) -> Option<f64> {
match val {
Some(Value::F64(f)) => Some(*f),
Some(Value::I64(i)) => Some(*i as f64),
Some(Value::U64(u)) => Some(*u as f64),
_ => None,
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!


/// Copies specific numeric values from span data to span measurements.
pub fn extract_measurements(span: &mut Span, is_mobile: bool) {
let Some(span_op) = span.op.as_str() else {
return;
};

if span_op.starts_with("ai.") {
if let Some(data) = span.data.value() {
for (field, key) in [
(&data.ai_total_tokens_used, "ai_total_tokens_used"),
(&data.ai_completion_tokens_used, "ai_completion_tokens_used"),
(&data.ai_prompt_tokens_used, "ai_prompt_tokens_used"),
] {
if let Some(value) = value_to_f64(field.value()) {
let measurements = span.measurements.get_or_insert_with(Default::default);
measurements.insert(
key.into(),
Measurement {
value: value.into(),
unit: MetricUnit::None.into(),
}
.into(),
);
}
}
}
}

if span_op.starts_with("cache.") {
if let Some(data) = span.data.value() {
if let Some(value) = match &data.cache_item_size.value() {
Some(Value::F64(f)) => Some(*f),
Some(Value::I64(i)) => Some(*i as f64),
Some(Value::U64(u)) => Some(*u as f64),
_ => None,
} {
if let Some(value) = value_to_f64(data.cache_item_size.value()) {
let measurements = span.measurements.get_or_insert_with(Default::default);
measurements.insert(
"cache.item_size".to_owned(),
Expand Down Expand Up @@ -686,12 +712,7 @@ pub fn extract_measurements(span: &mut Span, is_mobile: bool) {
"http.response_transfer_size",
),
] {
if let Some(value) = match field.value() {
Some(Value::F64(f)) => Some(*f),
Some(Value::I64(i)) => Some(*i as f64),
Some(Value::U64(u)) => Some(*u as f64),
_ => None,
} {
if let Some(value) = value_to_f64(field.value()) {
let measurements = span.measurements.get_or_insert_with(Default::default);
measurements.insert(
key.into(),
Expand Down Expand Up @@ -722,12 +743,7 @@ pub fn extract_measurements(span: &mut Span, is_mobile: bool) {
"messaging.message.body.size",
),
] {
if let Some(value) = match field.value() {
Some(Value::F64(f)) => Some(*f),
Some(Value::I64(i)) => Some(*i as f64),
Some(Value::U64(u)) => Some(*u as f64),
_ => None,
} {
if let Some(value) = value_to_f64(field.value()) {
let measurements = span.measurements.get_or_insert_with(Default::default);
measurements.insert(
key.into(),
Expand All @@ -754,12 +770,7 @@ pub fn extract_measurements(span: &mut Span, is_mobile: bool) {
MetricUnit::Duration(DurationUnit::Second),
),
] {
if let Some(value) = match field.value() {
Some(Value::F64(f)) => Some(*f),
Some(Value::I64(i)) => Some(*i as f64),
Some(Value::U64(u)) => Some(*u as f64),
_ => None,
} {
if let Some(value) = value_to_f64(field.value()) {
let measurements = span.measurements.get_or_insert_with(Default::default);
measurements.insert(
key.into(),
Expand Down Expand Up @@ -1463,6 +1474,75 @@ LIMIT 1
assert!(!tags_3.contains_key("raw_domain"));
}

#[test]
fn test_ai_extraction() {
let json = r#"
{
"spans": [
{
"timestamp": 1694732408.3145,
"start_timestamp": 1694732407.8367,
"exclusive_time": 477.800131,
"description": "OpenAI Chat Completion",
"op": "ai.chat_completions.openai",
"span_id": "97c0ef9770a02f9d",
"parent_span_id": "9756d8d7b2b364ff",
"trace_id": "77aeb1c16bb544a4a39b8d42944947a3",
"data": {
"ai.total_tokens.used": 300,
"ai.completion_tokens.used": 200,
"ai.prompt_tokens.used": 100,
"ai.streaming": true,
"ai.pipeline.name": "My AI pipeline"
},
"hash": "e2fae740cccd3781"
}
]
}
"#;

let mut event = Annotated::<Event>::from_json(json)
.unwrap()
.into_value()
.unwrap();

extract_span_tags_from_event(&mut event, 200);

let span = &event
.spans
.value()
.unwrap()
.first()
.unwrap()
.value()
.unwrap();
let tags = span.sentry_tags.value().unwrap();
let measurements = span.measurements.value().unwrap();

assert_eq!(
tags.get("ai_pipeline_group").unwrap().as_str(),
Some("68e6cafc5b68d276")
);
assert_debug_snapshot!(measurements, @r###"
Measurements(
{
"ai_completion_tokens_used": Measurement {
value: 200.0,
unit: None,
},
"ai_prompt_tokens_used": Measurement {
value: 100.0,
unit: None,
},
"ai_total_tokens_used": Measurement {
value: 300.0,
unit: None,
},
},
)
"###);
}

#[test]
fn test_cache_extraction() {
let json = r#"
Expand Down
15 changes: 15 additions & 0 deletions relay-event-schema/src/protocol/span.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,18 @@ pub struct SpanData {
#[metastructure(field = "app_start_type")] // TODO: no dot?
pub app_start_type: Annotated<Value>,

/// The total tokens that were used by an LLM call
#[metastructure(field = "ai.total_tokens.used")]
pub ai_total_tokens_used: Annotated<Value>,

/// The input tokens used by an LLM call (usually cheaper than output tokens)
#[metastructure(field = "ai.prompt_tokens.used")]
pub ai_prompt_tokens_used: Annotated<Value>,

/// The output tokens used by an LLM call (the ones the LLM actually generated)
#[metastructure(field = "ai.completion_tokens.used")]
pub ai_completion_tokens_used: Annotated<Value>,

/// The client's browser name.
#[metastructure(field = "browser.name")]
pub browser_name: Annotated<String>,
Expand Down Expand Up @@ -604,6 +616,9 @@ mod tests {
insta::assert_debug_snapshot!(data, @r###"
SpanData {
app_start_type: ~,
ai_total_tokens_used: ~,
ai_prompt_tokens_used: ~,
ai_completion_tokens_used: ~,
browser_name: ~,
code_filepath: String(
"task.py",
Expand Down
3 changes: 3 additions & 0 deletions relay-event-schema/src/protocol/span/convert.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,9 @@ mod tests {
),
data: SpanData {
app_start_type: ~,
ai_total_tokens_used: ~,
ai_prompt_tokens_used: ~,
ai_completion_tokens_used: ~,
browser_name: "Chrome",
code_filepath: ~,
code_lineno: ~,
Expand Down
15 changes: 15 additions & 0 deletions ...napshots/relay_server__metrics_extraction__event__tests__extract_span_metrics_mobile.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ expression: "(&event.value().unwrap().spans, metrics)"
profile_id: ~,
data: SpanData {
app_start_type: ~,
ai_total_tokens_used: ~,
ai_prompt_tokens_used: ~,
ai_completion_tokens_used: ~,
browser_name: ~,
code_filepath: ~,
code_lineno: ~,
Expand Down Expand Up @@ -395,6 +398,9 @@ expression: "(&event.value().unwrap().spans, metrics)"
app_start_type: String(
"cold",
),
ai_total_tokens_used: ~,
ai_prompt_tokens_used: ~,
ai_completion_tokens_used: ~,
browser_name: ~,
code_filepath: ~,
code_lineno: ~,
Expand Down Expand Up @@ -491,6 +497,9 @@ expression: "(&event.value().unwrap().spans, metrics)"
app_start_type: String(
"cold",
),
ai_total_tokens_used: ~,
ai_prompt_tokens_used: ~,
ai_completion_tokens_used: ~,
browser_name: ~,
code_filepath: ~,
code_lineno: ~,
Expand Down Expand Up @@ -633,6 +642,9 @@ expression: "(&event.value().unwrap().spans, metrics)"
profile_id: ~,
data: SpanData {
app_start_type: ~,
ai_total_tokens_used: ~,
ai_prompt_tokens_used: ~,
ai_completion_tokens_used: ~,
browser_name: ~,
code_filepath: ~,
code_lineno: ~,
Expand Down Expand Up @@ -729,6 +741,9 @@ expression: "(&event.value().unwrap().spans, metrics)"
profile_id: ~,
data: SpanData {
app_start_type: ~,
ai_total_tokens_used: ~,
ai_prompt_tokens_used: ~,
ai_completion_tokens_used: ~,
browser_name: ~,
code_filepath: ~,
code_lineno: ~,
Expand Down
3 changes: 3 additions & 0 deletions relay-spans/src/span.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,9 @@ mod tests {
),
data: SpanData {
app_start_type: ~,
ai_total_tokens_used: ~,
ai_prompt_tokens_used: ~,
ai_completion_tokens_used: ~,
browser_name: "Chrome",
code_filepath: ~,
code_lineno: ~,
Expand Down
Loading