diff --git a/Cargo.lock b/Cargo.lock index 0fa05779d2..4d9846c125 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1514,7 +1514,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.6.9", "tonic 0.4.3", "tracing", "tracing-appender", @@ -1958,7 +1958,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util", + "tokio-util 0.6.9", "tracing", ] @@ -2458,7 +2458,7 @@ dependencies = [ "time", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.6.9", "tonic 0.6.2", "tracing", "tracing-appender", @@ -5024,7 +5024,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util", + "tokio-util 0.6.9", ] [[package]] @@ -5055,6 +5055,20 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-util" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + [[package]] name = "toml" version = "0.5.8" @@ -5086,7 +5100,7 @@ dependencies = [ "prost-derive 0.7.0", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.6.9", "tower", "tower-service", "tracing", @@ -5116,7 +5130,7 @@ dependencies = [ "prost-derive 0.9.0", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.6.9", "tower", "tower-layer", "tower-service", @@ -5151,7 +5165,7 @@ dependencies = [ "slab", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.6.9", "tower-layer", "tower-service", "tracing", @@ -5206,9 +5220,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.22" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23" +checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" dependencies = [ "lazy_static", "valuable", @@ -5226,9 +5240,9 @@ dependencies = [ [[package]] name = "tracing-gelf" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef407d785989f789a53a00c9a6196735ef6e407ae2bb20e0282b3b9dc271f66" +checksum = "e42df83d1aeae02b07db7a7758af84970fbe327cc6abc537c13da86899505e68" dependencies = [ "bytes", "futures-channel", @@ -5237,7 +5251,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tokio-util", + "tokio-util 0.7.1", "tracing-core", "tracing-futures", "tracing-subscriber", @@ -5563,7 +5577,7 @@ dependencies = [ "tokio-rustls 0.22.0", "tokio-stream", "tokio-tungstenite", - "tokio-util", + "tokio-util 0.6.9", "tower-service", "tracing", ] diff --git a/explorer/Cargo.toml b/explorer/Cargo.toml index 92f0e4887f..d216853bc6 100644 --- a/explorer/Cargo.toml +++ b/explorer/Cargo.toml @@ -25,7 +25,7 @@ url = "2.1.1" warp = {version = "0.3.1", features = ["tls"]} tracing = "0.1" tracing-futures = "0.2" -tracing-gelf = { version = "0.6", optional = true } +tracing-gelf = { version = "0.7", optional = true } tracing-subscriber = { version = "0.3", features = ["fmt", "json"] } tracing-appender = "0.2" tokio = { version = "^1.4", features = ["rt-multi-thread", "time", "sync", "rt", "signal", "test-util"] } diff --git a/jormungandr/Cargo.toml b/jormungandr/Cargo.toml index d1bcf695a4..23b8baa52a 100644 --- a/jormungandr/Cargo.toml +++ b/jormungandr/Cargo.toml @@ -47,7 +47,7 @@ time = { version = "0.3", features = ["macros"] } thiserror = "1.0.30" tracing = "0.1" tracing-futures = "0.2" -tracing-gelf = { version = "0.6", optional = true } +tracing-gelf = { version = "0.7", optional = true } # TODO unpin this when cross for ARM targets is fixed: https://github.com/cross-rs/cross/pull/591 tracing-journald = { version = "=0.2.0", optional = true } tracing-subscriber = { version = "0.3", features = ["fmt", "json", "time"] }