Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 24 additions & 8 deletions relay-event-normalization/src/eap/ai.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use relay_protocol::Annotated;

use crate::ModelCosts;
use crate::span::ai;
use crate::statsd::{map_origin_to_integration, platform_tag};
use crate::statsd::{Counters, map_origin_to_integration, platform_tag};

/// Normalizes AI attributes.
///
Expand Down Expand Up @@ -114,13 +114,32 @@ fn normalize_ai_costs(attributes: &mut Attributes, model_costs: Option<&ModelCos
let origin = extract_string_value(attributes, ORIGIN);
let platform = extract_string_value(attributes, PLATFORM);

let model_cost = attributes
let integration = map_origin_to_integration(origin);
let platform_tag = platform_tag(platform);

let Some(model_id) = attributes
.get_value(GEN_AI_REQUEST_MODEL)
.or_else(|| attributes.get_value(GEN_AI_RESPONSE_MODEL))
.and_then(|v| v.as_str())
.and_then(|model| model_costs?.cost_per_token(model));
else {
relay_statsd::metric!(
counter(Counters::GenAiCostCalculationResult) += 1,
result = "calculation_no_model_id_available",
integration = integration,
platform = platform_tag,
);
return;
};

let Some(model_cost) = model_cost else { return };
let Some(model_cost) = model_costs.and_then(|c| c.cost_per_token(model_id)) else {
relay_statsd::metric!(
counter(Counters::GenAiCostCalculationResult) += 1,
result = "calculation_no_model_cost_available",
integration = integration,
platform = platform_tag,
);
return;
};
Comment thread
cursor[bot] marked this conversation as resolved.

let get_tokens = |key| {
attributes
Expand All @@ -137,10 +156,7 @@ fn normalize_ai_costs(attributes: &mut Attributes, model_costs: Option<&ModelCos
output_reasoning_tokens: get_tokens(GEN_AI_USAGE_OUTPUT_REASONING_TOKENS),
};

let integration = map_origin_to_integration(origin);
let platform = platform_tag(platform);

let Some(costs) = ai::calculate_costs(model_cost, tokens, integration, platform) else {
let Some(costs) = ai::calculate_costs(model_cost, tokens, integration, platform_tag) else {
return;
};

Expand Down
31 changes: 27 additions & 4 deletions relay-event-normalization/src/normalize/span/ai.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ pub fn calculate_costs(
if !tokens.has_usage() {
relay_statsd::metric!(
counter(Counters::GenAiCostCalculationResult) += 1,
result = "calculation_none",
result = "calculation_no_tokens",
integration = integration,
platform = platform,
);
Expand Down Expand Up @@ -190,11 +190,20 @@ fn extract_ai_model_cost_data(
origin: Option<&str>,
platform: Option<&str>,
) {
let Some(model_cost) = model_cost else { return };

let used_tokens = UsedTokens::from_span_data(&*data);
let integration = map_origin_to_integration(origin);
let platform = platform_tag(platform);

let Some(model_cost) = model_cost else {
relay_statsd::metric!(
counter(Counters::GenAiCostCalculationResult) += 1,
result = "calculation_no_model_cost_available",
integration = integration,
platform = platform,
);
return;
};

let used_tokens = UsedTokens::from_span_data(&*data);
Comment thread
cursor[bot] marked this conversation as resolved.
let Some(costs) = calculate_costs(model_cost, used_tokens, integration, platform) else {
return;
};
Expand Down Expand Up @@ -289,6 +298,13 @@ fn extract_ai_data(
origin,
platform,
)
} else {
relay_statsd::metric!(
counter(Counters::GenAiCostCalculationResult) += 1,
result = "calculation_no_model_id_available",
integration = map_origin_to_integration(origin),
platform = platform_tag(platform),
);
Comment thread
cursor[bot] marked this conversation as resolved.
}
}

Expand All @@ -314,6 +330,13 @@ fn enrich_ai_span_data(

if let Some(model_costs) = model_costs {
extract_ai_data(data, duration, model_costs, origin, platform);
} else {
relay_statsd::metric!(
counter(Counters::GenAiCostCalculationResult) += 1,
result = "calculation_no_model_cost_available",
integration = map_origin_to_integration(origin),
platform = platform_tag(platform),
);
}

let ai_op_type = data
Expand Down
4 changes: 3 additions & 1 deletion relay-event-normalization/src/statsd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ pub enum Counters {
/// `calculation_negative`,
/// `calculation_zero`,
/// `calculation_positive`,
/// `calculation_none`
/// `calculation_no_tokens`
/// `calculation_no_model_cost_available`
/// `calculation_no_model_id_available`
/// - `integration`: The integration used for the cost calculation.
/// - `platform`: The platform used for the cost calculation.
GenAiCostCalculationResult,
Expand Down
Loading