From c664743e2dbae3e0dde7d5c40869e569c171f991 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 16 Oct 2023 07:13:53 -0700
Subject: [PATCH] Enable the `tracing-log` feature of tracing-subscriber

Otherwise the CLI no longer prints `log`-based logging messages.
---
 Cargo.lock                | 19 +++++++++++++++++++
 Cargo.toml                |  2 +-
 supply-chain/audits.toml  |  9 +++++++++
 supply-chain/imports.lock |  6 ++++++
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3b6e0bb5a7f0..f3ac99aa0a69 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2831,6 +2831,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
 dependencies = [
  "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
 ]
 
 [[package]]
@@ -2847,6 +2859,7 @@ dependencies = [
  "thread_local",
  "tracing",
  "tracing-core",
+ "tracing-log",
 ]
 
 [[package]]
@@ -2953,6 +2966,12 @@ dependencies = [
  "which",
 ]
 
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
 [[package]]
 name = "verify-component-adapter"
 version = "15.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index ec36b875ec19..6c784e1bb439 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -264,7 +264,7 @@ indexmap = "2.0.0"
 pretty_env_logger = "0.5.0"
 syn = "2.0.25"
 test-log = { version = "0.2", default-features = false, features = ["trace"] }
-tracing-subscriber = { version = "0.3.1", default-features = false, features = ['fmt', 'env-filter', 'ansi'] }
+tracing-subscriber = { version = "0.3.1", default-features = false, features = ['fmt', 'env-filter', 'ansi', 'tracing-log'] }
 url = "2.3.1"
 
 [features]
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index f03ba4690de3..70303719be62 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -2120,6 +2120,15 @@ This is a relatively minor set of releases with minor refactorings and bug
 fixes. Nothing fundamental was added in these changes.
 """
 
+[[audits.tracing-log]]
+who = "Alex Crichton <alex@alexcrichton.com>"
+criteria = "safe-to-deploy"
+version = "0.1.3"
+notes = """
+This is a standard adapter between the `log` ecosystem and the `tracing`
+ecosystem. There's one `unsafe` block in this crate and it's well-scoped.
+"""
+
 [[audits.tracing-subscriber]]
 who = "Pat Hickey <phickey@fastly.com>"
 criteria = "safe-to-deploy"
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index e80834140421..27558affd45e 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -1207,6 +1207,12 @@ criteria = "safe-to-deploy"
 version = "0.2.1"
 notes = "Single unsafe usage that looks sound, no ambient capabilities"
 
+[[audits.embark-studios.audits.valuable]]
+who = "Johan Andersson <opensource@embark-studios.com>"
+criteria = "safe-to-deploy"
+version = "0.1.0"
+notes = "No unsafe usage or ambient capabilities, sane build script"
+
 [[audits.embark-studios.audits.webpki-roots]]
 who = "Johan Andersson <opensource@embark-studios.com>"
 criteria = "safe-to-deploy"