Refactor: Pass ServerTiming to extract_request_info

Co-authored-by: contact <[email protected]>

Author: cursoragent

src/webserver/http_request_info.rs

@@ -288,7 +288,8 @@ mod test {
             serde_json::from_str::<AppConfig>(r#"{"listen_on": "localhost:1234"}"#).unwrap();
         let mut service_request = TestRequest::default().to_srv_request();
         let app_data = Arc::new(AppState::init(&config).await.unwrap());
-        let request_info = extract_request_info(&mut service_request, app_data)
+        let server_timing = super::server_timing::ServerTiming::new(false);
+        let request_info = extract_request_info(&mut service_request, app_data, server_timing)
             .await
             .unwrap();
         assert_eq!(request_info.post_variables.len(), 0);
@@ -306,7 +307,8 @@ mod test {
             .set_payload("my_array[]=3&my_array[]=Hello%20World&repeated=1&repeated=2")
             .to_srv_request();
         let app_data = Arc::new(AppState::init(&config).await.unwrap());
-        let request_info = extract_request_info(&mut service_request, app_data)
+        let server_timing = super::server_timing::ServerTiming::new(false);
+        let request_info = extract_request_info(&mut service_request, app_data, server_timing)
             .await
             .unwrap();
         assert_eq!(
@@ -355,7 +357,8 @@ mod test {
             )
             .to_srv_request();
         let app_data = Arc::new(AppState::init(&config).await.unwrap());
-        let request_info = extract_request_info(&mut service_request, app_data)
+        let server_timing = super::server_timing::ServerTiming::new(false);
+        let request_info = extract_request_info(&mut service_request, app_data, server_timing)
             .await
             .unwrap();
         assert_eq!(

src/webserver/server_timing.rs

@@ -1,3 +1,4 @@
+use std::fmt::Write;
 use std::time::Instant;
 
 #[derive(Debug, Clone)]
@@ -28,8 +29,7 @@ impl ServerTiming {
         if !self.header.is_empty() {
             self.header.push_str(", ");
         }
-        use std::fmt::Write;
-        write!(&mut self.header, "{};dur={:.2}", name, duration_ms).unwrap();
+        write!(&mut self.header, "{name};dur={duration_ms:.2}").unwrap();
     }
 
     #[must_use]

tests/server_timing/mod.rs

@@ -9,10 +9,12 @@ async fn test_server_timing_disabled_in_production() -> actix_web::Result<()> {
     config.environment = sqlpage::app_config::DevOrProd::Production;
     let app_data = make_app_data_from_config(config).await;
 
-    let req =
-        crate::common::get_request_to_with_data("/tests/server_timing/simple_query.sql", app_data)
-            .await?
-            .to_srv_request();
+    let req = crate::common::get_request_to_with_data(
+        "/tests/sql_test_files/it_works_simple.sql",
+        app_data,
+    )
+    .await?
+    .to_srv_request();
     let resp = main_handler(req).await?;
 
     assert_eq!(resp.status(), StatusCode::OK);
@@ -29,10 +31,12 @@ async fn test_server_timing_enabled_in_development() -> actix_web::Result<()> {
     config.environment = sqlpage::app_config::DevOrProd::Development;
     let app_data = make_app_data_from_config(config).await;
 
-    let req =
-        crate::common::get_request_to_with_data("/tests/server_timing/simple_query.sql", app_data)
-            .await?
-            .to_srv_request();
+    let req = crate::common::get_request_to_with_data(
+        "/tests/sql_test_files/it_works_simple.sql",
+        app_data,
+    )
+    .await?
+    .to_srv_request();
     let resp = main_handler(req).await?;
 
     assert_eq!(resp.status(), StatusCode::OK);
@@ -68,7 +72,7 @@ async fn test_server_timing_enabled_in_development() -> actix_web::Result<()> {
 
 #[actix_web::test]
 async fn test_server_timing_format() -> actix_web::Result<()> {
-    let req = get_request_to("/tests/server_timing/simple_query.sql")
+    let req = get_request_to("/tests/sql_test_files/it_works_simple.sql")
         .await?
         .to_srv_request();
     let resp = main_handler(req).await?;