From dcb774a35e38eb9f042d4952b77a1da79e06b418 Mon Sep 17 00:00:00 2001
From: Pat Hickey <pat@moreproductive.org>
Date: Tue, 2 Jun 2020 18:25:40 -0700
Subject: [PATCH] temporarily use tracing from git

---
 Cargo.lock                    | 44 ++++++++++++++++++++++++++++-------
 crates/wasi-common/Cargo.toml |  8 +++----
 crates/wiggle/Cargo.toml      |  2 +-
 3 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9c284f78f3..d462922d80 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2106,6 +2106,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "tracing"
+version = "0.1.14"
+source = "git+https://github.com/tokio-rs/tracing#180e494c7a13c0a18c09f3c7b465e8734c51f5e2"
+dependencies = [
+ "cfg-if",
+ "log",
+ "tracing-attributes 0.1.8 (git+https://github.com/tokio-rs/tracing)",
+ "tracing-core 0.1.10 (git+https://github.com/tokio-rs/tracing)",
+]
+
 [[package]]
 name = "tracing"
 version = "0.1.14"
@@ -2113,9 +2124,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7c6b59d116d218cb2d990eb06b77b64043e0268ef7323aae63d8b30ae462923"
 dependencies = [
  "cfg-if",
- "log",
- "tracing-attributes",
- "tracing-core",
+ "tracing-attributes 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tracing-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.8"
+source = "git+https://github.com/tokio-rs/tracing#180e494c7a13c0a18c09f3c7b465e8734c51f5e2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -2129,6 +2149,14 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "tracing-core"
+version = "0.1.10"
+source = "git+https://github.com/tokio-rs/tracing#180e494c7a13c0a18c09f3c7b465e8734c51f5e2"
+dependencies = [
+ "lazy_static",
+]
+
 [[package]]
 name = "tracing-core"
 version = "0.1.10"
@@ -2146,7 +2174,7 @@ checksum = "5e0f8c7178e13481ff6765bd169b33e8d554c5d2bbede5e32c356194be02b9b9"
 dependencies = [
  "lazy_static",
  "log",
- "tracing-core",
+ "tracing-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2156,7 +2184,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6ccba2f8f16e0ed268fc765d9b7ff22e965e7185d32f8f1ec8294fe17d86e79"
 dependencies = [
  "serde",
- "tracing-core",
+ "tracing-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2174,7 +2202,7 @@ dependencies = [
  "serde_json",
  "sharded-slab",
  "smallvec",
- "tracing-core",
+ "tracing-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tracing-log",
  "tracing-serde",
 ]
@@ -2624,7 +2652,7 @@ version = "0.17.0"
 dependencies = [
  "proptest",
  "thiserror",
- "tracing",
+ "tracing 0.1.14 (git+https://github.com/tokio-rs/tracing)",
  "wiggle-macro",
  "wiggle-test",
  "witx",
@@ -2660,7 +2688,7 @@ dependencies = [
  "env_logger 0.7.1",
  "proptest",
  "thiserror",
- "tracing",
+ "tracing 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "tracing-subscriber",
  "wiggle",
 ]
diff --git a/crates/wasi-common/Cargo.toml b/crates/wasi-common/Cargo.toml
index c24127a33d..9a8f46db3e 100644
--- a/crates/wasi-common/Cargo.toml
+++ b/crates/wasi-common/Cargo.toml
@@ -41,10 +41,10 @@ maintenance = { status = "actively-developed" }
 
 [features]
 default = ["trace_log"]
-# This feature enables `log::trace` calls in syscalls shims, in effect
-# emulating something like `strace`. This feature is an opt-out and hence
-# enabled by default.
-trace_log = []
+# This feature enables the `tracing` logs in the calls to target the `log`
+# ecosystem of backends (e.g. `env_logger`. Disable this if you want to use
+# `tracing-subscriber`.
+trace_log = [ "wiggle/tracing_log" ]
 # Need to make the wiggle_metadata feature available to consumers of this
 # crate if they want the snapshots to have metadata available.
 wiggle_metadata = ["wiggle/wiggle_metadata"]
diff --git a/crates/wiggle/Cargo.toml b/crates/wiggle/Cargo.toml
index 838e2a42f5..7168c568f2 100644
--- a/crates/wiggle/Cargo.toml
+++ b/crates/wiggle/Cargo.toml
@@ -14,7 +14,7 @@ include = ["src/**/*", "LICENSE"]
 thiserror = "1"
 witx = { path = "../wasi-common/WASI/tools/witx", version = "0.8.5", optional = true }
 wiggle-macro = { path = "macro", version = "0.17.0" }
-tracing = { version = "0.1.14" }
+tracing = {  git = "https://github.com/tokio-rs/tracing" }
 
 [badges]
 maintenance = { status = "actively-developed" }