diff --git a/Cargo.lock b/Cargo.lock index d8fce51..4e54457 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,14 +13,6 @@ dependencies = [ "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "arrayvec" version = "0.4.7" @@ -103,17 +95,6 @@ name = "cfg-if" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "chrono" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", - "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "cloudabi" version = "0.0.3" @@ -534,7 +515,7 @@ dependencies = [ "hyper 0.12.34 (registry+https://github.com/rust-lang/crates.io-index)", "linkerd2-error 0.1.0", "tower 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -544,7 +525,7 @@ dependencies = [ "linkerd2-dns-name 0.1.0", "ring 0.16.7 (registry+https://github.com/rust-lang/crates.io-index)", "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "webpki 0.21.0 (git+https://github.com/seanmonstar/webpki?branch=cert-dns-names-0.21)", ] @@ -559,7 +540,7 @@ dependencies = [ "hyper 0.12.34 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickcheck 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -571,7 +552,7 @@ dependencies = [ "opencensus-proto 0.1.0", "tokio 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "tower-grpc 0.1.0 (git+https://github.com/tower-rs/tower-grpc)", - "tracing 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -635,10 +616,10 @@ dependencies = [ "tower-service 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "tower-spawn-ready 0.1.0 (git+https://github.com/tower-rs/tower)", "tower-util 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tracing-futures 0.0.1-alpha.1 (registry+https://github.com/rust-lang/crates.io-index)", "tracing-log 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing-subscriber 0.1.1 (git+https://github.com/tokio-rs/tracing)", + "tracing-subscriber 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "trust-dns-resolver 0.10.2 (git+https://github.com/bluejekyll/trust-dns?rev=7c8a0739dad495bf5a4fddfe86b8bbe2aa52d060)", "try-lock 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -675,7 +656,7 @@ dependencies = [ "tokio-sync 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tower 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tower-grpc 0.1.0 (git+https://github.com/tower-rs/tower-grpc)", - "tracing 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -700,7 +681,7 @@ dependencies = [ "tokio 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "tower 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tower-util 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tracing-futures 0.0.1-alpha.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -715,7 +696,7 @@ dependencies = [ "linkerd2-task 0.1.0", "tokio 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "tower 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -726,7 +707,7 @@ dependencies = [ "linkerd2-error 0.1.0", "tokio 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "tower 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -735,7 +716,7 @@ version = "0.1.0" dependencies = [ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "tower 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -751,7 +732,7 @@ dependencies = [ "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "tower-load-shed 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tower-service 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -760,7 +741,7 @@ version = "0.1.0" dependencies = [ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-signal 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -784,7 +765,7 @@ dependencies = [ "tokio 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -798,15 +779,6 @@ dependencies = [ "tower-service 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "lock_api" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "log" version = "0.4.6" @@ -941,14 +913,6 @@ dependencies = [ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "num-integer" -version = "0.1.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "num-traits" version = "0.1.43" @@ -991,27 +955,6 @@ dependencies = [ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "parking_lot" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "parking_lot_core" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "percent-encoding" version = "1.0.1" @@ -1867,18 +1810,18 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "spin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing-attributes 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing-attributes 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tracing-attributes" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1887,7 +1830,7 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1901,7 +1844,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1911,24 +1854,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tracing-subscriber" -version = "0.1.1" -source = "git+https://github.com/tokio-rs/tracing#198e62a613e1fcf623e8f2c66e1192504f5e9b2f" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "matchers 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tracing-log 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2218,7 +2157,6 @@ dependencies = [ [metadata] "checksum adler32 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6cbd0b9af8587c72beadc9f72d35b9fbb070982c9e6203e46e93f10df25f8f45" "checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4" -"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" "checksum arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef" "checksum autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e5f34df7a019573fb8bdc7e24a2bfebe51a2a1d6bfdbaeccedb3c41fc574727" "checksum backtrace 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ebbbf59b1c43eefa8c3ede390fcc36820b4999f7914104015be25025e0d62af2" @@ -2231,7 +2169,6 @@ dependencies = [ "checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa" "checksum cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "b548a4ee81fccb95919d4e22cfea83c7693ebfd78f0495493178db20b3139da7" "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" -"checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum codegen 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bf02acd61125952ee148207cd411f9b73c9e218eab4b901375a82e1a443b6238" "checksum crc 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd5d02c0aac6bd68393ed69e00bbc2457f3e89075c6349db7189618dc4ddc1d7" @@ -2274,7 +2211,6 @@ dependencies = [ "checksum libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)" = "e962c7641008ac010fa60a7dfdc1712449f29c44ef2d4702394aea943ee75047" "checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939" "checksum linkerd2-proxy-api 0.1.8 (git+https://github.com/linkerd/linkerd2-proxy-api?rev=ddbc3a4f7f8b0058801f896d27974d19ee98094c)" = "" -"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" "checksum lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d06ff7ff06f729ce5f4e227876cb88d10bc59cd4ae1e09fbb2bde15c850dc21" "checksum matchers 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" @@ -2291,13 +2227,10 @@ dependencies = [ "checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2" "checksum nom 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf51a729ecf40266a2368ad335a5fdde43471f545a967109cd62146ecf8b66ff" "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" -"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" "checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" "checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30" "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" -"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" -"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" "checksum petgraph 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "7a7e5234c228fbfa874c86a77f685886127f82e0aef602ad1d48333fcac6ad61" "checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915" @@ -2383,12 +2316,12 @@ dependencies = [ "checksum tower-spawn-ready 0.1.0 (git+https://github.com/tower-rs/tower)" = "" "checksum tower-timeout 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "daa179ec4087589dc67148dc661abce5badc2c3ed4197adc7bd64b39f1f33c31" "checksum tower-util 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4792342fac093db5d2558655055a89a04ca909663467a4310c7739d9f8b64698" -"checksum tracing 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "701f355a504d1b7ae24eed42a19346701a8a3ac139058967895b6b1b56b13e64" -"checksum tracing-attributes 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5b43a1835d0cb99f4a36fcdd0f777f72e4d4ff2eb6e78a0e105ac25e41309efa" -"checksum tracing-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e94af5e2a5f1700cc58127f93d4b7e46c2b925856592066b9880aabce633b6d8" +"checksum tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c21ff9457accc293386c20e8f754d0b059e67e325edf2284f04230d125d7e5ff" +"checksum tracing-attributes 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5e27d1065a1de5d8ad2637e41fe14d3cd14363d4a20cb99090b9012004955637" +"checksum tracing-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "528c8ebaaa16cdac34795180b046c031775b0d56402704d98c096788f33d646a" "checksum tracing-futures 0.0.1-alpha.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08c7446f4fb35df7ba2c537b7e2f812f91b20a58aa2b846f028342c4d2429be0" "checksum tracing-log 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "652bc99e1286541d6ccc42d5fb37213d1cdde544f88b19fac3d94e3117b55163" -"checksum tracing-subscriber 0.1.1 (git+https://github.com/tokio-rs/tracing)" = "" +"checksum tracing-subscriber 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "90f01ec88a73a6da1127f03dc93e9745aacbeba16e5f33cfb91c7639f75932df" "checksum trust-dns-proto 0.6.0 (git+https://github.com/bluejekyll/trust-dns?rev=7c8a0739dad495bf5a4fddfe86b8bbe2aa52d060)" = "" "checksum trust-dns-resolver 0.10.2 (git+https://github.com/bluejekyll/trust-dns?rev=7c8a0739dad495bf5a4fddfe86b8bbe2aa52d060)" = "" "checksum try-lock 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "119b532a17fbe772d360be65617310164549a07c25a1deab04c84168ce0d4545" diff --git a/Cargo.toml b/Cargo.toml index 3156353..007a654 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -98,10 +98,9 @@ tower-grpc = { git = "https://github.com/tower-rs/tower-grpc", defau trust-dns-resolver = { git = "https://github.com/bluejekyll/trust-dns", rev = "7c8a0739dad495bf5a4fddfe86b8bbe2aa52d060", default-features = false } # tracing -tracing = "0.1.8" +tracing = "0.1.9" tracing-futures = "0.0.1-alpha.1" tracing-log = "0.1" -tracing-subscriber = "0.1.1" # tls ring = "0.16" @@ -110,6 +109,12 @@ rustls = "0.16" tokio-rustls = "0.10" untrusted = "0.7" +[dependencies.tracing-subscriber] +version = "0.1.2" +# we don't need ANSI colors or `chrono` time formatting +default-features = false +features = ["env-filter", "fmt", "smallvec", "tracing-log"] + [target.'cfg(target_os = "linux")'.dependencies] libc = "0.2" procinfo = "0.4.2" @@ -135,6 +140,4 @@ debug = false [patch.crates-io] webpki = { git = "https://github.com/seanmonstar/webpki", branch = "cert-dns-names-0.21" } -# this can be un-patched when `tracing-subscriber` 0.1.2 is released. -tracing-subscriber = { git = "https://github.com/tokio-rs/tracing" } diff --git a/src/logging.rs b/src/logging.rs index 8d114e8..05afb43 100644 --- a/src/logging.rs +++ b/src/logging.rs @@ -19,17 +19,17 @@ pub mod trace { use std::{env, fmt, str, time::Instant}; pub use tracing::*; use tracing_subscriber::{ - fmt::{format, Builder, Context}, - layer, + filter, + fmt::{format, Builder, Context, Formatter}, }; - pub use tracing_subscriber::{reload, Filter, FmtSubscriber}; + pub use tracing_subscriber::{reload, EnvFilter, FmtSubscriber}; - type SubscriberBuilder = Builder; - type Subscriber = FmtSubscriber; + type SubscriberBuilder = Builder; + type Subscriber = Formatter; #[derive(Clone)] pub struct LevelHandle { - inner: reload::Handle, + inner: reload::Handle, } /// Initialize tracing and logging with the value of the `ENV_LOG` @@ -45,7 +45,7 @@ pub mod trace { // Set up the subscriber let builder = subscriber_builder() - .with_filter(filter) + .with_env_filter(filter) .with_filter_reloading(); let handle = builder.reload_handle(); let dispatch = Dispatch::new(builder.finish()); @@ -121,7 +121,7 @@ pub mod trace { /// do not exercise the `proxy-log-level` endpoint. pub fn dangling() -> Self { let builder = subscriber_builder() - .with_filter(Filter::default()) + .with_env_filter(EnvFilter::default()) .with_filter_reloading(); let inner = builder.reload_handle(); LevelHandle { inner } @@ -129,7 +129,7 @@ pub mod trace { pub fn set_level(&self, level: impl AsRef) -> Result<(), Error> { let level = level.as_ref(); - let filter = level.parse::()?; + let filter = level.parse::()?; self.inner.reload(filter)?; info!(message = "set new log level", %level); Ok(())