Fix console logging with values (#108)

Author: cetra3

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "logfire"
-version = "0.8.1"
+version = "0.8.2"
 edition = "2024"
 license = "MIT"
 rust-version = "1.85"

src/internal/exporters/console.rs

@@ -207,8 +207,8 @@ impl ConsoleWriter {
 
     fn with_writer<R>(&self, f: impl FnOnce(&mut dyn Write) -> R) -> R {
         match &self.options.target {
-            Target::Stdout => f(&mut io::stdout()),
-            Target::Stderr => f(&mut io::stderr()),
+            Target::Stdout => f(&mut io::stdout().lock()),
+            Target::Stderr => f(&mut io::stderr().lock()),
             Target::Pipe(p) => f(&mut *p.lock().expect("pipe lock poisoned")),
         }
     }
@@ -362,20 +362,10 @@ impl ConsoleWriter {
         if !fields.is_empty() {
             for (idx, (key, value)) in fields.iter().enumerate() {
                 let key = key.as_str();
-                let value_str = match value {
-                    opentelemetry::logs::AnyValue::String(s) => s.as_str(),
-                    opentelemetry::logs::AnyValue::Int(i) => {
-                        return write!(w, " {}={}", ITALIC.paint(key), i);
-                    }
-                    opentelemetry::logs::AnyValue::Double(d) => {
-                        return write!(w, " {}={}", ITALIC.paint(key), d);
-                    }
-                    opentelemetry::logs::AnyValue::Boolean(b) => {
-                        return write!(w, " {}={}", ITALIC.paint(key), b);
-                    }
-                    _ => &format!("{value:?}"),
-                };
-                write!(w, " {}={}", ITALIC.paint(key), value_str)?;
+
+                write!(w, " {}=", ITALIC.paint(key))?;
+                write_any_value(w, value)?;
+
                 if idx < fields.len() - 1 {
                     write!(w, ",")?;
                 }
@@ -386,6 +376,53 @@ impl ConsoleWriter {
     }
 }
 
+fn write_any_value<W: io::Write>(w: &mut W, value: &AnyValue) -> io::Result<()> {
+    match value {
+        AnyValue::Int(i) => {
+            write!(w, "{i}")?;
+        }
+        AnyValue::Double(d) => {
+            write!(w, "{d}")?;
+        }
+        AnyValue::String(s) => {
+            write!(w, "{s}")?;
+        }
+        AnyValue::Boolean(b) => {
+            write!(w, "{b}")?;
+        }
+        AnyValue::Bytes(items) => {
+            write!(w, "{}", DIMMED.paint(format!("<bytes:{}>", items.len())))?;
+        }
+        AnyValue::ListAny(list_values) => {
+            for (idx, val) in list_values.iter().enumerate() {
+                write_any_value(w, val)?;
+
+                if idx < list_values.len() - 1 {
+                    write!(w, ",")?;
+                }
+            }
+        }
+        AnyValue::Map(hash_map) => {
+            write!(w, "{{")?;
+
+            for (idx, (key, val)) in (**hash_map).iter().enumerate() {
+                write!(w, "{}=", ITALIC.paint(key.as_str()))?;
+                write_any_value(w, val)?;
+
+                if idx < hash_map.len() - 1 {
+                    write!(w, ",")?;
+                }
+            }
+            write!(w, "}}")?;
+        }
+        other => {
+            write!(w, "{other:?}")?;
+        }
+    }
+
+    Ok(())
+}
+
 #[cfg(test)]
 mod tests {
     use std::sync::{Arc, Mutex};
@@ -422,6 +459,7 @@ mod tests {
             let _ = crate::span!(level: Level::DEBUG, "debug span");
             let _ =
                 crate::span!(parent: &root, level: Level::DEBUG, "debug span with explicit parent");
+            crate::info!("log with values", foo = 42, bar = 33);
             crate::info!("hello world log");
             panic!("oh no!");
         }))
@@ -438,8 +476,9 @@ mod tests {
         1970-01-01T00:00:00.000001Z  INFO logfire::internal::exporters::console::tests hello world span
         1970-01-01T00:00:00.000002Z DEBUG logfire::internal::exporters::console::tests debug span
         1970-01-01T00:00:00.000003Z DEBUG logfire::internal::exporters::console::tests debug span with explicit parent
-        1970-01-01T00:00:00.000004Z  INFO logfire::internal::exporters::console::tests hello world log
-        1970-01-01T00:00:00.000005Z ERROR panic: oh no! backtrace=disabled backtrace
+        1970-01-01T00:00:00.000004Z  INFO logfire::internal::exporters::console::tests log with values foo=42, bar=33
+        1970-01-01T00:00:00.000005Z  INFO logfire::internal::exporters::console::tests hello world log
+        1970-01-01T00:00:00.000006Z ERROR panic: oh no! backtrace=disabled backtrace
         ");
     }