Skip to content

Commit c548047

Browse files
committed
fix(proxy): correlate upstream failures with request IDs
Record the response request ID in the HTTP upstream-failure event so operators can match client errors to structured and shorthand logs. Cover supplied and absent IDs in the existing event schema test. Signed-off-by: Shiju <shiju@nvidia.com>
1 parent df8a127 commit c548047

2 files changed

Lines changed: 16 additions & 1 deletion

File tree

‎crates/openshell-supervisor-network/src/l7/relay.rs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,7 @@ where
826826
fn build_upstream_http_failure_event(
827827
ctx: &L7EvalContext,
828828
method: &str,
829+
request_id: Option<&str>,
829830
response_code: Option<u16>,
830831
) -> openshell_ocsf::OcsfEvent {
831832
let mut event = HttpActivityBuilder::new(openshell_ocsf::ctx::ctx())
@@ -838,6 +839,9 @@ fn build_upstream_http_failure_event(
838839
.dst_endpoint(Endpoint::from_domain(&ctx.host, ctx.port))
839840
.message("HTTP upstream connection closed or failed")
840841
.status_detail("upstream_http_transport_failure");
842+
if let Some(request_id) = request_id {
843+
event = event.unmapped("request_id", request_id);
844+
}
841845
if let Some(code) = response_code {
842846
event = event.http_response(openshell_ocsf::HttpResponse { code });
843847
}
@@ -869,6 +873,7 @@ where
869873
egress_emit!(build_upstream_http_failure_event(
870874
ctx,
871875
method,
876+
request_id,
872877
response_code
873878
));
874879
delivery

‎crates/openshell-supervisor-network/src/l7/relay/upstream_close_tests.rs‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,17 +236,27 @@ async fn client_body_eof_is_not_an_upstream_failure() {
236236

237237
#[test]
238238
fn upstream_failure_event_reports_502_without_request_secrets() {
239-
for response_started in [false, true] {
239+
let request_id = "9b8a7f6e-5d4c-4b3a-9f8e-7d6c5b4a3f2e";
240+
for (response_started, request_id) in [
241+
(false, Some(request_id)),
242+
(true, Some(request_id)),
243+
(false, None),
244+
] {
240245
let event = build_upstream_http_failure_event(
241246
&context(),
242247
"POST",
248+
request_id,
243249
(!response_started).then_some(502),
244250
);
245251
let json = event.to_json().unwrap();
246252
assert_eq!(json["class_uid"], 4002);
247253
assert_eq!(json["status_detail"], "upstream_http_transport_failure");
248254
assert_eq!(json["http_request"]["http_method"], "POST");
249255
assert!(json["http_request"].get("url").is_none());
256+
assert_eq!(
257+
json["unmapped"].get("request_id"),
258+
request_id.map(serde_json::Value::from).as_ref()
259+
);
250260
if response_started {
251261
assert!(json.get("http_response").is_none());
252262
} else {

0 commit comments

Comments
 (0)