fix(apm): Return the correct time (#400)

* fix(apm): Return the correct time * fix lint * add test * fix lint * fix ci * fix lint
nervosnetwork · Aug 6, 2020 · fd6549a · fd6549a
1 parent f951a95
commit fd6549a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/common/apm/src/lib.rs b/common/apm/src/lib.rs
@@ -1,3 +1,6 @@
+// https://rust-lang.github.io/rust-clippy/master/index.html#float_cmp
+#![allow(clippy::float_cmp)]
+
 pub mod metrics;
 
 pub use muta_apm;

diff --git a/common/apm/src/metrics.rs b/common/apm/src/metrics.rs
@@ -40,7 +40,7 @@ impl From<Error> for ProtocolError {
 impl std::error::Error for Error {}
 
 pub fn duration_to_sec(d: Duration) -> f64 {
-    d.as_secs_f64() + (f64::from(d.subsec_nanos()) / 1e9)
+    d.as_secs_f64()
 }
 
 pub fn all_metrics() -> ProtocolResult<Vec<u8>> {
@@ -54,3 +54,17 @@ pub fn all_metrics() -> ProtocolResult<Vec<u8>> {
 
     Ok(encoded_metrics)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::duration_to_sec;
+    use std::time::Duration;
+
+    #[test]
+    fn test_duration_to_sec() {
+        let d = Duration::from_millis(1110);
+        let sec = duration_to_sec(d);
+
+        assert_eq!(sec, 1.11 as f64);
+    }
+}