mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-03 01:40:21 +08:00
Merge remote-tracking branch 'origin/aether-rust-pioneer' into aether-rust-pioneer
# Conflicts: # crates/aether-data-contracts/src/repository/usage/mod.rs # crates/aether-data/src/repository/global_models/postgres.rs # crates/aether-data/src/repository/usage/postgres/mod.rs
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
use super::range::build_comparison_range;
|
||||
use super::range::{build_comparison_range, parse_bounded_u32};
|
||||
use super::resolve_admin_usage_time_range;
|
||||
use crate::handlers::admin::request::{AdminAppState, AdminRequestContext};
|
||||
use crate::handlers::admin::shared::query_param_value;
|
||||
@@ -6,16 +6,18 @@ use crate::GatewayError;
|
||||
use aether_admin::observability::stats::{
|
||||
admin_stats_bad_request_response, admin_stats_comparison_empty_response,
|
||||
admin_stats_error_distribution_empty_response,
|
||||
admin_stats_performance_percentiles_empty_response, admin_stats_time_series_empty_response,
|
||||
admin_stats_performance_percentiles_empty_response,
|
||||
admin_stats_provider_performance_empty_response, admin_stats_time_series_empty_response,
|
||||
build_admin_stats_comparison_response_from_aggregates,
|
||||
build_admin_stats_error_distribution_response_from_summaries,
|
||||
build_admin_stats_performance_percentiles_response_from_summaries,
|
||||
build_admin_stats_provider_performance_response,
|
||||
build_admin_stats_time_series_response_from_summaries, AdminStatsAggregate,
|
||||
AdminStatsComparisonType, AdminStatsGranularity, AdminStatsTimeRange, AdminStatsUsageFilter,
|
||||
};
|
||||
use aether_data_contracts::repository::usage::{
|
||||
UsageAuditSummaryQuery, UsageErrorDistributionQuery, UsagePerformancePercentilesQuery,
|
||||
UsageTimeSeriesGranularity, UsageTimeSeriesQuery,
|
||||
UsageProviderPerformanceQuery, UsageTimeSeriesGranularity, UsageTimeSeriesQuery,
|
||||
};
|
||||
use axum::{body::Body, http, response::Response};
|
||||
|
||||
@@ -173,6 +175,56 @@ pub(super) async fn maybe_build_local_admin_stats_analytics_response(
|
||||
));
|
||||
}
|
||||
|
||||
if request_context.route_kind() == Some("provider_performance")
|
||||
&& request_context.method() == http::Method::GET
|
||||
&& matches!(
|
||||
request_context.path(),
|
||||
"/api/admin/stats/performance/providers" | "/api/admin/stats/performance/providers/"
|
||||
)
|
||||
{
|
||||
let time_range = match resolve_admin_usage_time_range(request_context.query_string()) {
|
||||
Ok(value) => value,
|
||||
Err(detail) => return Ok(Some(admin_stats_bad_request_response(detail))),
|
||||
};
|
||||
let granularity =
|
||||
match query_param_value(request_context.query_string(), "granularity").as_deref() {
|
||||
None | Some("day") => UsageTimeSeriesGranularity::Day,
|
||||
Some("hour") => UsageTimeSeriesGranularity::Hour,
|
||||
Some(_) => {
|
||||
return Ok(Some(admin_stats_bad_request_response(
|
||||
"granularity must be one of: day, hour".to_string(),
|
||||
)));
|
||||
}
|
||||
};
|
||||
let limit = match query_param_value(request_context.query_string(), "limit")
|
||||
.map(|value| parse_bounded_u32("limit", &value, 1, 20))
|
||||
.transpose()
|
||||
{
|
||||
Ok(value) => value.unwrap_or(8) as usize,
|
||||
Err(detail) => return Ok(Some(admin_stats_bad_request_response(detail))),
|
||||
};
|
||||
if !state.has_usage_data_reader() {
|
||||
return Ok(Some(admin_stats_provider_performance_empty_response()));
|
||||
}
|
||||
|
||||
let Some((created_from_unix_secs, created_until_unix_secs)) = time_range.to_unix_bounds()
|
||||
else {
|
||||
return Ok(Some(admin_stats_provider_performance_empty_response()));
|
||||
};
|
||||
let performance = state
|
||||
.summarize_usage_provider_performance(&UsageProviderPerformanceQuery {
|
||||
created_from_unix_secs,
|
||||
created_until_unix_secs,
|
||||
granularity,
|
||||
tz_offset_minutes: time_range.tz_offset_minutes,
|
||||
limit,
|
||||
})
|
||||
.await?;
|
||||
return Ok(Some(build_admin_stats_provider_performance_response(
|
||||
&performance,
|
||||
)));
|
||||
}
|
||||
|
||||
if request_context.route_kind() == Some("time_series")
|
||||
&& request_context.method() == http::Method::GET
|
||||
&& matches!(
|
||||
|
||||
Reference in New Issue
Block a user