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

Record per-candidate upstream error bodies

Browse Source
This commit is contained in:
fawney19
2026-05-11 02:30:45 +08:00
parent e3574e1918
commit ef4cc55c9a
8 changed files with 170 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/aether-gateway/src/execution_runtime/stream/execution.rs
View File

@@ -83,11 +83,11 @@ use crate::execution_runtime::{
use crate::execution_runtime::{MAX_STREAM_PREFETCH_BYTES, MAX_STREAM_PREFETCH_FRAMES};
use crate::log_ids::short_request_id;
use crate::orchestration::{
apply_local_execution_effect, build_local_error_flow_metadata, with_error_flow_report_context,
with_upstream_response_report_context, LocalAdaptiveRateLimitEffect,
LocalAdaptiveSuccessEffect, LocalAttemptFailureEffect, LocalExecutionEffect,
LocalExecutionEffectContext, LocalHealthFailureEffect, LocalHealthSuccessEffect,
LocalOAuthInvalidationEffect, LocalPoolErrorEffect,
apply_local_execution_effect, build_local_error_flow_metadata, trace_upstream_response_body,
with_error_flow_report_context, with_upstream_response_report_context,
LocalAdaptiveRateLimitEffect, LocalAdaptiveSuccessEffect, LocalAttemptFailureEffect,
LocalExecutionEffect, LocalExecutionEffectContext, LocalHealthFailureEffect,
LocalHealthSuccessEffect, LocalOAuthInvalidationEffect, LocalPoolErrorEffect,
};
use crate::request_candidate_runtime::{
ensure_execution_request_candidate_slot, record_local_request_candidate_status,
@@ -254,14 +254,17 @@ fn with_stream_error_trace_context(
report_context: Option<&Value>,
status_code: u16,
headers: &BTreeMap<String, String>,
body_json: Option<&Value>,
body_bytes: &[u8],
response_text: Option<&str>,
local_failover_analysis: crate::orchestration::LocalFailoverAnalysis,
) -> Option<Value> {
let body = trace_upstream_response_body(body_json, body_bytes);
let upstream_context = with_upstream_response_report_context(
report_context,
status_code,
Some(headers),
None,
body.as_ref(),
None,
None,
);
@@ -1287,6 +1290,8 @@ async fn execute_stream_from_frame_stream(
report_context.as_ref(),
status_code,
&headers,
provider_body_json.as_ref(),
&provider_error_body,
error_response_text.as_deref(),
failover_analysis,
);
@@ -1337,6 +1342,8 @@ async fn execute_stream_from_frame_stream(
report_context.as_ref(),
status_code,
&headers,
provider_body_json.as_ref(),
&provider_error_body,
error_response_text.as_deref(),
failover_analysis,
);
@@ -1385,6 +1392,8 @@ async fn execute_stream_from_frame_stream(
report_context.as_ref(),
status_code,
&headers,
provider_body_json.as_ref(),
&provider_error_body,
error_response_text.as_deref(),
failover_analysis,
);

10
apps/aether-gateway/src/execution_runtime/stream/execution_failures.rs
View File

@@ -20,9 +20,10 @@ use crate::execution_runtime::submission::{
use crate::log_ids::short_request_id;
use crate::orchestration::{
apply_local_execution_effect, resolve_local_failover_analysis_for_attempt,
with_upstream_response_report_context, LocalAdaptiveRateLimitEffect, LocalAttemptFailureEffect,
LocalExecutionEffect, LocalExecutionEffectContext, LocalHealthFailureEffect,
LocalOAuthInvalidationEffect, LocalPoolErrorEffect,
trace_upstream_response_body, with_upstream_response_report_context,
LocalAdaptiveRateLimitEffect, LocalAttemptFailureEffect, LocalExecutionEffect,
LocalExecutionEffectContext, LocalHealthFailureEffect, LocalOAuthInvalidationEffect,
LocalPoolErrorEffect,
};
use crate::request_candidate_runtime::record_report_request_candidate_status;
use crate::usage::submit_sync_report;
@@ -135,11 +136,12 @@ fn build_stream_failure_sync_payload(
failure: StreamFailureReport,
) -> GatewaySyncReportRequest {
let status_code = failure.status_code;
let body = trace_upstream_response_body(None, provider_buffered_body);
let report_context = with_upstream_response_report_context(
report_context.as_ref(),
status_code,
Some(&headers),
None,
body.as_ref(),
None,
None,
)

21
apps/aether-gateway/src/execution_runtime/sync/execution.rs
View File

@@ -53,11 +53,11 @@ use crate::execution_runtime::{
};
use crate::log_ids::short_request_id;
use crate::orchestration::{
apply_local_execution_effect, build_local_error_flow_metadata, with_error_flow_report_context,
with_upstream_response_report_context, LocalAdaptiveRateLimitEffect,
LocalAdaptiveSuccessEffect, LocalAttemptFailureEffect, LocalExecutionEffect,
LocalExecutionEffectContext, LocalHealthFailureEffect, LocalHealthSuccessEffect,
LocalOAuthInvalidationEffect, LocalPoolErrorEffect,
apply_local_execution_effect, build_local_error_flow_metadata, trace_upstream_response_body,
with_error_flow_report_context, with_upstream_response_report_context,
LocalAdaptiveRateLimitEffect, LocalAdaptiveSuccessEffect, LocalAttemptFailureEffect,
LocalExecutionEffect, LocalExecutionEffectContext, LocalHealthFailureEffect,
LocalHealthSuccessEffect, LocalOAuthInvalidationEffect, LocalPoolErrorEffect,
};
use crate::request_candidate_runtime::{
ensure_execution_request_candidate_slot, record_local_request_candidate_extra_data,
@@ -139,14 +139,17 @@ fn with_sync_error_trace_context(
report_context: Option<&serde_json::Value>,
status_code: u16,
headers: &BTreeMap<String, String>,
body_json: Option<&serde_json::Value>,
body_bytes: &[u8],
response_text: Option<&str>,
local_failover_analysis: crate::orchestration::LocalFailoverAnalysis,
) -> Option<serde_json::Value> {
let body = trace_upstream_response_body(body_json, body_bytes);
let upstream_context = with_upstream_response_report_context(
report_context,
status_code,
Some(headers),
None,
body.as_ref(),
None,
None,
);
@@ -1481,6 +1484,8 @@ async fn execute_execution_runtime_sync_impl(
report_context.as_ref(),
result.status_code,
&headers,
body_json.as_ref(),
&body_bytes,
local_failover_response_text.as_deref(),
local_failover_analysis,
);
@@ -1557,6 +1562,8 @@ async fn execute_execution_runtime_sync_impl(
report_context.as_ref(),
result.status_code,
&headers,
body_json.as_ref(),
&body_bytes,
local_failover_response_text.as_deref(),
local_failover_analysis,
);
@@ -1587,6 +1594,8 @@ async fn execute_execution_runtime_sync_impl(
report_context.as_ref(),
result.status_code,
&headers,
body_json.as_ref(),
&body_bytes,
local_failover_response_text.as_deref(),
local_failover_analysis,
)