Sfoglia il codice sorgente

app/log: only show the span ID for the top level span

darkfi 8 mesi fa
parent
commit
9b94affcef
1 ha cambiato i file con 13 aggiunte e 5 eliminazioni
  1. 13 5
      src/util/logger.rs

+ 13 - 5
src/util/logger.rs

@@ -207,11 +207,19 @@ where
 
             // Displays the full span tree
             for span in scope.from_root() {
-                // Crop span_id to 6 chars
-                let span_id = span.id().into_u64().to_string();
-                let span_id = &span_id[..span_id.len().min(6)];
-
-                write!(writer, "{}({})", bold.paint(span.metadata().name()), span_id)?;
+                let span_name = bold.paint(span.metadata().name());
+
+                // Only need to show the span ID once for the root span
+                // since its the same for all child spans too.
+                if !seen {
+                    // Crop span_id to 6 chars
+                    let span_id = span.id().into_u64().to_string();
+                    let span_id = &span_id[..span_id.len().min(6)];
+
+                    write!(writer, "{}({})", span_name, span_id)?;
+                } else {
+                    write!(writer, "{}", span_name)?;
+                }
                 seen = true;
 
                 let ext = span.extensions();