v0.25.3

src/proxy/upstream_helpers.rs

@@ -1,3 +1,16 @@
+fn request_id_hash(sequence: u64) -> String {
+    use rand::RngCore;
+    use sha2::{Digest, Sha256};
+
+    let mut nonce = [0u8; 32];
+    let mut rng = rand::rngs::OsRng;
+    rng.fill_bytes(&mut nonce);
+    let mut hash = Sha256::new();
+    hash.update(sequence.to_be_bytes());
+    hash.update(nonce);
+    format!("{:x}", hash.finalize())
+}
+
 async fn observe(State(state): State<Arc<App>>, mut request: Request, next: Next) -> Response {
     let snapshot = state.config.load_full();
     let (frontend_context, route_context) = response_context(&snapshot, &request);
@@ -32,6 +45,7 @@ async fn observe(State(state): State<Arc<App>>, mut request: Request, next: Next
         state.metrics.http3_requests.fetch_add(1, Ordering::Relaxed);
     }
     let id = state.metrics.requests.fetch_add(1, Ordering::Relaxed) + 1;
+    let request_id = request_id_hash(id);
     if let Some(frontend) = &frontend_context {
         frontend.metrics.requests.fetch_add(1, Ordering::Relaxed);
     }
@@ -70,7 +84,7 @@ async fn observe(State(state): State<Arc<App>>, mut request: Request, next: Next
             frontend_context.as_deref(),
             local,
             transport_tls,
-            id,
+            &request_id,
             &state.active_listeners,
         );
         return response;
@@ -118,6 +132,7 @@ async fn observe(State(state): State<Arc<App>>, mut request: Request, next: Next
         transform_effective_enabled: Mutex::new(None),
         backend: Mutex::new(None),
         id,
+        request_id: request_id.clone(),
         method: request.method().to_string(),
         host,
         path: request.uri().path().chars().take(256).collect(),
@@ -148,7 +163,7 @@ async fn observe(State(state): State<Arc<App>>, mut request: Request, next: Next
         traffic: state.traffic.clone(),
         _permit: permit,
     });
-    if let Ok(value) = HeaderValue::from_str(&id.to_string()) {
+    if let Ok(value) = HeaderValue::from_str(&request_id) {
         request.headers_mut().insert("x-request-id", value);
     }
     request.extensions_mut().insert(exchange.clone());
@@ -223,7 +238,7 @@ async fn observe(State(state): State<Arc<App>>, mut request: Request, next: Next
             frontend_context.as_deref(),
             local,
             transport_tls,
-            id,
+            &request_id,
             &state.active_listeners,
         );
         if response.extensions().get::<RedirectResponse>().is_some_and(|redirect| !redirect.http3_enabled) {