Merge pull request #94 from ivan-ochc/precise-timestamp

Add precise timestamp with nanos

Author: KodrAus

src/fmt.rs

@@ -44,7 +44,7 @@ use std::time::SystemTime;
 
 use termcolor::{self, ColorSpec, ColorChoice, Buffer, BufferWriter, WriteColor};
 use atty;
-use humantime::format_rfc3339_seconds;
+use humantime::{format_rfc3339_seconds, format_rfc3339_nanos};
 
 /// A formatter to write logs into.
 ///
@@ -148,6 +148,10 @@ pub struct StyledValue<'a, T> {
 /// [`Formatter`]: struct.Formatter.html
 pub struct Timestamp(SystemTime);
 
+/// An [RFC3339] formatted timestamp with nanos
+#[derive(Debug)]
+pub struct PreciseTimestamp(SystemTime);
+
 /// Log target, either `stdout` or `stderr`.
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
 pub enum Target {
@@ -468,6 +472,11 @@ impl Formatter {
         Timestamp(SystemTime::now())
     }
 
+     /// Get a [`PreciseTimestamp`] for the current date and time in UTC with nanos.
+    pub fn precise_timestamp(&self) -> PreciseTimestamp {
+        PreciseTimestamp(SystemTime::now())
+    }
+
     pub(crate) fn print(&self, writer: &Writer) -> io::Result<()> {
         writer.inner.print(&self.buf.borrow())
     }
@@ -575,6 +584,12 @@ impl fmt::Display for Timestamp {
     }
 }
 
+impl fmt::Display for PreciseTimestamp {
+    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+        format_rfc3339_nanos(self.0).fmt(f)
+    }
+}
+
 // The `Color` type is copied from https://github.com/BurntSushi/ripgrep/tree/master/termcolor
 
 /// The set of available colors for the terminal foreground/background.

src/lib.rs

@@ -268,6 +268,7 @@ struct Format {
     default_format_timestamp: bool,
     default_format_module_path: bool,
     default_format_level: bool,
+    default_format_timestamp_nanos: bool,
     custom_format: Option<Box<Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send>>,
 }
 
@@ -277,6 +278,7 @@ impl Default for Format {
             default_format_timestamp: true,
             default_format_module_path: true,
             default_format_level: true,
+            default_format_timestamp_nanos: false,
             custom_format: None,
         }
     }
@@ -312,8 +314,13 @@ impl Format {
                 };
 
                 let write_ts = if self.default_format_timestamp {
-                    let ts = buf.timestamp();
-                    write!(buf, "{}: ", ts)
+                    if self.default_format_timestamp_nanos {
+                      let ts_nanos = buf.precise_timestamp();
+                      write!(buf, "{}: ", ts_nanos) 
+                    } else {
+                      let ts = buf.timestamp();
+                      write!(buf, "{}: ", ts)      
+                    }
                 } else {
                     Ok(())
                 };
@@ -529,6 +536,12 @@ impl Builder {
         self
     }
 
+    /// Whether or not to write the timestamp with nanos.
+    pub fn default_format_timestamp_nanos(&mut self, write: bool) -> &mut Self {
+        self.format.default_format_timestamp_nanos = write;
+        self
+    }
+
     /// Adds a directive to the filter for a specific module.
     ///
     /// # Examples