From 24d0bd8fbe279714c8f44df0cfb8ad51a8b4e82a Mon Sep 17 00:00:00 2001 From: andylokandy Date: Wed, 14 Aug 2024 15:32:15 +0800 Subject: [PATCH 1/3] fix: FastraceEvent should not hardcode layout --- src/append/fastrace.rs | 14 ++++++-------- src/layout/kv.rs | 22 ++++++++++++++++++++++ src/layout/mod.rs | 1 + 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/append/fastrace.rs b/src/append/fastrace.rs index 617a510..9ad83d0 100644 --- a/src/append/fastrace.rs +++ b/src/append/fastrace.rs @@ -16,6 +16,7 @@ use jiff::Zoned; use log::Record; use crate::append::Append; +use crate::layout::collect_kvs; use crate::layout::KvDisplay; /// An appender that adds log records to fastrace as an event associated to the current span. @@ -24,14 +25,11 @@ pub struct FastraceEvent; impl Append for FastraceEvent { fn append(&self, record: &Record) -> anyhow::Result<()> { - let message = format!( - "{} {:>5} {}{}", - Zoned::now(), - record.level(), - record.args(), - KvDisplay::new(record.key_values()), - ); - fastrace::Event::add_to_local_parent(message, || []); + let message = format!("{}", record.args(),); + fastrace::Event::add_to_local_parent(message, || { + [("level", record.level()), ("timestamp", Zoned::now())] + .chain(collect_kvs(record.key_values())) + }); Ok(()) } diff --git a/src/layout/kv.rs b/src/layout/kv.rs index a619f34..8f9685b 100644 --- a/src/layout/kv.rs +++ b/src/layout/kv.rs @@ -45,3 +45,25 @@ impl<'a, 'kvs> log::kv::Visitor<'kvs> for KvWriter<'a, 'kvs> { Ok(()) } } + +/// A helper to collect log's key-value pairs. +pub fn collect_kvs(kv: &dyn log::kv::Source) -> Vec<(String, String)> { + let mut collector = KvCollector { kv: Vec::new() }; + kv.visit(&mut collector).ok(); + collector.kv +} + +struct KvCollector { + kv: Vec<(String, String)>, +} + +impl<'kvs> log::kv::Visitor<'kvs> for KvCollector { + fn visit_pair( + &mut self, + key: log::kv::Key<'kvs>, + value: log::kv::Value<'kvs>, + ) -> Result<(), log::kv::Error> { + self.kv.push((key.to_string(), value.to_string())); + Ok(()) + } +} diff --git a/src/layout/mod.rs b/src/layout/mod.rs index de9d092..5ac9a21 100644 --- a/src/layout/mod.rs +++ b/src/layout/mod.rs @@ -18,6 +18,7 @@ pub use custom::CustomLayout; pub use identical::IdenticalLayout; #[cfg(feature = "json")] pub use json::JsonLayout; +pub use kv::collect_kvs; pub use kv::KvDisplay; pub use text::LevelColor; pub use text::TextLayout; From 1ced9a54cf31f8d2ab07da090d238aef55789929 Mon Sep 17 00:00:00 2001 From: andylokandy Date: Wed, 14 Aug 2024 15:32:57 +0800 Subject: [PATCH 2/3] fix --- src/append/fastrace.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/append/fastrace.rs b/src/append/fastrace.rs index 9ad83d0..e069739 100644 --- a/src/append/fastrace.rs +++ b/src/append/fastrace.rs @@ -25,7 +25,7 @@ pub struct FastraceEvent; impl Append for FastraceEvent { fn append(&self, record: &Record) -> anyhow::Result<()> { - let message = format!("{}", record.args(),); + let message = format!("{}", record.args()); fastrace::Event::add_to_local_parent(message, || { [("level", record.level()), ("timestamp", Zoned::now())] .chain(collect_kvs(record.key_values())) From 534715b24810f1a94930eccc41337cc29b63059d Mon Sep 17 00:00:00 2001 From: andylokandy Date: Wed, 14 Aug 2024 16:30:56 +0800 Subject: [PATCH 3/3] fix --- src/append/fastrace.rs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/append/fastrace.rs b/src/append/fastrace.rs index e069739..f252464 100644 --- a/src/append/fastrace.rs +++ b/src/append/fastrace.rs @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. +use std::borrow::Cow; + use jiff::Zoned; use log::Record; use crate::append::Append; use crate::layout::collect_kvs; -use crate::layout::KvDisplay; /// An appender that adds log records to fastrace as an event associated to the current span. #[derive(Default, Debug, Clone)] @@ -27,8 +28,16 @@ impl Append for FastraceEvent { fn append(&self, record: &Record) -> anyhow::Result<()> { let message = format!("{}", record.args()); fastrace::Event::add_to_local_parent(message, || { - [("level", record.level()), ("timestamp", Zoned::now())] - .chain(collect_kvs(record.key_values())) + [ + (Cow::from("level"), Cow::from(record.level().as_str())), + (Cow::from("timestamp"), Cow::from(Zoned::now().to_string())), + ] + .into_iter() + .chain( + collect_kvs(record.key_values()) + .into_iter() + .map(|(k, v)| (Cow::from(k), Cow::from(v))), + ) }); Ok(()) }