EngineX-Hygon/sglang
5
0
Fork 0
Code Issues Pull Requests Actions 7 Projects Releases Wiki Activity

[router] fix logger ordering git ctx (#10457)

Browse Source
This commit is contained in:
Chang Su
2025-09-14 21:37:21 -07:00
committed by GitHub
parent 957482c8f2
commit 69b35793a0
2 changed files with 29 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
sgl-router/src/middleware.rs
View File

@@ -113,38 +113,14 @@ where
let request_id = request_id.unwrap_or_else(|| generate_request_id(req.uri().path()));
// Insert request ID into request extensions
// Insert request ID into request extensions for other middleware/handlers to use
req.extensions_mut().insert(RequestId(request_id.clone()));
// Create a span with the request ID for this request
let span = tracing::info_span!(
"http_request",
method = %req.method(),
uri = %req.uri(),
version = ?req.version(),
request_id = %request_id
);
// Log within the span
let _enter = span.enter();
tracing::info!(
target: "sglang_router_rs::request",
"started processing request"
);
drop(_enter);
// Capture values we need in the async block
let method = req.method().clone();
let uri = req.uri().clone();
let version = req.version();
// Call the inner service
let future = self.inner.call(req);
Box::pin(async move {
let start_time = Instant::now();
let mut response = future.await?;
let latency = start_time.elapsed();
// Add request ID to response headers
response.headers_mut().insert(
@@ -153,36 +129,6 @@ where
.unwrap_or_else(|_| HeaderValue::from_static("invalid-request-id")),
);
// Log the response with proper request ID in span
let status = response.status();
let span = tracing::info_span!(
"http_request",
method = %method,
uri = %uri,
version = ?version,
request_id = %request_id,
status = %status,
latency = ?latency
);
let _enter = span.enter();
if status.is_server_error() {
tracing::error!(
target: "sglang_router_rs::response",
"request failed with server error"
);
} else if status.is_client_error() {
tracing::warn!(
target: "sglang_router_rs::response",
"request failed with client error"
);
} else {
tracing::info!(
target: "sglang_router_rs::response",
"finished processing request"
);
}
Ok(response)
})
}
@@ -225,7 +171,11 @@ impl<B> OnRequest<B> for RequestLogger {
span.record("request_id", request_id.0.as_str());
}
// Don't log here - we already log in RequestIdService with the proper request_id
// Log the request start
info!(
target: "sglang_router_rs::request",
"started processing request"
);
}
}
@@ -251,7 +201,24 @@ impl<B> OnResponse<B> for ResponseLogger {
span.record("status_code", status.as_u16());
span.record("latency", format!("{:?}", latency));
// Don't log here - RequestIdService handles all logging with proper request IDs
// Log the response completion
let _enter = span.enter();
if status.is_server_error() {
error!(
target: "sglang_router_rs::response",
"request failed with server error"
);
} else if status.is_client_error() {
warn!(
target: "sglang_router_rs::response",
"request failed with client error"
);
} else {
info!(
target: "sglang_router_rs::response",
"finished processing request"
);
}
}
}

9
sgl-router/src/server.rs
View File

@@ -525,11 +525,12 @@ pub fn build_app(
.layer(tower_http::limit::RequestBodyLimitLayer::new(
max_payload_size,
))
// Request ID layer - must be added AFTER logging layer in the code
// so it executes BEFORE logging layer at runtime (layers execute bottom-up)
.layer(crate::middleware::RequestIdLayer::new(request_id_headers))
// Custom logging layer that can now see request IDs from extensions
// Logging layer - must be added BEFORE request ID layer in the code
// so it executes AFTER request ID layer at runtime (layers execute bottom-up)
// This way the TraceLayer can see the request ID that was added to extensions
.layer(crate::middleware::create_logging_layer())
// Request ID layer - adds request ID to extensions first
.layer(crate::middleware::RequestIdLayer::new(request_id_headers))
// CORS (should be outermost)
.layer(create_cors_layer(cors_allowed_origins))
// Fallback