xevion/xevion.dev
1
0
Fork 0
mirror of https://github.com/Xevion/xevion.dev.git synced 2026-01-31 10:26:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat: add request ID propagation from Rust to Bun with structured logging

Browse Source 
- Forward x-request-id header through proxy and API calls
- Store RequestId in request extensions for downstream access
- Add AsyncLocalStorage context to correlate logs across async boundaries
- Improve migration logging to show pending changes before applying
- Reduce noise in logs (common OG images, health checks)
This commit is contained in:
Xevion
2026-01-13 16:42:14 -06:00
parent 6d8766d3a6
commit a6cc0b8e66
13 changed files with 173 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cache.rs
+2 -1
View File
@@ -188,8 +188,9 @@ impl IsrCache {
/// Invalidate all cached entries
pub async fn invalidate_all(&self) {
let previous_count = self.cache.entry_count();
self.cache.invalidate_all();
tracing::info!("All cache entries invalidated");
tracing::info!(previous_count, "All cache entries invalidated");
}
/// Get cache statistics
src/main.rs
+35 -6
View File
@@ -1,8 +1,9 @@
use clap::Parser;
use std::collections::HashSet;
use std::net::SocketAddr;
use std::sync::Arc;
use std::time::Duration;
use tower_http::{cors::CorsLayer, limit::RequestBodyLimitLayer, trace::TraceLayer};
use tower_http::{cors::CorsLayer, limit::RequestBodyLimitLayer};
use tracing_subscriber::{EnvFilter, layer::SubscriberExt, util::SubscriberInitExt};
mod assets;
@@ -87,14 +88,43 @@ async fn main() {
.await
.expect("Failed to connect to database");
// Run migrations on startup
tracing::info!("Running database migrations");
sqlx::migrate!().run(&pool).await.unwrap_or_else(|e| {
// Check and run migrations on startup
let migrator = sqlx::migrate!();
// Query applied migrations directly from the database
let applied_versions: HashSet<i64> =
sqlx::query_scalar::<_, i64>("SELECT version FROM _sqlx_migrations ORDER BY version")
.fetch_all(&pool)
.await
.unwrap_or_default()
.into_iter()
.collect();
let pending: Vec<_> = migrator
.iter()
.filter(|m| !m.migration_type.is_down_migration())
.filter(|m| !applied_versions.contains(&m.version))
.map(|m| m.description.as_ref())
.collect();
if pending.is_empty() {
let last_version = applied_versions.iter().max();
let last_name = last_version
.and_then(|v| migrator.iter().find(|m| m.version == *v))
.map(|m| m.description.as_ref());
tracing::debug!(last_migration = ?last_name, "Database schema is current");
} else {
tracing::warn!(migrations = ?pending, "Pending database migrations");
}
migrator.run(&pool).await.unwrap_or_else(|e| {
tracing::error!(error = %e, "Migration failed");
std::process::exit(1);
});
tracing::info!("Migrations applied successfully");
if !pending.is_empty() {
tracing::info!(count = pending.len(), "Migrations applied");
}
// Ensure admin user exists
auth::ensure_admin_user(&pool)
@@ -188,7 +218,6 @@ async fn main() {
trust_request_id: Option<String>,
) -> axum::Router<Arc<AppState>> {
router
.layer(TraceLayer::new_for_http())
.layer(RequestIdLayer::new(trust_request_id))
.layer(CorsLayer::permissive())
.layer(RequestBodyLimitLayer::new(1_048_576))
src/middleware/mod.rs
+1 -1
View File
@@ -1,3 +1,3 @@
pub mod request_id;
pub use request_id::RequestIdLayer;
pub use request_id::{RequestId, RequestIdLayer};
src/middleware/request_id.rs
+39 -2
View File
@@ -1,7 +1,12 @@
use axum::{body::Body, extract::Request, http::HeaderName, response::Response};
use std::task::{Context, Poll};
use std::time::Instant;
use tower::{Layer, Service};
/// Request ID stored in request extensions for downstream access
#[derive(Clone)]
pub struct RequestId(pub String);
#[derive(Clone)]
pub struct RequestIdLayer {
trust_header: Option<HeaderName>,
@@ -36,6 +41,7 @@ impl<S> Service<Request> for RequestIdService<S>
where
S: Service<Request, Response = Response<Body>> + Send + 'static,
S::Future: Send + 'static,
S::Error: std::fmt::Debug,
{
type Response = S::Response;
type Error = S::Error;
@@ -47,7 +53,7 @@ where
self.inner.poll_ready(cx)
}
fn call(&mut self, req: Request) -> Self::Future {
fn call(&mut self, mut req: Request) -> Self::Future {
let req_id = self
.trust_header
.as_ref()
@@ -61,13 +67,44 @@ where
let span = tracing::info_span!("request", req_id = %req_id);
let _enter = span.enter();
let method = req.method().clone();
let path = req.uri().path().to_string();
let start = Instant::now();
tracing::debug!(method = %method, path = %path, "Request");
// Store request ID in extensions for downstream use (e.g., proxying to Bun)
req.extensions_mut().insert(RequestId(req_id));
let span_clone = span.clone();
let future = self.inner.call(req);
Box::pin(async move {
let _enter = span_clone.enter();
future.await
let result = future.await;
let duration_ms = start.elapsed().as_millis() as u64;
match &result {
Ok(response) => {
let status = response.status();
match status.as_u16() {
200..=399 => {
tracing::debug!(status = status.as_u16(), duration_ms, "Response")
}
400..=499 => {
tracing::info!(status = status.as_u16(), duration_ms, "Response")
}
_ => tracing::warn!(status = status.as_u16(), duration_ms, "Response"),
}
}
Err(e) => {
tracing::error!(error = ?e, duration_ms, "Request failed");
}
}
result
})
}
}
src/og.rs
+8 -8
View File
@@ -89,19 +89,19 @@ pub async fn regenerate_common_images(state: Arc<AppState>) {
// Wait 2 seconds before starting
tokio::time::sleep(Duration::from_secs(2)).await;
tracing::info!("Ensuring common OG images exist");
tracing::debug!("Checking common OG images");
let specs = vec![OGImageSpec::Index, OGImageSpec::Projects];
for spec in specs {
match ensure_og_image(&spec, state.clone()).await {
Ok(()) => {
tracing::info!(r2_key = spec.r2_key(), "Common OG image ready");
}
let mut ready = Vec::new();
for spec in &specs {
match ensure_og_image(spec, state.clone()).await {
Ok(()) => ready.push(spec.r2_key()),
Err(e) => {
tracing::error!(r2_key = spec.r2_key(), error = %e, "Failed to ensure OG image");
tracing::error!(r2_key = spec.r2_key(), error = %e, "OG image failed");
}
}
}
tracing::info!("Finished ensuring common OG images");
tracing::info!(images = ?ready, "Common OG images ready");
}
src/proxy.rs
+9 -3
View File
@@ -15,7 +15,6 @@ use crate::{
};
/// ISR handler - serves pages through Bun SSR with caching and session validation
#[tracing::instrument(skip(state, req), fields(path = %req.uri().path(), method = %req.method()))]
pub async fn isr_handler(State(state): State<Arc<AppState>>, req: Request) -> Response {
let method = req.method().clone();
let uri = req.uri();
@@ -69,7 +68,7 @@ pub async fn isr_handler(State(state): State<Arc<AppState>>, req: Request) -> Re
let is_head = method == axum::http::Method::HEAD;
if path.starts_with("/api/") {
tracing::error!("API request reached ISR handler - routing bug!");
tracing::error!(path = %path, "API request reached ISR handler - routing bug");
return (StatusCode::INTERNAL_SERVER_ERROR, "Internal routing error").into_response();
}
@@ -104,6 +103,13 @@ pub async fn isr_handler(State(state): State<Arc<AppState>>, req: Request) -> Re
let mut forward_headers = HeaderMap::new();
let mut is_authenticated = false;
// Forward request ID to Bun (set by RequestIdLayer)
if let Some(request_id) = req.extensions().get::<crate::middleware::RequestId>() {
if let Ok(header_value) = axum::http::HeaderValue::from_str(&request_id.0) {
forward_headers.insert("x-request-id", header_value);
}
}
// SECURITY: Strip any X-Session-User header from incoming request to prevent spoofing
// Extract and validate session from cookie
@@ -382,7 +388,7 @@ pub async fn perform_health_check(
false
}
Err(_) => {
tracing::error!("Health check failed: timeout after 5s");
tracing::error!(timeout_sec = 5, "Health check timed out");
false
}
};