From f78e3c84c81631ec4ea7b6ccdfec76282a5f85cb Mon Sep 17 00:00:00 2001 From: "Aode (lion)" Date: Sun, 24 Oct 2021 20:37:59 -0500 Subject: [PATCH] Update tracing subscriber --- Cargo.lock | 87 +++++++++++++----------------------------------------- Cargo.toml | 13 ++++---- 2 files changed, 28 insertions(+), 72 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a2fe204..cc3cc5b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -416,18 +416,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "winapi", -] - [[package]] name = "clap" version = "2.33.3" @@ -711,9 +699,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c06815895acec637cd6ed6e9662c935b866d20a106f8361892893a7d9234964" +checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55" dependencies = [ "bytes", "fnv", @@ -765,9 +753,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" +checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ "bytes", "http", @@ -788,9 +776,9 @@ checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" [[package]] name = "hyper" -version = "0.14.13" +version = "0.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15d1cfb9e4f68655fa04c01f59edb405b6074a0f7118ea881e5026e4a1cd8593" +checksum = "2b91bb1f221b6ea1f1e4371216b70f40748774c2fb5971b450c07773fb92d26b" dependencies = [ "bytes", "futures-channel", @@ -900,9 +888,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2f96d100e1cf1929e7719b7edb3b90ab5298072638fccd77be9ce942ecdfce" +checksum = "869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013" [[package]] name = "local-channel" @@ -942,9 +930,9 @@ dependencies = [ [[package]] name = "matchers" -version = "0.0.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ "regex-automata", ] @@ -1013,25 +1001,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", -] - [[package]] name = "num_cpus" version = "1.13.0" @@ -1223,9 +1192,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "ppv-lite86" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741" +checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" [[package]] name = "proc-macro-error" @@ -1949,8 +1918,7 @@ dependencies = [ [[package]] name = "tracing-actix-web" version = "0.4.0-beta.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d25e8e2381e03c36530607daea5663488a21a1b75db0431cf9b961e9ca8a02" +source = "git+https://github.com/asonix/tracing-actix-web?branch=asonix/update-tracing-subscriber#378f35c89acf01956fbc2d5e0e7314377e15c11d" dependencies = [ "actix-web", "opentelemetry", @@ -1975,8 +1943,7 @@ dependencies = [ [[package]] name = "tracing-awc" version = "0.1.0-beta.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf90c391b9e519449554c325aea5ebfce3d0b525f193428250b0cb5389d6e13" +source = "git+https://git.asonix.dog/asonix/tracing-awc#858cb9c1ac1cac63c0462b7e4d1a5bbca8803db3" dependencies = [ "actix-http", "awc", @@ -2002,9 +1969,9 @@ dependencies = [ [[package]] name = "tracing-error" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4d7c0b83d4a500748fa5879461652b361edf5c9d51ede2a2ac03875ca185e24" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" dependencies = [ "tracing", "tracing-subscriber", @@ -2033,9 +2000,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599f388ecb26b28d9c1b2e4437ae019a7b336018b45ed911458cd9ebf91129f6" +checksum = "3ffbf13a0f8b054a4e59df3a173b818e9c6177c02789871f2073977fd0062076" dependencies = [ "opentelemetry", "tracing", @@ -2044,36 +2011,22 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "tracing-serde" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b" -dependencies = [ - "serde", - "tracing-core", -] - [[package]] name = "tracing-subscriber" -version = "0.2.25" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" +checksum = "5cf865b5ddc38e503a29c41c4843e616a73028ae18c637bc3eb2afaef4909c84" dependencies = [ "ansi_term 0.12.1", - "chrono", "lazy_static", "matchers", "regex", - "serde", - "serde_json", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", "tracing-log", - "tracing-serde", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b385d72..dbf399c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,20 +42,23 @@ tokio = { version = "1", default-features = false, features = ["fs", "io-util", tokio-uring = { version = "0.1", optional = true } tokio-util = { version = "0.6", default-features = false, features = ["codec"] } tracing = "0.1.15" -tracing-error = "0.1.2" +tracing-error = "0.2.0" tracing-futures = "0.2.4" tracing-log = "0.1.2" -tracing-opentelemetry = "0.15" -tracing-subscriber = { version = "0.2.5", features = ["fmt", "tracing-log"] } +tracing-opentelemetry = "0.16" +tracing-subscriber = { version = "0.3.0", features = ["env-filter", "fmt", "tracing-log"] } url = "2.2" uuid = { version = "0.8.2", features = ["v4", "serde"]} [dependencies.tracing-actix-web] version = "0.4.0-beta.15" default-features = false -features = ["emit_event_on_error", "opentelemetry_0_16"] +features = ["emit_event_on_error", "opentelemetry_0_16_tracing_subscriber_0_3"] +git = "https://github.com/asonix/tracing-actix-web" +branch = "asonix/update-tracing-subscriber" [dependencies.tracing-awc] version = "0.1.0-beta.5" default-features = false -features = ["emit_event_on_error", "opentelemetry_0_16"] +features = ["emit_event_on_error", "opentelemetry_0_16_tracing_subscriber_0_3"] +git = "https://git.asonix.dog/asonix/tracing-awc"