Switchyard lets LLM applications route traffic across models and providers while preserving native OpenAI and Anthropic API compatibility - enabling flexible model selection, benchmarking, and cost/performance optimization.
Rust
fix(server): omit absent request-log ids instead of logging them empty (#633)
chethanuk396b40c8430d
diff --git a/crates/switchyard-server/src/lib.rs b/crates/switchyard-server/src/lib.rsindex 4fed60a30..b27dc20b0 100644--- a/crates/switchyard-server/src/lib.rs+++ b/crates/switchyard-server/src/lib.rs@@ -1215,8 +1215,8 @@ impl RequestLogContext {requested_model = self.requested_model.as_deref().unwrap_or(""),selected_model,streaming = self.streaming,- session_id = self.session_id.as_deref().unwrap_or(""),- correlation_id = self.correlation_id.as_deref().unwrap_or(""),+ session_id = self.session_id.as_deref(),+ correlation_id = self.correlation_id.as_deref(),handling_duration_ms = duration_ms,error,$message@@ -1243,8 +1243,8 @@ impl RequestLogContext {requested_model = self.requested_model.as_deref().unwrap_or(""),selected_model = "",streaming = self.streaming,- session_id = self.session_id.as_deref().unwrap_or(""),- correlation_id = self.correlation_id.as_deref().unwrap_or(""),+ session_id = self.session_id.as_deref(),+ correlation_id = self.correlation_id.as_deref(),handling_duration_ms = self.started.elapsed().as_secs_f64() * 1_000.0,error = "client disconnected before a response was written","LLM request cancelled"@@ -2044,7 +2044,12 @@ targets = ["only"]// Collects the terminal request events emitted while it is the active subscriber.#[derive(Clone, Default)]- struct CapturedEvents(Arc<Mutex<Vec<(Level, String)>>>);+ struct CapturedEvents(Arc<Mutex<Vec<CapturedEvent>>>);++ struct CapturedEvent {+ level: Level,+ message: String,+ }impl tracing_subscriber::Layer<tracing_subscriber::Registry> for CapturedEvents {fn on_event(@@ -2061,7 +2066,10 @@ targets = ["only"]message.push_str(&format!("{}={value:?} ", field.name()));},);- self.0.lock().push((*event.metadata().level(), message));+ self.0.lock().push(CapturedEvent {+ level: *event.metadata().level(),+ message,+ });}}@@ -2076,13 +2084,13 @@ targets = ["only"]}}- fn captured_events(run: impl FnOnce()) -> Vec<(Level, String)> {+ fn captured_events(run: impl FnOnce()) -> Vec<CapturedEvent> {use tracing_subscriber::layer::SubscriberExt;let captured = CapturedEvents::default();let subscriber = tracing_subscriber::registry().with(captured.clone());crate::testing::with_subscriber(subscriber, run);- captured.0.lock().clone()+ std::mem::take(&mut *captured.0.lock())}// A dropped handler future is the only trace an abandoned buffered request leaves,@@ -2094,8 +2102,12 @@ targets = ["only"]});assert_eq!(events.len(), 1);- assert_eq!(events[0].0, Level::WARN);- assert!(events[0].1.contains("cancelled"), "{:?}", events[0].1);+ assert_eq!(events[0].level, Level::WARN);+ assert!(+ events[0].message.contains("cancelled"),+ "{:?}",+ events[0].message+ );}// A request that reached a response is not a cancellation, even though the guard@@ -2108,8 +2120,49 @@ targets = ["only"]});assert_eq!(events.len(), 1);- assert_eq!(events[0].0, Level::INFO);- assert!(events[0].1.contains("handled"), "{:?}", events[0].1);+ assert_eq!(events[0].level, Level::INFO);+ assert!(+ events[0].message.contains("handled"),+ "{:?}",+ events[0].message+ );+ }++ // An operator has to be able to tell "no session was sent" from "a blank one was+ // sent": an absent id omits the field, an empty one records an empty value.+ #[test]+ fn request_log_distinguishes_absent_ids_from_empty_ones() {+ let rows = [+ (None, None),+ (Some(String::new()), Some("\"\"")),+ (Some("abc".to_string()), Some("\"abc\"")),+ ];++ for (id, expected) in rows {+ let context = || {+ let mut context = request_log_context();+ context.session_id = id.clone();+ context.correlation_id = id.clone();+ context+ };++ let answered = captured_events(|| {+ let mut guard = RequestLogGuard(Some(context()));+ guard.emit(&StatusCode::OK.into_response());+ });+ let cancelled = captured_events(|| drop(RequestLogGuard(Some(context()))));++ for events in [answered, cancelled] {+ assert_eq!(events.len(), 1);+ for field in ["session_id", "correlation_id"] {+ let rendered = events[0]+ .message+ .split_whitespace()+ .find_map(|part| part.strip_prefix(&format!("{field}=")));+ assert_eq!(rendered, expected, "{field} {id:?}: {}", events[0].message);+ }+ }+ }}// Terminal request severity follows HTTP status instead of error-path bookkeeping.@@ -2161,8 +2214,12 @@ targets = ["only"]let response = render_error_response(client_error(&error), wire_format);let events = captured_events(|| request_log_context().emit(&response));assert_eq!(events.len(), 1);- assert!(!events[0].1.contains(LEAKED), "{}", events[0].1);- assert!(events[0].1.contains("upstream_error"), "{}", events[0].1);+ assert!(!events[0].message.contains(LEAKED), "{}", events[0].message);+ assert!(+ events[0].message.contains("upstream_error"),+ "{}",+ events[0].message+ );let api_error = response.extensions().get::<ApiError>()