From a434d07ab18982eceff528c6e7f1e95a6f71bea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 18 Jul 2022 21:25:18 +0200
Subject: [PATCH] Disable the interest cache (#11854)

* Disable the interest cache

The feature is currently broken with the latest `tracing-core`. We will enable it again, when it is
fixed upstream.

* FMT
---
 Cargo.lock                                   | 8 +++-----
 client/tracing/Cargo.toml                    | 2 +-
 client/tracing/src/logging/mod.rs            | 5 +----
 primitives/io/Cargo.toml                     | 2 +-
 primitives/runtime-interface/test/Cargo.toml | 2 +-
 primitives/tracing/Cargo.toml                | 2 +-
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 791d8037f3335..279864e056b0b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11066,11 +11066,11 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.26"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
+checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7"
 dependencies = [
- "lazy_static",
+ "once_cell",
  "valuable",
 ]
 
@@ -11090,10 +11090,8 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
 dependencies = [
- "ahash",
  "lazy_static",
  "log",
- "lru",
  "tracing-core",
 ]
 
diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml
index 3f0bbbe922d3f..476e03ee741f3 100644
--- a/client/tracing/Cargo.toml
+++ b/client/tracing/Cargo.toml
@@ -26,7 +26,7 @@ rustc-hash = "1.1.0"
 serde = "1.0.136"
 thiserror = "1.0.30"
 tracing = "0.1.29"
-tracing-log = { version = "0.1.3", features = ["interest-cache"] }
+tracing-log = "0.1.3"
 tracing-subscriber = { version = "0.2.25", features = ["parking_lot"] }
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sc-rpc-server = { version = "4.0.0-dev", path = "../rpc-servers" }
diff --git a/client/tracing/src/logging/mod.rs b/client/tracing/src/logging/mod.rs
index 33c83dd87189e..58941617bfb6a 100644
--- a/client/tracing/src/logging/mod.rs
+++ b/client/tracing/src/logging/mod.rs
@@ -155,10 +155,7 @@ where
 	let max_level_hint = Layer::<FmtSubscriber>::max_level_hint(&env_filter);
 	let max_level = to_log_level_filter(max_level_hint);
 
-	tracing_log::LogTracer::builder()
-		.with_max_level(max_level)
-		.with_interest_cache(tracing_log::InterestCacheConfig::default())
-		.init()?;
+	tracing_log::LogTracer::builder().with_max_level(max_level).init()?;
 
 	// If we're only logging `INFO` entries then we'll use a simplified logging format.
 	let detailed_output = match max_level_hint {
diff --git a/primitives/io/Cargo.toml b/primitives/io/Cargo.toml
index 09a087d509416..03cd8535665ac 100644
--- a/primitives/io/Cargo.toml
+++ b/primitives/io/Cargo.toml
@@ -32,7 +32,7 @@ futures = { version = "0.3.21", features = ["thread-pool"], optional = true }
 parking_lot = { version = "0.12.0", optional = true }
 secp256k1 = { version = "0.21.2", features = ["recovery", "global-context"], optional = true }
 tracing = { version = "0.1.29", default-features = false }
-tracing-core = { version = "0.1.26", default-features = false}
+tracing-core = { version = "0.1.28", default-features = false}
 
 [features]
 default = ["std"]
diff --git a/primitives/runtime-interface/test/Cargo.toml b/primitives/runtime-interface/test/Cargo.toml
index e897fc0bab71c..880d03902b421 100644
--- a/primitives/runtime-interface/test/Cargo.toml
+++ b/primitives/runtime-interface/test/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 tracing = "0.1.29"
-tracing-core = "0.1.26"
+tracing-core = "0.1.28"
 sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
 sc-executor-common = { version = "0.10.0-dev", path = "../../../client/executor/common" }
 sp-io = { version = "6.0.0", path = "../../io" }
diff --git a/primitives/tracing/Cargo.toml b/primitives/tracing/Cargo.toml
index d305b756e2d68..c2ca57d2b5a43 100644
--- a/primitives/tracing/Cargo.toml
+++ b/primitives/tracing/Cargo.toml
@@ -23,7 +23,7 @@ codec = { version = "3.0.0", package = "parity-scale-codec", default-features =
 	"derive",
 ] }
 tracing = { version = "0.1.29", default-features = false }
-tracing-core = { version = "0.1.26", default-features = false }
+tracing-core = { version = "0.1.28", default-features = false }
 tracing-subscriber = { version = "0.2.25", optional = true, features = [
 	"tracing-log",
 ] }