i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-03 01:40:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor usage body capture and stream terminal reporting

Browse Source
This commit is contained in:
fawney19
2026-04-18 17:48:21 +08:00
parent 569242d72f
commit 3363592751
36 changed files with 2673 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/aether-gateway/src/handlers/admin/observability/usage/detail_routes.rs
View File

@@ -3,8 +3,8 @@ use super::analytics::admin_usage_provider_key_names;
use super::replay::{
admin_usage_curl_headers, admin_usage_curl_url, admin_usage_headers_from_value,
admin_usage_id_from_action_path, admin_usage_id_from_detail_path,
admin_usage_resolve_body_value, admin_usage_resolve_request_preview_body,
admin_usage_resolve_request_preview_body_for_item, build_admin_usage_curl_response,
admin_usage_resolve_body_value, admin_usage_resolve_request_capture_body,
admin_usage_resolve_request_capture_body_for_item, build_admin_usage_curl_response,
build_admin_usage_detail_payload, build_admin_usage_replay_response,
};
use crate::handlers::admin::request::{AdminAppState, AdminRequestContext};
@@ -101,9 +101,9 @@ pub(super) async fn maybe_build_local_admin_usage_detail_response(
.await?;
let body = provider_request_body
.or(request_body)
.unwrap_or_else(|| admin_usage_resolve_request_preview_body(&item, None));
.or_else(|| admin_usage_resolve_request_capture_body(&item, None));
return Ok(Some(attach_admin_audit_response(
build_admin_usage_curl_response(&item, url, headers_json, &headers, &body),
build_admin_usage_curl_response(&item, url, headers_json, &headers, body.as_ref()),
"admin_usage_curl_viewed",
"view_usage_curl_replay",
"usage_record",
@@ -119,8 +119,8 @@ pub(super) async fn maybe_build_local_admin_usage_detail_response(
{
response = attach_admin_audit_response(
response,
"admin_usage_replay_preview_generated",
"preview_usage_replay",
"admin_usage_replay_plan_generated",
"generate_usage_replay_plan",
"usage_record",
&usage_id,
);
@@ -173,7 +173,7 @@ pub(super) async fn maybe_build_local_admin_usage_detail_response(
let provider_key_name = admin_usage_provider_key_name(&item, &provider_key_names);
let request_body =
admin_usage_resolve_request_preview_body_for_item(state, &item, None).await?;
admin_usage_resolve_request_capture_body_for_item(state, &item, None).await?;
let mut detail_item = item.clone();
if include_bodies {
detail_item.provider_request_body = admin_usage_resolve_body_value(

35
apps/aether-gateway/src/handlers/admin/observability/usage/replay.rs
View File

@@ -6,7 +6,7 @@ use aether_admin::observability::usage::{
};
use aether_data_contracts::repository::{
provider_catalog::StoredProviderCatalogEndpoint,
usage::{StoredRequestUsageAudit, UsageBodyField},
usage::{StoredRequestUsageAudit, UsageBodyCaptureState, UsageBodyField},
};
use axum::{
body::Body,
@@ -37,11 +37,11 @@ struct AdminUsageReplayRequest {
body_override: Option<serde_json::Value>,
}
pub(super) fn admin_usage_resolve_request_preview_body(
pub(super) fn admin_usage_resolve_request_capture_body(
item: &StoredRequestUsageAudit,
body_override: Option<serde_json::Value>,
) -> serde_json::Value {
aether_admin::observability::usage::admin_usage_resolve_request_preview_body(
) -> Option<serde_json::Value> {
aether_admin::observability::usage::admin_usage_resolve_request_capture_body(
item,
body_override,
)
@@ -53,6 +53,15 @@ pub(super) async fn admin_usage_resolve_body_value(
inline_body: Option<&Value>,
field: UsageBodyField,
) -> Result<Option<Value>, GatewayError> {
match item.body_state(field) {
Some(UsageBodyCaptureState::Disabled)
| Some(UsageBodyCaptureState::Unavailable)
| Some(UsageBodyCaptureState::None) => return Ok(None),
Some(UsageBodyCaptureState::Inline) | Some(UsageBodyCaptureState::Truncated) => {
return Ok(inline_body.cloned());
}
Some(UsageBodyCaptureState::Reference) | None => {}
}
let resolved_ref_body = match item.body_ref(field) {
Some(body_ref) => state.resolve_request_usage_body_ref(body_ref).await?,
None => None,
@@ -70,13 +79,13 @@ fn admin_usage_body_value_from_sources(
resolved_ref_body.or_else(|| inline_body.cloned())
}
pub(super) async fn admin_usage_resolve_request_preview_body_for_item(
pub(super) async fn admin_usage_resolve_request_capture_body_for_item(
state: &AdminAppState<'_>,
item: &StoredRequestUsageAudit,
body_override: Option<serde_json::Value>,
) -> Result<serde_json::Value, GatewayError> {
) -> Result<Option<serde_json::Value>, GatewayError> {
if let Some(body_override) = body_override {
return Ok(body_override);
return Ok(Some(body_override));
}
if let Some(body) = admin_usage_resolve_body_value(
state,
@@ -86,9 +95,9 @@ pub(super) async fn admin_usage_resolve_request_preview_body_for_item(
)
.await?
{
return Ok(body);
return Ok(Some(body));
}
Ok(admin_usage_resolve_request_preview_body(item, None))
Ok(admin_usage_resolve_request_capture_body(item, None))
}
pub(super) fn build_admin_usage_curl_response(
@@ -96,7 +105,7 @@ pub(super) fn build_admin_usage_curl_response(
url: Option<String>,
headers_json: Option<Value>,
headers: &BTreeMap<String, String>,
body: &Value,
body: Option<&Value>,
) -> Response<Body> {
aether_admin::observability::usage::build_admin_usage_curl_response(
item,
@@ -115,7 +124,7 @@ pub(super) fn build_admin_usage_detail_payload(
auth_api_key_reader_available: bool,
provider_key_name: Option<&str>,
include_bodies: bool,
request_body: Value,
request_body: Option<Value>,
default_headers: &BTreeMap<String, String>,
) -> Value {
aether_admin::observability::usage::build_admin_usage_detail_payload(
@@ -136,7 +145,7 @@ pub(super) fn build_admin_usage_replay_plan_response(
target_provider: &aether_data_contracts::repository::provider_catalog::StoredProviderCatalogProvider,
target_endpoint: &StoredProviderCatalogEndpoint,
target_api_key_id: Option<String>,
request_body: Value,
request_body: Option<Value>,
url: &str,
headers: &BTreeMap<String, String>,
same_provider: bool,
@@ -306,7 +315,7 @@ pub(super) async fn build_admin_usage_replay_response(
let same_provider = item.provider_id.as_deref() == Some(target_provider.id.as_str());
let same_endpoint = item.provider_endpoint_id.as_deref() == Some(target_endpoint.id.as_str());
let request_body =
admin_usage_resolve_request_preview_body_for_item(state, &item, payload.body_override)
admin_usage_resolve_request_capture_body_for_item(state, &item, payload.body_override)
.await?;
let url = admin_usage_curl_url(state, &target_endpoint, &item);