remove TimingRecorder, as we can now use metrics

Author: pietroalbini

src/controllers.rs

@@ -19,7 +19,6 @@ mod prelude {
 
     pub use crate::db::RequestTransaction;
     pub use crate::middleware::app::RequestApp;
-    pub use crate::middleware::log_request::TimingRecorder;
     pub use crate::util::errors::{cargo_err, AppError, AppResult, ChainError}; // TODO: Remove cargo_err from here
     pub use crate::util::{AppResponse, EndpointResult};
 
@@ -39,7 +38,6 @@ mod prelude {
         fn query_with_params(&self, params: IndexMap<String, String>) -> String;
 
         fn log_metadata<V: std::fmt::Display>(&mut self, key: &'static str, value: V);
-        fn timing_recorder(&mut self) -> TimingRecorder;
     }
 
     impl<'a> RequestUtils for dyn RequestExt + 'a {
@@ -80,17 +78,6 @@ mod prelude {
         fn log_metadata<V: std::fmt::Display>(&mut self, key: &'static str, value: V) {
             crate::middleware::log_request::add_custom_metadata(self, key, value);
         }
-
-        fn timing_recorder(&mut self) -> TimingRecorder {
-            if let Some(recorder) = self.extensions().find::<TimingRecorder>() {
-                recorder.clone()
-            } else {
-                let recorder = TimingRecorder::new();
-                self.mut_extensions()
-                    .insert::<TimingRecorder>(recorder.clone());
-                recorder
-            }
-        }
     }
 }
 

src/middleware/log_request.rs

@@ -8,11 +8,8 @@ use conduit::{header, Host, RequestExt, Scheme, StatusCode};
 use conduit_cookie::RequestSession;
 use sentry::Level;
 
-use std::cell::RefCell;
-use std::collections::HashMap;
 use std::fmt::{self, Display, Formatter};
-use std::rc::Rc;
-use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
+use std::time::{SystemTime, UNIX_EPOCH};
 
 const SLOW_REQUEST_THRESHOLD_MS: u64 = 1000;
 
@@ -94,34 +91,6 @@ pub fn add_custom_metadata<V: Display>(req: &mut dyn RequestExt, key: &'static s
     }
 }
 
-#[derive(Debug, Clone)]
-pub struct TimingRecorder {
-    sections: Rc<RefCell<HashMap<&'static str, Duration>>>,
-}
-
-impl TimingRecorder {
-    pub fn new() -> Self {
-        Self {
-            sections: Rc::new(RefCell::new(HashMap::new())),
-        }
-    }
-
-    pub fn record<R>(&self, name: &'static str, f: impl FnOnce() -> R) -> R {
-        let start = Instant::now();
-        let res = f();
-        self.sections
-            .borrow_mut()
-            .insert(name, Instant::now() - start);
-        res
-    }
-}
-
-impl Default for TimingRecorder {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 fn report_to_sentry(req: &dyn RequestExt, res: &AfterResult, response_time: u64) {
     let (message, level) = match res {
         Err(e) => (e.to_string(), Level::Error),
@@ -255,17 +224,6 @@ impl Display for RequestLine<'_> {
 
         if self.response_time > SLOW_REQUEST_THRESHOLD_MS {
             line.add_marker("SLOW REQUEST")?;
-
-            if let Some(timings) = self.req.extensions().find::<TimingRecorder>() {
-                for (section, duration) in timings.sections.borrow().iter() {
-                    line.add_quoted_field(
-                        format!("timing_{}", section),
-                        // Debug formatting rounds the duration to the most useful unit and adds
-                        // the unit suffix. For example: 1.20s, 10.00ms, 8.35ns
-                        format!("{:.2?}", duration),
-                    )?;
-                }
-            }
         }
 
         Ok(())