From 9b294a0ed70caa88c444f9f52cfb1f1fa572a7f0 Mon Sep 17 00:00:00 2001
From: Andres Suarez <asuarez@meta.com>
Date: Mon, 13 Nov 2023 18:18:35 -0800
Subject: [PATCH] Update (and unfork) tracing from 0.1.37 to 0.1.40

Summary:
Replaces the various `tracing` forks for [tokio-rs/tracing#2407] with
crates-io releases containing those changes.

[tokio-rs/tracing#2407]: https://github.com/tokio-rs/tracing/pull/2407

Reviewed By: capickett, davidbarsky

Differential Revision: D51266382

fbshipit-source-id: 5ad0b7b9477e5fa450e52c639357fe485e0e89ff
---
 Cargo.toml                                                 | 7 -------
 shed/justknobs_stub/cached_config_thrift_struct/Cargo.toml | 2 +-
 shed/tokio-uds-compat/Cargo.toml                           | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d92ad679b..4e62684a0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,13 +8,6 @@ lru-disk-cache = { git = "https://github.com/mozilla/sccache", rev = "fdbf843d17
 perf-event = { version = "0.4", git = "https://github.com/krallin/perf-event.git", rev = "86224a9bc025d5d19f719542f27c8c629a08b167" }
 perf-event-open-sys = { version = "4.0", git = "https://github.com/krallin/perf-event.git", rev = "86224a9bc025d5d19f719542f27c8c629a08b167" }
 quickcheck = { git = "https://github.com/jakoschiko/quickcheck", rev = "6ecdf5bb4b0132ce66670b4d46453aa022ea892c" }
-tracing = { git = "https://github.com/fbsource/tracing.git", rev = "3399637795795560a073fc60a2e6cfa67b8421f1" }
-tracing-appender = { git = "https://github.com/fbsource/tracing.git", rev = "3399637795795560a073fc60a2e6cfa67b8421f1" }
-tracing-core = { git = "https://github.com/fbsource/tracing.git", rev = "3399637795795560a073fc60a2e6cfa67b8421f1" }
-tracing-futures = { git = "https://github.com/fbsource/tracing.git", rev = "3399637795795560a073fc60a2e6cfa67b8421f1" }
-tracing-log = { git = "https://github.com/fbsource/tracing.git", rev = "3399637795795560a073fc60a2e6cfa67b8421f1" }
-tracing-serde = { git = "https://github.com/fbsource/tracing.git", rev = "3399637795795560a073fc60a2e6cfa67b8421f1" }
-tracing-subscriber = { git = "https://github.com/fbsource/tracing.git", rev = "3399637795795560a073fc60a2e6cfa67b8421f1" }
 
 [workspace]
 members = [
diff --git a/shed/justknobs_stub/cached_config_thrift_struct/Cargo.toml b/shed/justknobs_stub/cached_config_thrift_struct/Cargo.toml
index e70079b3b..5a98e6d4f 100644
--- a/shed/justknobs_stub/cached_config_thrift_struct/Cargo.toml
+++ b/shed/justknobs_stub/cached_config_thrift_struct/Cargo.toml
@@ -25,7 +25,7 @@ futures = { version = "0.3.28", features = ["async-await", "compat"] }
 just_knobs_struct__types = { package = "just_knobs_struct_types", version = "0.1.0", path = "types" }
 ref-cast = "1.0.18"
 thiserror = "1.0.43"
-tracing = "0.1.35"
+tracing = "0.1.40"
 tracing-futures = { version = "0.2.5", features = ["futures-03"] }
 
 [build-dependencies]
diff --git a/shed/tokio-uds-compat/Cargo.toml b/shed/tokio-uds-compat/Cargo.toml
index f0ff82517..0c9b35400 100644
--- a/shed/tokio-uds-compat/Cargo.toml
+++ b/shed/tokio-uds-compat/Cargo.toml
@@ -19,5 +19,5 @@ futures = { version = "0.3.28", features = ["async-await", "compat"] }
 [target.'cfg(target_os = "windows")'.dependencies]
 async-io = "1.4.1"
 futures = { version = "0.3.28", features = ["async-await", "compat"] }
-tracing = "0.1.35"
+tracing = "0.1.40"
 uds_windows = "1.0.1"