From a28a39ca4a489b5337bd60f1c49d3d845f65b50b Mon Sep 17 00:00:00 2001
From: Anthony Ramine <123095+nox@users.noreply.github.com>
Date: Fri, 21 Jan 2022 19:59:11 +0100
Subject: [PATCH] Update tracing-subscriber and use tracing-tree when testing
 (#586)

This makes reading the logs way easier on the eyes.
---
 tests/h2-support/Cargo.toml   |  4 ++-
 tests/h2-support/src/trace.rs | 48 +++++++++--------------------------
 2 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/tests/h2-support/Cargo.toml b/tests/h2-support/Cargo.toml
index e97c6b3..f178178 100644
--- a/tests/h2-support/Cargo.toml
+++ b/tests/h2-support/Cargo.toml
@@ -7,9 +7,11 @@ edition = "2018"
 [dependencies]
 h2 = { path = "../..", features = ["stream", "unstable"] }
 
+atty = "0.2"
 bytes = "1"
 tracing = "0.1"
-tracing-subscriber = { version = "0.2", default-features = false, features = ["fmt", "chrono", "ansi"] }
+tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt"] }
+tracing-tree = "0.2"
 futures = { version = "0.3", default-features = false }
 http = "0.2"
 tokio = { version = "1", features = ["time"] }
diff --git a/tests/h2-support/src/trace.rs b/tests/h2-support/src/trace.rs
index 4ac1174..87038c3 100644
--- a/tests/h2-support/src/trace.rs
+++ b/tests/h2-support/src/trace.rs
@@ -1,41 +1,17 @@
-use std::{io, str};
 pub use tracing;
 pub use tracing_subscriber;
 
+use tracing_subscriber::layer::SubscriberExt;
+use tracing_subscriber::util::SubscriberInitExt;
+
 pub fn init() -> tracing::dispatcher::DefaultGuard {
-    tracing::subscriber::set_default(
-        tracing_subscriber::fmt()
-            .with_max_level(tracing::Level::TRACE)
-            .with_span_events(tracing_subscriber::fmt::format::FmtSpan::CLOSE)
-            .with_writer(PrintlnWriter { _p: () })
-            .finish(),
-    )
-}
-
-struct PrintlnWriter {
-    _p: (),
-}
-
-impl tracing_subscriber::fmt::MakeWriter for PrintlnWriter {
-    type Writer = PrintlnWriter;
-    fn make_writer(&self) -> Self::Writer {
-        PrintlnWriter { _p: () }
-    }
-}
-
-impl io::Write for PrintlnWriter {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        let s = str::from_utf8(buf).map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
-        println!("{}", s);
-        Ok(s.len())
-    }
-
-    fn write_fmt(&mut self, fmt: std::fmt::Arguments<'_>) -> io::Result<()> {
-        println!("{}", fmt);
-        Ok(())
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        Ok(())
-    }
+    let use_colors = atty::is(atty::Stream::Stdout);
+    let layer = tracing_tree::HierarchicalLayer::default()
+        .with_writer(tracing_subscriber::fmt::writer::TestWriter::default())
+        .with_indent_lines(true)
+        .with_ansi(use_colors)
+        .with_targets(true)
+        .with_indent_amount(2);
+
+    tracing_subscriber::registry().with(layer).set_default()
 }