From cb376fa94aa7025a6e8e7d6c4a22246ad7fad779 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Sat, 24 Aug 2024 16:28:06 +0800
Subject: [PATCH] refactor: simplify strftime with precision format

Signed-off-by: tison <wander4096@gmail.com>
---
 Cargo.toml         | 4 ++--
 src/layout/json.rs | 2 +-
 src/layout/text.rs | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1ff88e8..1915b9a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,7 +46,7 @@ rolling_file = ["dep:crossbeam-channel", "dep:parking_lot"]
 [dependencies]
 anyhow = { version = "1.0" }
 colored = { version = "2.1" }
-jiff = { version = "0.1.5" }
+jiff = { version = "0.1.10" }
 log = { version = "0.4", features = ["std", "kv_unstable"] }
 paste = { version = "1.0" }
 
@@ -81,7 +81,7 @@ version = "0.12"
 ## Fastrace dependencies
 [dependencies.fastrace]
 optional = true
-version = "0.7.1"
+version = "0.7"
 
 ## Opentelemetry dependencies
 [dependencies.opentelemetry]
diff --git a/src/layout/json.rs b/src/layout/json.rs
index 36174f4..ee3ed14 100644
--- a/src/layout/json.rs
+++ b/src/layout/json.rs
@@ -77,7 +77,7 @@ fn serialize_time_zone<S>(timestamp: &Zoned, serializer: S) -> Result<S::Ok, S::
 where
     S: serde::Serializer,
 {
-    serializer.collect_str(&timestamp.strftime("%Y-%m-%dT%H:%M:%S.%6f%:z"))
+    serializer.collect_str(&format_args!("{timestamp:.6}"))
 }
 
 fn serialize_args<S>(args: &Arguments, serializer: S) -> Result<S::Ok, S::Error>
diff --git a/src/layout/text.rs b/src/layout/text.rs
index 4358032..84cf72f 100644
--- a/src/layout/text.rs
+++ b/src/layout/text.rs
@@ -139,8 +139,7 @@ impl TextLayout {
         let time = match self.tz.clone() {
             Some(tz) => Timestamp::now().to_zoned(tz),
             None => Zoned::now(),
-        }
-        .strftime("%Y-%m-%dT%H:%M:%S.%6f%:z");
+        };
         let level = if self.no_color {
             ColoredString::from(record.level().to_string())
         } else {
@@ -160,7 +159,7 @@ impl TextLayout {
         let kvs = KvDisplay::new(record.key_values());
 
         f(format_args!(
-            "{time} {level:>5} {module}: {file}:{line} {message}{kvs}"
+            "{time:.6} {level:>5} {module}: {file}:{line} {message}{kvs}"
         ))
     }
 }