[ty] Change layout of extra verbose output and respect --color for verbose output (#18089)

Author: MichaReiser

Cargo.lock

@@ -163,7 +163,6 @@ tracing-subscriber = { version = "0.3.18", default-features = false, features =
     "env-filter",
     "fmt",
 ] }
-tracing-tree = { version = "0.4.0" }
 tryfn = { version = "0.2.1" }
 typed-arena = { version = "2.0.2" }
 unic-ucd-category = { version = "0.9" }

Cargo.toml

@@ -36,7 +36,6 @@ path-slash = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, optional = true }
-tracing-tree = { workspace = true, optional = true }
 rustc-hash = { workspace = true }
 zip = { workspace = true }
 
@@ -55,4 +54,4 @@ cache = ["ruff_cache"]
 os = ["ignore", "dep:etcetera"]
 serde = ["dep:serde", "camino/serde1"]
 # Exposes testing utilities.
-testing = ["tracing-subscriber", "tracing-tree"]
+testing = ["tracing-subscriber"]

crates/ruff_db/Cargo.toml

@@ -141,7 +141,6 @@ pub fn setup_logging_with_filter(filter: &str) -> Option<LoggingGuard> {
 #[derive(Debug)]
 pub struct LoggingBuilder {
     filter: EnvFilter,
-    hierarchical: bool,
 }
 
 impl LoggingBuilder {
@@ -154,50 +153,26 @@ impl LoggingBuilder {
                         .parse()
                         .expect("Hardcoded directive to be valid"),
                 ),
-            hierarchical: false,
         }
     }
 
     pub fn with_filter(filter: &str) -> Option<Self> {
         let filter = EnvFilter::builder().parse(filter).ok()?;
 
-        Some(Self {
-            filter,
-            hierarchical: false,
-        })
-    }
-
-    pub fn with_hierarchical(mut self, hierarchical: bool) -> Self {
-        self.hierarchical = hierarchical;
-        self
+        Some(Self { filter })
     }
 
     pub fn build(self) -> LoggingGuard {
         let registry = tracing_subscriber::registry().with(self.filter);
 
-        let guard = if self.hierarchical {
-            let subscriber = registry.with(
-                tracing_tree::HierarchicalLayer::default()
-                    .with_indent_lines(true)
-                    .with_indent_amount(2)
-                    .with_bracketed_fields(true)
-                    .with_thread_ids(true)
-                    .with_targets(true)
-                    .with_writer(std::io::stderr)
-                    .with_timer(tracing_tree::time::Uptime::default()),
-            );
-
-            tracing::subscriber::set_default(subscriber)
-        } else {
-            let subscriber = registry.with(
-                tracing_subscriber::fmt::layer()
-                    .compact()
-                    .with_writer(std::io::stderr)
-                    .with_timer(tracing_subscriber::fmt::time()),
-            );
+        let subscriber = registry.with(
+            tracing_subscriber::fmt::layer()
+                .compact()
+                .with_writer(std::io::stderr)
+                .with_timer(tracing_subscriber::fmt::time()),
+        );
 
-            tracing::subscriber::set_default(subscriber)
-        };
+        let guard = tracing::subscriber::set_default(subscriber);
 
         LoggingGuard { _guard: guard }
     }

crates/ruff_db/src/testing.rs

@@ -35,7 +35,6 @@ salsa = { workspace = true }
 tracing = { workspace = true, features = ["release_max_level_debug"] }
 tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] }
 tracing-flame = { workspace = true }
-tracing-tree = { workspace = true }
 wild = { workspace = true }
 
 [dev-dependencies]

crates/ty/Cargo.toml

@@ -60,7 +60,7 @@ fn run_check(args: CheckCommand) -> anyhow::Result<ExitStatus> {
 
     let verbosity = args.verbosity.level();
     countme::enable(verbosity.is_trace());
-    let _guard = setup_tracing(verbosity)?;
+    let _guard = setup_tracing(verbosity, args.color.unwrap_or_default())?;
 
     tracing::warn!(
         "ty is pre-release software and not ready for production use. \

crates/ty/src/lib.rs

@@ -1,10 +1,11 @@
 //! Sets up logging for ty
 
+use crate::args::TerminalColor;
 use anyhow::Context;
 use colored::Colorize;
 use std::fmt;
 use std::fs::File;
-use std::io::BufWriter;
+use std::io::{BufWriter, IsTerminal};
 use tracing::{Event, Subscriber};
 use tracing_subscriber::filter::LevelFilter;
 use tracing_subscriber::fmt::format::Writer;
@@ -76,7 +77,10 @@ impl VerbosityLevel {
     }
 }
 
-pub(crate) fn setup_tracing(level: VerbosityLevel) -> anyhow::Result<TracingGuard> {
+pub(crate) fn setup_tracing(
+    level: VerbosityLevel,
+    color: TerminalColor,
+) -> anyhow::Result<TracingGuard> {
     use tracing_subscriber::prelude::*;
 
     // The `TY_LOG` environment variable overrides the default log level.
@@ -115,16 +119,21 @@ pub(crate) fn setup_tracing(level: VerbosityLevel) -> anyhow::Result<TracingGuar
         .with(filter)
         .with(profiling_layer);
 
+    let ansi = match color {
+        TerminalColor::Auto => {
+            colored::control::SHOULD_COLORIZE.should_colorize() && std::io::stderr().is_terminal()
+        }
+        TerminalColor::Always => true,
+        TerminalColor::Never => false,
+    };
+
     if level.is_trace() {
         let subscriber = registry.with(
-            tracing_tree::HierarchicalLayer::default()
-                .with_indent_lines(true)
-                .with_indent_amount(2)
-                .with_bracketed_fields(true)
+            tracing_subscriber::fmt::layer()
+                .event_format(tracing_subscriber::fmt::format().pretty())
                 .with_thread_ids(true)
-                .with_targets(true)
-                .with_writer(std::io::stderr)
-                .with_timer(tracing_tree::time::Uptime::default()),
+                .with_ansi(ansi)
+                .with_writer(std::io::stderr),
         );
 
         subscriber.init();
@@ -136,6 +145,7 @@ pub(crate) fn setup_tracing(level: VerbosityLevel) -> anyhow::Result<TracingGuar
                     display_timestamp: level.is_extra_verbose(),
                     show_spans: false,
                 })
+                .with_ansi(ansi)
                 .with_writer(std::io::stderr),
         );