From d1ed7b0ed8920d37fb3504341c2bf39fccd9e683 Mon Sep 17 00:00:00 2001
From: Jun Jiang <jasl9187@hotmail.com>
Date: Sat, 13 Jan 2024 23:20:36 +0800
Subject: [PATCH 01/15] Remove all ansi_term::Colour usage

# Conflicts:
#	Cargo.lock
#	substrate/client/informant/Cargo.toml
#	substrate/client/informant/src/display.rs
#	substrate/client/informant/src/lib.rs
#	substrate/client/tracing/Cargo.toml

Fix compile

Fix compile

Fix compile
---
 Cargo.lock                                    |  4 +-
 substrate/client/informant/Cargo.toml         |  2 +-
 substrate/client/informant/src/display.rs     | 14 ++---
 substrate/client/informant/src/lib.rs         | 60 +++++++------------
 substrate/client/tracing/Cargo.toml           |  2 +-
 .../tracing/src/logging/event_format.rs       | 12 ++--
 6 files changed, 40 insertions(+), 54 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 160e7031af70..544579b9da7f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17574,7 +17574,7 @@ dependencies = [
 name = "sc-informant"
 version = "0.33.0"
 dependencies = [
- "ansi_term",
+ "console",
  "futures",
  "futures-timer",
  "log",
@@ -18270,8 +18270,8 @@ dependencies = [
 name = "sc-tracing"
 version = "28.0.0"
 dependencies = [
- "ansi_term",
  "chrono",
+ "console",
  "criterion",
  "is-terminal",
  "lazy_static",
diff --git a/substrate/client/informant/Cargo.toml b/substrate/client/informant/Cargo.toml
index 9da2296deee3..aa54d9479f5c 100644
--- a/substrate/client/informant/Cargo.toml
+++ b/substrate/client/informant/Cargo.toml
@@ -16,7 +16,7 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-ansi_term = { workspace = true }
+console = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 log = { workspace = true, default-features = true }
diff --git a/substrate/client/informant/src/display.rs b/substrate/client/informant/src/display.rs
index cdbb83b6596c..a234281037d5 100644
--- a/substrate/client/informant/src/display.rs
+++ b/substrate/client/informant/src/display.rs
@@ -17,7 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::OutputFormat;
-use ansi_term::Colour;
+use console::{Attribute, Color};
 use log::info;
 use sc_client_api::ClientInfo;
 use sc_network::NetworkStatus;
@@ -146,15 +146,15 @@ impl<B: BlockT> InformantDisplay<B> {
 			target: "substrate",
 			"{} {}{} ({} peers), best: #{} ({}), finalized #{} ({}), {} {}",
 			level,
-			self.format.print_with_color(Colour::White.bold(), status),
+			self.format.print(Color::White, Some(Attribute::Bold), &status),
 			target,
-			self.format.print_with_color(Colour::White.bold(), num_connected_peers),
-			self.format.print_with_color(Colour::White.bold(), best_number),
+			self.format.print(Color::White, Some(Attribute::Bold), format!("{}", num_connected_peers)),
+			self.format.print(Color::White, Some(Attribute::Bold), format!("{}", best_number)),
 			best_hash,
-			self.format.print_with_color(Colour::White.bold(), finalized_number),
+			self.format.print(Color::White, Some(Attribute::Bold), format!("{}", finalized_number)),
 			info.chain.finalized_hash,
-			self.format.print_with_color(Colour::Green, format!("⬇ {}", TransferRateFormat(avg_bytes_per_sec_inbound))),
-			self.format.print_with_color(Colour::Red, format!("⬆ {}", TransferRateFormat(avg_bytes_per_sec_outbound))),
+			self.format.print(Color::Green, None, format!("⬇ {}", TransferRateFormat(avg_bytes_per_sec_inbound))),
+			self.format.print(Color::Red, None, format!("⬆ {}", TransferRateFormat(avg_bytes_per_sec_outbound))),
 		)
 	}
 }
diff --git a/substrate/client/informant/src/lib.rs b/substrate/client/informant/src/lib.rs
index af778529ffc5..8f584d8a8519 100644
--- a/substrate/client/informant/src/lib.rs
+++ b/substrate/client/informant/src/lib.rs
@@ -18,7 +18,7 @@
 
 //! Console informant. Prints sync progress and block events. Runs on the calling thread.
 
-use ansi_term::{Colour, Style};
+use console::{style, Attribute, Color};
 use futures::prelude::*;
 use futures_timer::Delay;
 use log::{debug, info, trace};
@@ -51,41 +51,15 @@ impl Default for OutputFormat {
 	}
 }
 
-enum ColorOrStyle {
-	Color(Colour),
-	Style(Style),
-}
-
-impl From<Colour> for ColorOrStyle {
-	fn from(value: Colour) -> Self {
-		Self::Color(value)
-	}
-}
-
-impl From<Style> for ColorOrStyle {
-	fn from(value: Style) -> Self {
-		Self::Style(value)
-	}
-}
-
-impl ColorOrStyle {
-	fn paint(&self, data: String) -> impl Display {
-		match self {
-			Self::Color(c) => c.paint(data),
-			Self::Style(s) => s.paint(data),
-		}
-	}
-}
-
 impl OutputFormat {
 	/// Print with color if `self.enable_color == true`.
-	fn print_with_color(
-		&self,
-		color: impl Into<ColorOrStyle>,
-		data: impl ToString,
-	) -> impl Display {
+	fn print(&self, color: Color, attr: Option<Attribute>, data: impl Display) -> impl Display {
 		if self.enable_color {
-			color.into().paint(data.to_string()).to_string()
+			let mut styled = style(data).fg(color);
+			if let Some(attr) = attr {
+				styled = styled.attr(attr);
+			}
+			styled.to_string()
 		} else {
 			data.to_string()
 		}
@@ -161,11 +135,23 @@ where
 				match maybe_ancestor {
 					Ok(ref ancestor) if ancestor.hash != *last_hash => info!(
 						"♻️  Reorg on #{},{} to #{},{}, common ancestor #{},{}",
-						format.print_with_color(Colour::Red.bold(), last_num),
+						format.print(
+							Color::Red,
+							Some(Attribute::Bold),
+							format!("{}", last_num)
+						),
 						last_hash,
-						format.print_with_color(Colour::Green.bold(), n.header.number()),
+						format.print(
+							Color::Green,
+							Some(Attribute::Bold),
+							format!("{}", n.header.number())
+						),
 						n.hash,
-						format.print_with_color(Colour::White.bold(), ancestor.number),
+						format.print(
+							Color::White,
+							Some(Attribute::Bold),
+							format!("{}", ancestor.number)
+						),
 						ancestor.hash,
 					),
 					Ok(_) => {},
@@ -191,7 +177,7 @@ where
 			info!(
 				target: "substrate",
 				"{best_indicator} Imported #{} ({} → {})",
-				format.print_with_color(Colour::White.bold(), n.header.number()),
+				format.print(Color::White, Some(Attribute::Bold), format!("{}", n.header.number())),
 				n.header.parent_hash(),
 				n.hash,
 			);
diff --git a/substrate/client/tracing/Cargo.toml b/substrate/client/tracing/Cargo.toml
index cacb1351416a..733c7c54aa8d 100644
--- a/substrate/client/tracing/Cargo.toml
+++ b/substrate/client/tracing/Cargo.toml
@@ -16,7 +16,7 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-ansi_term = { workspace = true }
+console = { workspace = true }
 is-terminal = { workspace = true }
 chrono = { workspace = true }
 codec = { workspace = true, default-features = true }
diff --git a/substrate/client/tracing/src/logging/event_format.rs b/substrate/client/tracing/src/logging/event_format.rs
index 8d875427841e..c884edfa27b4 100644
--- a/substrate/client/tracing/src/logging/event_format.rs
+++ b/substrate/client/tracing/src/logging/event_format.rs
@@ -17,7 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::logging::fast_local_time::FastLocalTime;
-use ansi_term::Colour;
+use console::style;
 use regex::Regex;
 use std::fmt::{self, Write};
 use tracing::{Event, Level, Subscriber};
@@ -166,11 +166,11 @@ impl<'a> fmt::Display for FmtLevel<'a> {
 	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 		if self.ansi {
 			match *self.level {
-				Level::TRACE => write!(f, "{}", Colour::Purple.paint(TRACE_STR)),
-				Level::DEBUG => write!(f, "{}", Colour::Blue.paint(DEBUG_STR)),
-				Level::INFO => write!(f, "{}", Colour::Green.paint(INFO_STR)),
-				Level::WARN => write!(f, "{}", Colour::Yellow.paint(WARN_STR)),
-				Level::ERROR => write!(f, "{}", Colour::Red.paint(ERROR_STR)),
+				Level::TRACE => write!(f, "{}", style(TRACE_STR).purple().to_string()),
+				Level::DEBUG => write!(f, "{}", style(DEBUG_STR).blue().to_string()),
+				Level::INFO => write!(f, "{}", style(INFO_STR).green().to_string()),
+				Level::WARN => write!(f, "{}", style(WARN_STR).yellow().to_string()),
+				Level::ERROR => write!(f, "{}", style(ERROR_STR).red().to_string()),
 			}
 		} else {
 			match *self.level {

From 52ed6f8ead6a01f1a7d4215a2c768badf927ebd4 Mon Sep 17 00:00:00 2001
From: Jun Jiang <jasl9187@hotmail.com>
Date: Sat, 13 Jan 2024 23:25:59 +0800
Subject: [PATCH 02/15] Remove usage of ansi_term::Style

# Conflicts:
#	substrate/client/tracing/Cargo.toml
---
 substrate/client/tracing/src/logging/event_format.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/substrate/client/tracing/src/logging/event_format.rs b/substrate/client/tracing/src/logging/event_format.rs
index c884edfa27b4..6b9bde6d7241 100644
--- a/substrate/client/tracing/src/logging/event_format.rs
+++ b/substrate/client/tracing/src/logging/event_format.rs
@@ -234,7 +234,6 @@ impl<'a> fmt::Display for FmtThreadName<'a> {
 //
 //       https://github.com/tokio-rs/tracing/blob/2f59b32/tracing-subscriber/src/fmt/time/mod.rs#L252
 mod time {
-	use ansi_term::Style;
 	use std::fmt;
 	use tracing_subscriber::fmt::{format, time::FormatTime};
 
@@ -247,10 +246,9 @@ mod time {
 		T: FormatTime,
 	{
 		if with_ansi {
-			let style = Style::new().dimmed();
-			write!(writer, "{}", style.prefix())?;
+			write!(writer, "\x1B[2m")?;
 			timer.format_time(writer)?;
-			write!(writer, "{}", style.suffix())?;
+			write!(writer, "\x1B[0m")?;
 		} else {
 			timer.format_time(writer)?;
 		}

From 577b9ecde702cb5a62e598886ccab7df4d9d16b3 Mon Sep 17 00:00:00 2001
From: Jun Jiang <jasl9187@hotmail.com>
Date: Sun, 14 Jan 2024 00:00:34 +0800
Subject: [PATCH 03/15] ansi_term's Purple should be console's Magenta

---
 substrate/client/tracing/src/logging/event_format.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/client/tracing/src/logging/event_format.rs b/substrate/client/tracing/src/logging/event_format.rs
index 6b9bde6d7241..4d425d67c218 100644
--- a/substrate/client/tracing/src/logging/event_format.rs
+++ b/substrate/client/tracing/src/logging/event_format.rs
@@ -166,7 +166,7 @@ impl<'a> fmt::Display for FmtLevel<'a> {
 	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 		if self.ansi {
 			match *self.level {
-				Level::TRACE => write!(f, "{}", style(TRACE_STR).purple().to_string()),
+				Level::TRACE => write!(f, "{}", style(TRACE_STR).magenta().to_string()),
 				Level::DEBUG => write!(f, "{}", style(DEBUG_STR).blue().to_string()),
 				Level::INFO => write!(f, "{}", style(INFO_STR).green().to_string()),
 				Level::WARN => write!(f, "{}", style(WARN_STR).yellow().to_string()),

From 7b5846e6ee953b765b01f8b78fe952fc553f5e11 Mon Sep 17 00:00:00 2001
From: Jun Jiang <jasl9187@hotmail.com>
Date: Sun, 14 Jan 2024 00:04:36 +0800
Subject: [PATCH 04/15] Remove ansi_term usage in test

---
 substrate/client/tracing/src/logging/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/client/tracing/src/logging/mod.rs b/substrate/client/tracing/src/logging/mod.rs
index 05ec9fcf6ef0..d79d39216aa6 100644
--- a/substrate/client/tracing/src/logging/mod.rs
+++ b/substrate/client/tracing/src/logging/mod.rs
@@ -494,7 +494,7 @@ mod tests {
 	fn do_not_write_with_colors_on_tty_entrypoint() {
 		if env::var("ENABLE_LOGGING").is_ok() {
 			let _guard = init_logger("");
-			log::info!("{}", ansi_term::Colour::Yellow.paint(EXPECTED_LOG_MESSAGE));
+			log::info!("{}", console::style(EXPECTED_LOG_MESSAGE).yellow().to_string());
 		}
 	}
 

From 02ebaa273c4e9b62038ba419ad759510b1426b1c Mon Sep 17 00:00:00 2001
From: Jun Jiang <jasl9187@hotmail.com>
Date: Thu, 18 Jul 2024 03:19:24 +0800
Subject: [PATCH 05/15] cargo +nightly fmt --all

---
 substrate/client/informant/src/lib.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/substrate/client/informant/src/lib.rs b/substrate/client/informant/src/lib.rs
index 8f584d8a8519..5db6182d7f56 100644
--- a/substrate/client/informant/src/lib.rs
+++ b/substrate/client/informant/src/lib.rs
@@ -135,11 +135,7 @@ where
 				match maybe_ancestor {
 					Ok(ref ancestor) if ancestor.hash != *last_hash => info!(
 						"♻️  Reorg on #{},{} to #{},{}, common ancestor #{},{}",
-						format.print(
-							Color::Red,
-							Some(Attribute::Bold),
-							format!("{}", last_num)
-						),
+						format.print(Color::Red, Some(Attribute::Bold), format!("{}", last_num)),
 						last_hash,
 						format.print(
 							Color::Green,

From cb7ad7790f8813a0a72e8a7704788030912a965e Mon Sep 17 00:00:00 2001
From: Jun Jiang <jasl9187@hotmail.com>
Date: Thu, 18 Jul 2024 03:22:39 +0800
Subject: [PATCH 06/15] Add PRDoc

---
 prdoc/pr_2923.prdoc | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 prdoc/pr_2923.prdoc

diff --git a/prdoc/pr_2923.prdoc b/prdoc/pr_2923.prdoc
new file mode 100644
index 000000000000..16c17d68d5e3
--- /dev/null
+++ b/prdoc/pr_2923.prdoc
@@ -0,0 +1,12 @@
+title: "Use `console` crate instead of `ansi_term`"
+
+doc:
+  - audience: Node Dev
+    description: |
+      This PR replace obsoleted `ansi_term` to `console`.
+
+crates:
+  - name: sc-informant
+    bump: patch
+  - name: sc-tracing
+    bump: patch

From 96ccbe3fa5657fd74da20a33de3f5b8461e54d60 Mon Sep 17 00:00:00 2001
From: Jun Jiang <jasl9187@hotmail.com>
Date: Thu, 18 Jul 2024 03:37:23 +0800
Subject: [PATCH 07/15] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bastian Köcher <git@kchr.de>
---
 substrate/client/informant/src/lib.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/substrate/client/informant/src/lib.rs b/substrate/client/informant/src/lib.rs
index 5db6182d7f56..3da251dcf84b 100644
--- a/substrate/client/informant/src/lib.rs
+++ b/substrate/client/informant/src/lib.rs
@@ -135,18 +135,18 @@ where
 				match maybe_ancestor {
 					Ok(ref ancestor) if ancestor.hash != *last_hash => info!(
 						"♻️  Reorg on #{},{} to #{},{}, common ancestor #{},{}",
-						format.print(Color::Red, Some(Attribute::Bold), format!("{}", last_num)),
+						format.print(Color::Red, Some(Attribute::Bold), last_num.to_string()),
 						last_hash,
 						format.print(
 							Color::Green,
 							Some(Attribute::Bold),
-							format!("{}", n.header.number())
+							n.header.number().to_string(),
 						),
 						n.hash,
 						format.print(
 							Color::White,
 							Some(Attribute::Bold),
-							format!("{}", ancestor.number)
+							ancestor.number.to_string(),
 						),
 						ancestor.hash,
 					),
@@ -173,7 +173,7 @@ where
 			info!(
 				target: "substrate",
 				"{best_indicator} Imported #{} ({} → {})",
-				format.print(Color::White, Some(Attribute::Bold), format!("{}", n.header.number())),
+				format.print(Color::White, Some(Attribute::Bold), n.header.number().to_string()),
 				n.header.parent_hash(),
 				n.hash,
 			);

From 2f610df77827ade5acf0b70ff4afa561fa14bca1 Mon Sep 17 00:00:00 2001
From: Jun Jiang <jasl9187@hotmail.com>
Date: Thu, 18 Jul 2024 04:33:13 +0800
Subject: [PATCH 08/15] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bastian Köcher <git@kchr.de>
---
 substrate/client/informant/src/lib.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/substrate/client/informant/src/lib.rs b/substrate/client/informant/src/lib.rs
index 3da251dcf84b..7992ecfa165d 100644
--- a/substrate/client/informant/src/lib.rs
+++ b/substrate/client/informant/src/lib.rs
@@ -135,18 +135,18 @@ where
 				match maybe_ancestor {
 					Ok(ref ancestor) if ancestor.hash != *last_hash => info!(
 						"♻️  Reorg on #{},{} to #{},{}, common ancestor #{},{}",
-						format.print(Color::Red, Some(Attribute::Bold), last_num.to_string()),
+						format.print(Color::Red, Some(Attribute::Bold), last_num),
 						last_hash,
 						format.print(
 							Color::Green,
 							Some(Attribute::Bold),
-							n.header.number().to_string(),
+							n.header.number(),
 						),
 						n.hash,
 						format.print(
 							Color::White,
 							Some(Attribute::Bold),
-							ancestor.number.to_string(),
+							ancestor.number,
 						),
 						ancestor.hash,
 					),
@@ -173,7 +173,7 @@ where
 			info!(
 				target: "substrate",
 				"{best_indicator} Imported #{} ({} → {})",
-				format.print(Color::White, Some(Attribute::Bold), n.header.number().to_string()),
+				format.print(Color::White, Some(Attribute::Bold), n.header.number()),
 				n.header.parent_hash(),
 				n.hash,
 			);

From 2de565f6f389d017a687ec35fc7e4428b6cf6158 Mon Sep 17 00:00:00 2001
From: Jun Jiang <jasl9187@hotmail.com>
Date: Thu, 18 Jul 2024 05:14:29 +0800
Subject: [PATCH 09/15] `ansi_term` free for `relay-utils`

---
 Cargo.lock                             |  2 +-
 bridges/relays/utils/Cargo.toml        |  2 +-
 bridges/relays/utils/src/initialize.rs | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 544579b9da7f..27fd77b051ce 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -16099,12 +16099,12 @@ dependencies = [
 name = "relay-utils"
 version = "0.1.0"
 dependencies = [
- "ansi_term",
  "anyhow",
  "async-std",
  "async-trait",
  "backoff",
  "bp-runtime",
+ "console",
  "env_logger 0.11.3",
  "futures",
  "isahc",
diff --git a/bridges/relays/utils/Cargo.toml b/bridges/relays/utils/Cargo.toml
index 93e42763967b..2c3f37750486 100644
--- a/bridges/relays/utils/Cargo.toml
+++ b/bridges/relays/utils/Cargo.toml
@@ -11,11 +11,11 @@ publish = false
 workspace = true
 
 [dependencies]
-ansi_term = { workspace = true }
 anyhow = { workspace = true }
 async-std = { workspace = true }
 async-trait = { workspace = true }
 backoff = { workspace = true }
+console = { workspace = true }
 isahc = { workspace = true }
 env_logger = { workspace = true }
 futures = { workspace = true }
diff --git a/bridges/relays/utils/src/initialize.rs b/bridges/relays/utils/src/initialize.rs
index 64d710242710..cd0377caa3d6 100644
--- a/bridges/relays/utils/src/initialize.rs
+++ b/bridges/relays/utils/src/initialize.rs
@@ -16,6 +16,7 @@
 
 //! Relayer initialization functions.
 
+use console::style;
 use parking_lot::Mutex;
 use std::{cell::RefCell, fmt::Display, io::Write};
 
@@ -55,7 +56,7 @@ pub fn initialize_logger(with_timestamp: bool) {
 			let timestamp = if cfg!(windows) {
 				Either::Left(timestamp)
 			} else {
-				Either::Right(ansi_term::Colour::Fixed(8).bold().paint(timestamp))
+				Either::Right(style(timestamp).black().bright().bold().to_string())
 			};
 
 			writeln!(
@@ -120,7 +121,7 @@ fn color_target(target: &str) -> impl Display + '_ {
 	if cfg!(windows) {
 		Either::Left(target)
 	} else {
-		Either::Right(ansi_term::Colour::Fixed(8).paint(target))
+		Either::Right(style(target).black().bright().to_string())
 	}
 }
 
@@ -129,13 +130,12 @@ fn color_level(level: log::Level) -> impl Display {
 		Either::Left(level)
 	} else {
 		let s = level.to_string();
-		use ansi_term::Colour as Color;
 		Either::Right(match level {
-			log::Level::Error => Color::Fixed(9).bold().paint(s),
-			log::Level::Warn => Color::Fixed(11).bold().paint(s),
-			log::Level::Info => Color::Fixed(10).paint(s),
-			log::Level::Debug => Color::Fixed(14).paint(s),
-			log::Level::Trace => Color::Fixed(12).paint(s),
+			log::Level::Error => style(s).red().bright().bold().to_string(),
+			log::Level::Warn => style(s).yellow().bright().bold().to_string(),
+			log::Level::Info => style(s).green().bright().to_string(),
+			log::Level::Debug => style(s).cyan().bright().to_string(),
+			log::Level::Trace => style(s).blue().bright().to_string(),
 		})
 	}
 }

From 33f7d3683dd8caf08d1acdc74ca070540846d403 Mon Sep 17 00:00:00 2001
From: Jun Jiang <jasl9187@hotmail.com>
Date: Thu, 18 Jul 2024 05:15:21 +0800
Subject: [PATCH 10/15] removed unused `ansi_term` dep

---
 Cargo.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0999d6304013..ae7d710563dd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -571,7 +571,6 @@ ahash = { version = "0.8.2" }
 alloy-primitives = { version = "0.4.2", default-features = false }
 alloy-sol-types = { version = "0.4.2", default-features = false }
 always-assert = { version = "0.1" }
-ansi_term = { version = "0.12.1" }
 anyhow = { version = "1.0.81" }
 aquamarine = { version = "0.5.0" }
 arbitrary = { version = "1.3.2" }

From d8e7bb8ca8c057ec9019797a09b667346999d072 Mon Sep 17 00:00:00 2001
From: Jun Jiang <jasl9187@hotmail.com>
Date: Thu, 18 Jul 2024 19:16:35 +0800
Subject: [PATCH 11/15] cargo +nightly fmt --all

---
 substrate/client/informant/src/lib.rs | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/substrate/client/informant/src/lib.rs b/substrate/client/informant/src/lib.rs
index 7992ecfa165d..0cc4a2913f92 100644
--- a/substrate/client/informant/src/lib.rs
+++ b/substrate/client/informant/src/lib.rs
@@ -137,17 +137,9 @@ where
 						"♻️  Reorg on #{},{} to #{},{}, common ancestor #{},{}",
 						format.print(Color::Red, Some(Attribute::Bold), last_num),
 						last_hash,
-						format.print(
-							Color::Green,
-							Some(Attribute::Bold),
-							n.header.number(),
-						),
+						format.print(Color::Green, Some(Attribute::Bold), n.header.number()),
 						n.hash,
-						format.print(
-							Color::White,
-							Some(Attribute::Bold),
-							ancestor.number,
-						),
+						format.print(Color::White, Some(Attribute::Bold), ancestor.number),
 						ancestor.hash,
 					),
 					Ok(_) => {},

From 9dd1c71efdbd70993e4d30d6c0795246c8faf211 Mon Sep 17 00:00:00 2001
From: Jun Jiang <jasl9187@hotmail.com>
Date: Thu, 18 Jul 2024 19:20:07 +0800
Subject: [PATCH 12/15] Update PR doc

---
 prdoc/pr_2923.prdoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/prdoc/pr_2923.prdoc b/prdoc/pr_2923.prdoc
index 16c17d68d5e3..281120673500 100644
--- a/prdoc/pr_2923.prdoc
+++ b/prdoc/pr_2923.prdoc
@@ -6,6 +6,8 @@ doc:
       This PR replace obsoleted `ansi_term` to `console`.
 
 crates:
+  - name: relay-utils
+    bump: patch
   - name: sc-informant
     bump: patch
   - name: sc-tracing

From 1c13aaf6b019faee61a48d40d7ef659508aebda6 Mon Sep 17 00:00:00 2001
From: Jun Jiang <jasl9187@hotmail.com>
Date: Fri, 19 Jul 2024 22:40:52 +0800
Subject: [PATCH 13/15] enforce `console` colors policy, keep the same behavior
 with `ansi_term`

---
 bridges/relays/utils/src/initialize.rs      | 2 ++
 substrate/client/tracing/src/logging/mod.rs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/bridges/relays/utils/src/initialize.rs b/bridges/relays/utils/src/initialize.rs
index cd0377caa3d6..1bb3f8b1c63e 100644
--- a/bridges/relays/utils/src/initialize.rs
+++ b/bridges/relays/utils/src/initialize.rs
@@ -41,6 +41,8 @@ pub fn initialize_logger(with_timestamp: bool) {
 	)
 	.expect("static format string is valid");
 
+	console::set_colors_enabled(true);
+
 	let mut builder = env_logger::Builder::new();
 	builder.filter_level(log::LevelFilter::Warn);
 	builder.filter_module("bridge", log::LevelFilter::Info);
diff --git a/substrate/client/tracing/src/logging/mod.rs b/substrate/client/tracing/src/logging/mod.rs
index d79d39216aa6..b54b0f111589 100644
--- a/substrate/client/tracing/src/logging/mod.rs
+++ b/substrate/client/tracing/src/logging/mod.rs
@@ -182,6 +182,8 @@ where
 	let enable_color = force_colors.unwrap_or_else(|| io::stderr().is_terminal());
 	let timer = fast_local_time::FastLocalTime { with_fractional: detailed_output };
 
+	console::set_colors_enabled(enable_color);
+
 	let event_format = EventFormat {
 		timer,
 		display_target: detailed_output,

From 2891d3f17c30e341db91396c29426cb582ace35d Mon Sep 17 00:00:00 2001
From: Jun Jiang <jasl9187@hotmail.com>
Date: Sat, 20 Jul 2024 13:25:21 +0800
Subject: [PATCH 14/15] Refactor to use `console` global ANSI style control

---
 bridges/relays/utils/src/initialize.rs        |   2 -
 cumulus/test/service/src/lib.rs               |   1 -
 polkadot/node/test/service/src/lib.rs         |   1 -
 .../bin/node/cli/benches/block_production.rs  |   1 -
 .../bin/node/cli/benches/transaction_pool.rs  |   1 -
 substrate/client/cli/src/config.rs            |   3 +-
 substrate/client/cli/src/runner.rs            |   1 -
 substrate/client/informant/src/display.rs     |  20 ++-
 substrate/client/informant/src/lib.rs         |  51 ++-----
 substrate/client/service/src/builder.rs       |   7 +-
 substrate/client/service/src/config.rs        |   3 -
 substrate/client/service/test/src/lib.rs      |   1 -
 substrate/client/tracing/Cargo.toml           |   2 +-
 .../tracing/src/logging/event_format.rs       | 128 +++---------------
 substrate/client/tracing/src/logging/mod.rs   |  34 +----
 15 files changed, 43 insertions(+), 213 deletions(-)

diff --git a/bridges/relays/utils/src/initialize.rs b/bridges/relays/utils/src/initialize.rs
index 1bb3f8b1c63e..cd0377caa3d6 100644
--- a/bridges/relays/utils/src/initialize.rs
+++ b/bridges/relays/utils/src/initialize.rs
@@ -41,8 +41,6 @@ pub fn initialize_logger(with_timestamp: bool) {
 	)
 	.expect("static format string is valid");
 
-	console::set_colors_enabled(true);
-
 	let mut builder = env_logger::Builder::new();
 	builder.filter_level(log::LevelFilter::Warn);
 	builder.filter_module("bridge", log::LevelFilter::Info);
diff --git a/cumulus/test/service/src/lib.rs b/cumulus/test/service/src/lib.rs
index 51cdebbaf54e..0458a0768925 100644
--- a/cumulus/test/service/src/lib.rs
+++ b/cumulus/test/service/src/lib.rs
@@ -891,7 +891,6 @@ pub fn node_config(
 		announce_block: true,
 		data_path: root,
 		base_path,
-		informant_output_format: Default::default(),
 		wasm_runtime_overrides: None,
 		runtime_cache_size: 2,
 	})
diff --git a/polkadot/node/test/service/src/lib.rs b/polkadot/node/test/service/src/lib.rs
index 35156a3a9372..a4e58253bb17 100644
--- a/polkadot/node/test/service/src/lib.rs
+++ b/polkadot/node/test/service/src/lib.rs
@@ -232,7 +232,6 @@ pub fn node_config(
 		announce_block: true,
 		data_path: root,
 		base_path,
-		informant_output_format: Default::default(),
 	}
 }
 
diff --git a/substrate/bin/node/cli/benches/block_production.rs b/substrate/bin/node/cli/benches/block_production.rs
index c16b25187e5f..8239637b3a9f 100644
--- a/substrate/bin/node/cli/benches/block_production.rs
+++ b/substrate/bin/node/cli/benches/block_production.rs
@@ -104,7 +104,6 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
 		announce_block: true,
 		data_path: base_path.path().into(),
 		base_path,
-		informant_output_format: Default::default(),
 		wasm_runtime_overrides: None,
 	};
 
diff --git a/substrate/bin/node/cli/benches/transaction_pool.rs b/substrate/bin/node/cli/benches/transaction_pool.rs
index 6618f4b1132e..9a71a4ec585d 100644
--- a/substrate/bin/node/cli/benches/transaction_pool.rs
+++ b/substrate/bin/node/cli/benches/transaction_pool.rs
@@ -99,7 +99,6 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
 		announce_block: true,
 		data_path: base_path.path().into(),
 		base_path,
-		informant_output_format: Default::default(),
 		wasm_runtime_overrides: None,
 	};
 
diff --git a/substrate/client/cli/src/config.rs b/substrate/client/cli/src/config.rs
index 783c9313121f..283148a6d6ad 100644
--- a/substrate/client/cli/src/config.rs
+++ b/substrate/client/cli/src/config.rs
@@ -27,7 +27,7 @@ use names::{Generator, Name};
 use sc_service::{
 	config::{
 		BasePath, Configuration, DatabaseSource, IpNetwork, KeystoreConfig, NetworkConfiguration,
-		NodeKeyConfig, OffchainWorkerConfig, OutputFormat, PrometheusConfig, PruningMode, Role,
+		NodeKeyConfig, OffchainWorkerConfig, PrometheusConfig, PruningMode, Role,
 		RpcBatchRequestConfig, RpcMethods, TelemetryEndpoints, TransactionPoolOptions,
 		WasmExecutionMethod,
 	},
@@ -550,7 +550,6 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			announce_block: self.announce_block()?,
 			role,
 			base_path,
-			informant_output_format: OutputFormat { enable_color: !self.disable_log_color()? },
 			runtime_cache_size,
 		})
 	}
diff --git a/substrate/client/cli/src/runner.rs b/substrate/client/cli/src/runner.rs
index 6d986e38d2fb..b0dbccfa634c 100644
--- a/substrate/client/cli/src/runner.rs
+++ b/substrate/client/cli/src/runner.rs
@@ -291,7 +291,6 @@ mod tests {
 				announce_block: true,
 				base_path: sc_service::BasePath::new(root.clone()),
 				data_path: root,
-				informant_output_format: Default::default(),
 				runtime_cache_size: 2,
 			},
 			runtime,
diff --git a/substrate/client/informant/src/display.rs b/substrate/client/informant/src/display.rs
index a234281037d5..f513e80a0381 100644
--- a/substrate/client/informant/src/display.rs
+++ b/substrate/client/informant/src/display.rs
@@ -16,8 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::OutputFormat;
-use console::{Attribute, Color};
+use console::style;
 use log::info;
 use sc_client_api::ClientInfo;
 use sc_network::NetworkStatus;
@@ -47,19 +46,16 @@ pub struct InformantDisplay<B: BlockT> {
 	last_total_bytes_inbound: u64,
 	/// The last seen total of bytes sent.
 	last_total_bytes_outbound: u64,
-	/// The format to print output in.
-	format: OutputFormat,
 }
 
 impl<B: BlockT> InformantDisplay<B> {
 	/// Builds a new informant display system.
-	pub fn new(format: OutputFormat) -> InformantDisplay<B> {
+	pub fn new() -> InformantDisplay<B> {
 		InformantDisplay {
 			last_number: None,
 			last_update: Instant::now(),
 			last_total_bytes_inbound: 0,
 			last_total_bytes_outbound: 0,
-			format,
 		}
 	}
 
@@ -146,15 +142,15 @@ impl<B: BlockT> InformantDisplay<B> {
 			target: "substrate",
 			"{} {}{} ({} peers), best: #{} ({}), finalized #{} ({}), {} {}",
 			level,
-			self.format.print(Color::White, Some(Attribute::Bold), &status),
+			style(&status).white().bold().to_string(),
 			target,
-			self.format.print(Color::White, Some(Attribute::Bold), format!("{}", num_connected_peers)),
-			self.format.print(Color::White, Some(Attribute::Bold), format!("{}", best_number)),
+			style(format!("{}", num_connected_peers)).white().bold().to_string(),
+			style(format!("{}", best_number)).white().bold().to_string(),
 			best_hash,
-			self.format.print(Color::White, Some(Attribute::Bold), format!("{}", finalized_number)),
+			style(format!("{}", finalized_number)).white().bold().to_string(),
 			info.chain.finalized_hash,
-			self.format.print(Color::Green, None, format!("⬇ {}", TransferRateFormat(avg_bytes_per_sec_inbound))),
-			self.format.print(Color::Red, None, format!("⬆ {}", TransferRateFormat(avg_bytes_per_sec_outbound))),
+			style(format!("⬇ {}", TransferRateFormat(avg_bytes_per_sec_inbound))).green().to_string(),
+			style(format!("⬆ {}", TransferRateFormat(avg_bytes_per_sec_outbound))).red().to_string(),
 		)
 	}
 }
diff --git a/substrate/client/informant/src/lib.rs b/substrate/client/informant/src/lib.rs
index 0cc4a2913f92..bc4636622b62 100644
--- a/substrate/client/informant/src/lib.rs
+++ b/substrate/client/informant/src/lib.rs
@@ -18,7 +18,7 @@
 
 //! Console informant. Prints sync progress and block events. Runs on the calling thread.
 
-use console::{style, Attribute, Color};
+use console::style;
 use futures::prelude::*;
 use futures_timer::Delay;
 use log::{debug, info, trace};
@@ -36,45 +36,15 @@ fn interval(duration: Duration) -> impl Stream<Item = ()> + Unpin {
 	futures::stream::unfold((), move |_| Delay::new(duration).map(|_| Some(((), ())))).map(drop)
 }
 
-/// The format to print telemetry output in.
-#[derive(Clone, Debug)]
-pub struct OutputFormat {
-	/// Enable color output in logs.
-	///
-	/// Is enabled by default.
-	pub enable_color: bool,
-}
-
-impl Default for OutputFormat {
-	fn default() -> Self {
-		Self { enable_color: true }
-	}
-}
-
-impl OutputFormat {
-	/// Print with color if `self.enable_color == true`.
-	fn print(&self, color: Color, attr: Option<Attribute>, data: impl Display) -> impl Display {
-		if self.enable_color {
-			let mut styled = style(data).fg(color);
-			if let Some(attr) = attr {
-				styled = styled.attr(attr);
-			}
-			styled.to_string()
-		} else {
-			data.to_string()
-		}
-	}
-}
-
 /// Builds the informant and returns a `Future` that drives the informant.
-pub async fn build<B: BlockT, C, N, S>(client: Arc<C>, network: N, syncing: S, format: OutputFormat)
+pub async fn build<B: BlockT, C, N, S>(client: Arc<C>, network: N, syncing: S)
 where
 	N: NetworkStatusProvider,
 	S: SyncStatusProvider<B>,
 	C: UsageProvider<B> + HeaderMetadata<B> + BlockchainEvents<B>,
 	<C as HeaderMetadata<B>>::Error: Display,
 {
-	let mut display = display::InformantDisplay::new(format.clone());
+	let mut display = display::InformantDisplay::new();
 
 	let client_1 = client.clone();
 
@@ -104,14 +74,11 @@ where
 
 	futures::select! {
 		() = display_notifications.fuse() => (),
-		() = display_block_import(client, format).fuse() => (),
+		() = display_block_import(client).fuse() => (),
 	};
 }
 
-fn display_block_import<B: BlockT, C>(
-	client: Arc<C>,
-	format: OutputFormat,
-) -> impl Future<Output = ()>
+fn display_block_import<B: BlockT, C>(client: Arc<C>) -> impl Future<Output = ()>
 where
 	C: UsageProvider<B> + HeaderMetadata<B> + BlockchainEvents<B>,
 	<C as HeaderMetadata<B>>::Error: Display,
@@ -135,11 +102,11 @@ where
 				match maybe_ancestor {
 					Ok(ref ancestor) if ancestor.hash != *last_hash => info!(
 						"♻️  Reorg on #{},{} to #{},{}, common ancestor #{},{}",
-						format.print(Color::Red, Some(Attribute::Bold), last_num),
+						style(last_num).red().bold().to_string(),
 						last_hash,
-						format.print(Color::Green, Some(Attribute::Bold), n.header.number()),
+						style(n.header.number()).green().bold().to_string(),
 						n.hash,
-						format.print(Color::White, Some(Attribute::Bold), ancestor.number),
+						style(ancestor.number).white().bold().to_string(),
 						ancestor.hash,
 					),
 					Ok(_) => {},
@@ -165,7 +132,7 @@ where
 			info!(
 				target: "substrate",
 				"{best_indicator} Imported #{} ({} → {})",
-				format.print(Color::White, Some(Attribute::Bold), n.header.number()),
+				style(n.header.number()).white().bold().to_string(),
 				n.header.parent_hash(),
 				n.hash,
 			);
diff --git a/substrate/client/service/src/builder.rs b/substrate/client/service/src/builder.rs
index 06fc2ea3b304..638f30fad10e 100644
--- a/substrate/client/service/src/builder.rs
+++ b/substrate/client/service/src/builder.rs
@@ -514,12 +514,7 @@ where
 	spawn_handle.spawn(
 		"informant",
 		None,
-		sc_informant::build(
-			client.clone(),
-			network,
-			sync_service.clone(),
-			config.informant_output_format,
-		),
+		sc_informant::build(client.clone(), network, sync_service.clone()),
 	);
 
 	task_manager.keep_alive((config.base_path, rpc));
diff --git a/substrate/client/service/src/config.rs b/substrate/client/service/src/config.rs
index e4788f1f3376..f8d8511f2718 100644
--- a/substrate/client/service/src/config.rs
+++ b/substrate/client/service/src/config.rs
@@ -23,7 +23,6 @@ use prometheus_endpoint::Registry;
 use sc_chain_spec::ChainSpec;
 pub use sc_client_db::{BlocksPruning, Database, DatabaseSource, PruningMode};
 pub use sc_executor::{WasmExecutionMethod, WasmtimeInstantiationStrategy};
-pub use sc_informant::OutputFormat;
 pub use sc_network::{
 	config::{
 		MultiaddrWithPeerId, NetworkConfiguration, NodeKeyConfig, NonDefaultSetConfig, ProtocolId,
@@ -146,8 +145,6 @@ pub struct Configuration {
 	pub data_path: PathBuf,
 	/// Base path of the configuration. This is shared between chains.
 	pub base_path: BasePath,
-	/// Configuration of the output format that the informant uses.
-	pub informant_output_format: OutputFormat,
 	/// Maximum number of different runtime versions that can be cached.
 	pub runtime_cache_size: u8,
 }
diff --git a/substrate/client/service/test/src/lib.rs b/substrate/client/service/test/src/lib.rs
index e60bd9410c64..5b9bb537563d 100644
--- a/substrate/client/service/test/src/lib.rs
+++ b/substrate/client/service/test/src/lib.rs
@@ -264,7 +264,6 @@ fn node_config<E: ChainSpecExtension + Clone + 'static + Send + Sync>(
 		announce_block: true,
 		base_path: BasePath::new(root.clone()),
 		data_path: root,
-		informant_output_format: Default::default(),
 		runtime_cache_size: 2,
 	}
 }
diff --git a/substrate/client/tracing/Cargo.toml b/substrate/client/tracing/Cargo.toml
index 733c7c54aa8d..f39c5ecb4e43 100644
--- a/substrate/client/tracing/Cargo.toml
+++ b/substrate/client/tracing/Cargo.toml
@@ -24,7 +24,6 @@ lazy_static = { workspace = true }
 libc = { workspace = true }
 log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-regex = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true, default-features = true }
 thiserror = { workspace = true }
@@ -42,6 +41,7 @@ sp-tracing = { workspace = true, default-features = true }
 
 [dev-dependencies]
 criterion = { workspace = true, default-features = true }
+regex = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["chrono", "parking_lot"] }
 
 [[bench]]
diff --git a/substrate/client/tracing/src/logging/event_format.rs b/substrate/client/tracing/src/logging/event_format.rs
index 4d425d67c218..4abceb383dfe 100644
--- a/substrate/client/tracing/src/logging/event_format.rs
+++ b/substrate/client/tracing/src/logging/event_format.rs
@@ -18,8 +18,7 @@
 
 use crate::logging::fast_local_time::FastLocalTime;
 use console::style;
-use regex::Regex;
-use std::fmt::{self, Write};
+use std::fmt;
 use tracing::{Event, Level, Subscriber};
 use tracing_log::NormalizeEvent;
 use tracing_subscriber::{
@@ -37,8 +36,6 @@ pub struct EventFormat<T = FastLocalTime> {
 	pub display_level: bool,
 	/// Sets whether or not the name of the current thread is displayed when formatting events.
 	pub display_thread_name: bool,
-	/// Enable ANSI terminal colors for formatted output.
-	pub enable_color: bool,
 	/// Duplicate INFO, WARN and ERROR messages to stdout.
 	pub dup_to_stdout: bool,
 }
@@ -53,20 +50,19 @@ where
 	pub(crate) fn format_event_custom<'b, 'w, S, N>(
 		&self,
 		ctx: &FmtContext<'b, S, N>,
-		writer: format::Writer<'w>,
+		mut writer: format::Writer<'w>,
 		event: &Event,
 	) -> fmt::Result
 	where
 		S: Subscriber + for<'a> LookupSpan<'a>,
 		N: for<'a> FormatFields<'a> + 'static,
 	{
-		let mut writer = &mut ControlCodeSanitizer::new(!self.enable_color, writer);
 		let normalized_meta = event.normalized_metadata();
 		let meta = normalized_meta.as_ref().unwrap_or_else(|| event.metadata());
-		time::write(&self.timer, &mut format::Writer::new(&mut writer), self.enable_color)?;
+		time::write(&self.timer, &mut format::Writer::new(&mut writer))?;
 
 		if self.display_level {
-			let fmt_level = FmtLevel::new(meta.level(), self.enable_color);
+			let fmt_level = FmtLevel::new(meta.level());
 			write!(writer, "{} ", fmt_level)?;
 		}
 
@@ -74,17 +70,17 @@ where
 			let current_thread = std::thread::current();
 			match current_thread.name() {
 				Some(name) => {
-					write!(writer, "{} ", FmtThreadName::new(name))?;
+					write!(&mut writer, "{} ", FmtThreadName::new(name))?;
 				},
 				// fall-back to thread id when name is absent and ids are not enabled
 				None => {
-					write!(writer, "{:0>2?} ", current_thread.id())?;
+					write!(&mut writer, "{:0>2?} ", current_thread.id())?;
 				},
 			}
 		}
 
 		if self.display_target {
-			write!(writer, "{}: ", meta.target())?;
+			write!(&mut writer, "{}: ", meta.target())?;
 		}
 
 		// Custom code to display node name
@@ -92,24 +88,16 @@ where
 			for span in span.scope() {
 				let exts = span.extensions();
 				if let Some(prefix) = exts.get::<super::layers::Prefix>() {
-					write!(writer, "{}", prefix.as_str())?;
+					write!(&mut writer, "{}", prefix.as_str())?;
 					break
 				}
 			}
 		}
 
-		// The writer only sanitizes its output once it's flushed, so if we don't actually need
-		// to sanitize everything we need to flush out what was already buffered as-is and only
-		// force-sanitize what follows.
-		if !writer.sanitize {
-			writer.flush()?;
-			writer.sanitize = true;
-		}
-
-		ctx.format_fields(format::Writer::new(writer), event)?;
-		writeln!(writer)?;
+		ctx.format_fields(format::Writer::new(&mut writer), event)?;
+		writeln!(&mut writer)?;
 
-		writer.flush()
+		Ok(())
 	}
 }
 
@@ -147,12 +135,11 @@ where
 
 struct FmtLevel<'a> {
 	level: &'a Level,
-	ansi: bool,
 }
 
 impl<'a> FmtLevel<'a> {
-	pub(crate) fn new(level: &'a Level, ansi: bool) -> Self {
-		Self { level, ansi }
+	pub(crate) fn new(level: &'a Level) -> Self {
+		Self { level }
 	}
 }
 
@@ -164,22 +151,12 @@ const ERROR_STR: &str = "ERROR";
 
 impl<'a> fmt::Display for FmtLevel<'a> {
 	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-		if self.ansi {
-			match *self.level {
-				Level::TRACE => write!(f, "{}", style(TRACE_STR).magenta().to_string()),
-				Level::DEBUG => write!(f, "{}", style(DEBUG_STR).blue().to_string()),
-				Level::INFO => write!(f, "{}", style(INFO_STR).green().to_string()),
-				Level::WARN => write!(f, "{}", style(WARN_STR).yellow().to_string()),
-				Level::ERROR => write!(f, "{}", style(ERROR_STR).red().to_string()),
-			}
-		} else {
-			match *self.level {
-				Level::TRACE => f.pad(TRACE_STR),
-				Level::DEBUG => f.pad(DEBUG_STR),
-				Level::INFO => f.pad(INFO_STR),
-				Level::WARN => f.pad(WARN_STR),
-				Level::ERROR => f.pad(ERROR_STR),
-			}
+		match *self.level {
+			Level::TRACE => write!(f, "{}", style(TRACE_STR).magenta().to_string()),
+			Level::DEBUG => write!(f, "{}", style(DEBUG_STR).blue().to_string()),
+			Level::INFO => write!(f, "{}", style(INFO_STR).green().to_string()),
+			Level::WARN => write!(f, "{}", style(WARN_STR).yellow().to_string()),
+			Level::ERROR => write!(f, "{}", style(ERROR_STR).red().to_string()),
 		}
 	}
 }
@@ -237,80 +214,19 @@ mod time {
 	use std::fmt;
 	use tracing_subscriber::fmt::{format, time::FormatTime};
 
-	pub(crate) fn write<T>(
-		timer: T,
-		writer: &mut format::Writer<'_>,
-		with_ansi: bool,
-	) -> fmt::Result
+	pub(crate) fn write<T>(timer: T, writer: &mut format::Writer<'_>) -> fmt::Result
 	where
 		T: FormatTime,
 	{
-		if with_ansi {
+		if console::colors_enabled() {
 			write!(writer, "\x1B[2m")?;
 			timer.format_time(writer)?;
 			write!(writer, "\x1B[0m")?;
 		} else {
 			timer.format_time(writer)?;
 		}
-		writer.write_char(' ')?;
-		Ok(())
-	}
-}
 
-/// A writer which (optionally) strips out terminal control codes from the logs.
-///
-/// This is used by [`EventFormat`] to sanitize the log messages.
-///
-/// It is required to call [`ControlCodeSanitizer::flush`] after all writes are done,
-/// because the content of these writes is buffered and will only be written to the
-/// `inner_writer` at that point.
-struct ControlCodeSanitizer<'a> {
-	sanitize: bool,
-	buffer: String,
-	inner_writer: format::Writer<'a>,
-}
-
-impl<'a> fmt::Write for ControlCodeSanitizer<'a> {
-	fn write_str(&mut self, buf: &str) -> fmt::Result {
-		self.buffer.push_str(buf);
-		Ok(())
-	}
-}
-
-// NOTE: When making any changes here make sure to also change this function in `sp-panic-handler`.
-fn strip_control_codes(input: &str) -> std::borrow::Cow<str> {
-	lazy_static::lazy_static! {
-		static ref RE: Regex = Regex::new(r#"(?x)
-			\x1b\[[^m]+m|        # VT100 escape codes
-			[
-			  \x00-\x09\x0B-\x1F # ASCII control codes / Unicode C0 control codes, except \n
-			  \x7F               # ASCII delete
-			  \u{80}-\u{9F}      # Unicode C1 control codes
-			  \u{202A}-\u{202E}  # Unicode left-to-right / right-to-left control characters
-			  \u{2066}-\u{2069}  # Same as above
-			]
-		"#).expect("regex parsing doesn't fail; qed");
-	}
-
-	RE.replace_all(input, "")
-}
-
-impl<'a> ControlCodeSanitizer<'a> {
-	/// Creates a new instance.
-	fn new(sanitize: bool, inner_writer: format::Writer<'a>) -> Self {
-		Self { sanitize, inner_writer, buffer: String::new() }
-	}
-
-	/// Write the buffered content to the `inner_writer`.
-	fn flush(&mut self) -> fmt::Result {
-		if self.sanitize {
-			let replaced = strip_control_codes(&self.buffer);
-			self.inner_writer.write_str(&replaced)?
-		} else {
-			self.inner_writer.write_str(&self.buffer)?
-		}
-
-		self.buffer.clear();
+		writer.write_char(' ')?;
 		Ok(())
 	}
 }
diff --git a/substrate/client/tracing/src/logging/mod.rs b/substrate/client/tracing/src/logging/mod.rs
index b54b0f111589..4fc8963da96a 100644
--- a/substrate/client/tracing/src/logging/mod.rs
+++ b/substrate/client/tracing/src/logging/mod.rs
@@ -183,13 +183,13 @@ where
 	let timer = fast_local_time::FastLocalTime { with_fractional: detailed_output };
 
 	console::set_colors_enabled(enable_color);
+	console::set_colors_enabled_stderr(enable_color);
 
 	let event_format = EventFormat {
 		timer,
 		display_target: detailed_output,
 		display_level: detailed_output,
 		display_thread_name: detailed_output,
-		enable_color,
 		dup_to_stdout: !io::stderr().is_terminal() && io::stdout().is_terminal(),
 	};
 	let builder = FmtSubscriber::builder().with_env_filter(env_filter);
@@ -654,36 +654,4 @@ mod tests {
 			assert!(stderr.contains(&line));
 		}
 	}
-
-	#[test]
-	fn control_characters_are_always_stripped_out_from_the_log_messages() {
-		const RAW_LINE: &str = "$$START$$\x1B[1;32mIn\u{202a}\u{202e}\u{2066}\u{2069}ner\n\r\x7ftext!\u{80}\u{9f}\x1B[0m$$END$$";
-		const SANITIZED_LINE: &str = "$$START$$Inner\ntext!$$END$$";
-
-		let output = run_test_in_another_process(
-			"control_characters_are_always_stripped_out_from_the_log_messages",
-			|| {
-				std::env::set_var("RUST_LOG", "trace");
-				let mut builder = LoggerBuilder::new("");
-				builder.with_colors(true);
-				builder.init().unwrap();
-				log::error!("{}", RAW_LINE);
-			},
-		);
-
-		if let Some(output) = output {
-			let stderr = String::from_utf8(output.stderr).unwrap();
-			// The log messages should always be sanitized.
-			assert!(!stderr.contains(RAW_LINE));
-			assert!(stderr.contains(SANITIZED_LINE));
-
-			// The part where the timestamp, the logging level, etc. is printed out doesn't
-			// always have to be sanitized unless it's necessary, and here it shouldn't be.
-			assert!(stderr.contains("\x1B[31mERROR\x1B[0m"));
-
-			// Make sure the logs aren't being duplicated.
-			assert_eq!(stderr.find("ERROR"), stderr.rfind("ERROR"));
-			assert_eq!(stderr.find(SANITIZED_LINE), stderr.rfind(SANITIZED_LINE));
-		}
-	}
 }

From 9c6fe6083a7cabc66f3edd2c5da17c39614e256f Mon Sep 17 00:00:00 2001
From: Jun Jiang <jasl9187@hotmail.com>
Date: Sun, 21 Jul 2024 00:03:36 +0800
Subject: [PATCH 15/15] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bastian Köcher <git@kchr.de>
---
 prdoc/pr_2923.prdoc                                |  2 ++
 substrate/client/informant/src/display.rs          | 14 +++++++-------
 substrate/client/informant/src/lib.rs              |  8 ++++----
 .../client/tracing/src/logging/event_format.rs     | 10 +++++-----
 substrate/client/tracing/src/logging/mod.rs        |  3 ++-
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/prdoc/pr_2923.prdoc b/prdoc/pr_2923.prdoc
index 281120673500..88bf1d48dd84 100644
--- a/prdoc/pr_2923.prdoc
+++ b/prdoc/pr_2923.prdoc
@@ -12,3 +12,5 @@ crates:
     bump: patch
   - name: sc-tracing
     bump: patch
+  - name: sc-service
+    bump: major
diff --git a/substrate/client/informant/src/display.rs b/substrate/client/informant/src/display.rs
index f513e80a0381..655bf21c7115 100644
--- a/substrate/client/informant/src/display.rs
+++ b/substrate/client/informant/src/display.rs
@@ -140,17 +140,17 @@ impl<B: BlockT> InformantDisplay<B> {
 
 		info!(
 			target: "substrate",
-			"{} {}{} ({} peers), best: #{} ({}), finalized #{} ({}), {} {}",
+			"{} {}{} ({} peers), best: #{} ({}), finalized #{} ({}), ⬇ {} ⬆ {}",
 			level,
-			style(&status).white().bold().to_string(),
+			style(&status).white().bold(),
 			target,
-			style(format!("{}", num_connected_peers)).white().bold().to_string(),
-			style(format!("{}", best_number)).white().bold().to_string(),
+			style(num_connected_peers).white().bold(),
+			style(best_number).white().bold(),
 			best_hash,
-			style(format!("{}", finalized_number)).white().bold().to_string(),
+			style(finalized_number).white().bold(),
 			info.chain.finalized_hash,
-			style(format!("⬇ {}", TransferRateFormat(avg_bytes_per_sec_inbound))).green().to_string(),
-			style(format!("⬆ {}", TransferRateFormat(avg_bytes_per_sec_outbound))).red().to_string(),
+			style(TransferRateFormat(avg_bytes_per_sec_inbound)).green(),
+			style(TransferRateFormat(avg_bytes_per_sec_outbound)).red(),
 		)
 	}
 }
diff --git a/substrate/client/informant/src/lib.rs b/substrate/client/informant/src/lib.rs
index bc4636622b62..d44364539a29 100644
--- a/substrate/client/informant/src/lib.rs
+++ b/substrate/client/informant/src/lib.rs
@@ -102,11 +102,11 @@ where
 				match maybe_ancestor {
 					Ok(ref ancestor) if ancestor.hash != *last_hash => info!(
 						"♻️  Reorg on #{},{} to #{},{}, common ancestor #{},{}",
-						style(last_num).red().bold().to_string(),
+						style(last_num).red().bold(),
 						last_hash,
-						style(n.header.number()).green().bold().to_string(),
+						style(n.header.number()).green().bold(),
 						n.hash,
-						style(ancestor.number).white().bold().to_string(),
+						style(ancestor.number).white().bold(),
 						ancestor.hash,
 					),
 					Ok(_) => {},
@@ -132,7 +132,7 @@ where
 			info!(
 				target: "substrate",
 				"{best_indicator} Imported #{} ({} → {})",
-				style(n.header.number()).white().bold().to_string(),
+				style(n.header.number()).white().bold(),
 				n.header.parent_hash(),
 				n.hash,
 			);
diff --git a/substrate/client/tracing/src/logging/event_format.rs b/substrate/client/tracing/src/logging/event_format.rs
index 4abceb383dfe..805b66d82fd5 100644
--- a/substrate/client/tracing/src/logging/event_format.rs
+++ b/substrate/client/tracing/src/logging/event_format.rs
@@ -152,11 +152,11 @@ const ERROR_STR: &str = "ERROR";
 impl<'a> fmt::Display for FmtLevel<'a> {
 	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 		match *self.level {
-			Level::TRACE => write!(f, "{}", style(TRACE_STR).magenta().to_string()),
-			Level::DEBUG => write!(f, "{}", style(DEBUG_STR).blue().to_string()),
-			Level::INFO => write!(f, "{}", style(INFO_STR).green().to_string()),
-			Level::WARN => write!(f, "{}", style(WARN_STR).yellow().to_string()),
-			Level::ERROR => write!(f, "{}", style(ERROR_STR).red().to_string()),
+			Level::TRACE => write!(f, "{}", style(TRACE_STR).magenta()),
+			Level::DEBUG => write!(f, "{}", style(DEBUG_STR).blue()),
+			Level::INFO => write!(f, "{}", style(INFO_STR).green()),
+			Level::WARN => write!(f, "{}", style(WARN_STR).yellow()),
+			Level::ERROR => write!(f, "{}", style(ERROR_STR).red()),
 		}
 	}
 }
diff --git a/substrate/client/tracing/src/logging/mod.rs b/substrate/client/tracing/src/logging/mod.rs
index 4fc8963da96a..74ce5f90ede9 100644
--- a/substrate/client/tracing/src/logging/mod.rs
+++ b/substrate/client/tracing/src/logging/mod.rs
@@ -182,6 +182,7 @@ where
 	let enable_color = force_colors.unwrap_or_else(|| io::stderr().is_terminal());
 	let timer = fast_local_time::FastLocalTime { with_fractional: detailed_output };
 
+	// We need to set both together, because we are may printing to `stdout` and `stderr`.
 	console::set_colors_enabled(enable_color);
 	console::set_colors_enabled_stderr(enable_color);
 
@@ -496,7 +497,7 @@ mod tests {
 	fn do_not_write_with_colors_on_tty_entrypoint() {
 		if env::var("ENABLE_LOGGING").is_ok() {
 			let _guard = init_logger("");
-			log::info!("{}", console::style(EXPECTED_LOG_MESSAGE).yellow().to_string());
+			log::info!("{}", console::style(EXPECTED_LOG_MESSAGE).yellow());
 		}
 	}