diff --git a/Cargo.lock b/Cargo.lock index 49fe62bdfdee8..4ab375c3e4eb3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -718,7 +718,7 @@ dependencies = [ "percent-encoding", "pin-project 1.0.10", "tokio", - "tokio-util", + "tokio-util 0.6.9", "tracing 0.1.29", ] @@ -1041,7 +1041,7 @@ dependencies = [ "serde_urlencoded 0.7.0", "thiserror", "tokio", - "tokio-util", + "tokio-util 0.6.9", "url", "webpki-roots 0.21.1", "winapi 0.3.9", @@ -1127,9 +1127,9 @@ dependencies = [ "temp-dir", "tempdir", "tokio", - "tokio-stream", + "tokio-stream 0.1.8 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", "tokio-test", - "tokio-util", + "tokio-util 0.7.0", "tracing 0.1.29", "tracing-fluent-assertions", "tracing-subscriber", @@ -1425,7 +1425,7 @@ dependencies = [ "memchr", "pin-project-lite", "tokio", - "tokio-util", + "tokio-util 0.6.9", ] [[package]] @@ -1475,7 +1475,7 @@ dependencies = [ "serde_json", "thread_local", "tokio", - "tokio-stream", + "tokio-stream 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tonic", "tracing 0.1.29", "tracing-core 0.1.21", @@ -2859,7 +2859,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util", + "tokio-util 0.6.9", "tracing 0.1.29", ] @@ -4182,7 +4182,7 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls 0.22.0", - "tokio-util", + "tokio-util 0.6.9", "trust-dns-proto", "trust-dns-resolver", "typed-builder 0.9.1", @@ -5433,7 +5433,7 @@ dependencies = [ "regex", "tokio", "tokio-native-tls", - "tokio-util", + "tokio-util 0.6.9", "url", ] @@ -5733,7 +5733,7 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-native-tls", - "tokio-util", + "tokio-util 0.6.9", "url", ] @@ -5850,7 +5850,7 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls 0.23.1", - "tokio-util", + "tokio-util 0.6.9", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -7477,8 +7477,7 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838" +source = "git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5#49192be3de9fbac56b3db026a438640f0b27f0e5" dependencies = [ "bytes 1.1.0", "libc", @@ -7518,8 +7517,7 @@ dependencies = [ [[package]] name = "tokio-macros" version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +source = "git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5#49192be3de9fbac56b3db026a438640f0b27f0e5" dependencies = [ "proc-macro2 1.0.32", "quote 1.0.10", @@ -7568,7 +7566,7 @@ dependencies = [ "postgres-types", "socket2 0.4.2", "tokio", - "tokio-util", + "tokio-util 0.6.9", ] [[package]] @@ -7602,7 +7600,17 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util", +] + +[[package]] +name = "tokio-stream" +version = "0.1.8" +source = "git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5#49192be3de9fbac56b3db026a438640f0b27f0e5" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", + "tokio-util 0.7.0", ] [[package]] @@ -7615,7 +7623,7 @@ dependencies = [ "bytes 1.1.0", "futures-core", "tokio", - "tokio-stream", + "tokio-stream 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7651,6 +7659,19 @@ name = "tokio-util" version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +dependencies = [ + "bytes 1.1.0", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.0" +source = "git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5#49192be3de9fbac56b3db026a438640f0b27f0e5" dependencies = [ "bytes 1.1.0", "futures-core", @@ -7693,8 +7714,8 @@ dependencies = [ "prost-derive 0.9.0", "tokio", "tokio-rustls 0.22.0", - "tokio-stream", - "tokio-util", + "tokio-stream 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.6.9", "tower", "tower-layer", "tower-service", @@ -7728,8 +7749,8 @@ dependencies = [ "rand 0.8.4", "slab", "tokio", - "tokio-stream", - "tokio-util", + "tokio-stream 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.6.9", "tower-layer", "tower-service", "tracing 0.1.29", @@ -8422,9 +8443,9 @@ dependencies = [ "tokio", "tokio-openssl", "tokio-postgres", - "tokio-stream", + "tokio-stream 0.1.8 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", "tokio-test", - "tokio-util", + "tokio-util 0.7.0", "toml", "tonic", "tonic-build", @@ -8473,7 +8494,7 @@ dependencies = [ "serde", "serde_json", "tokio", - "tokio-stream", + "tokio-stream 0.1.8 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", "tokio-tungstenite 0.13.0", "url", "uuid", @@ -8552,9 +8573,9 @@ dependencies = [ "snafu", "substring", "tokio", - "tokio-stream", + "tokio-stream 0.1.8 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", "tokio-test", - "tokio-util", + "tokio-util 0.7.0", "toml", "tower", "tracing 0.1.29", @@ -8804,9 +8825,9 @@ dependencies = [ "serde_json", "serde_urlencoded 0.7.0", "tokio", - "tokio-stream", + "tokio-stream 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-tungstenite 0.15.0", - "tokio-util", + "tokio-util 0.6.9", "tower-service", "tracing 0.1.29", ] diff --git a/Cargo.toml b/Cargo.toml index 2da881467fe67..aca8c0db82f19 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -117,10 +117,10 @@ vector-vrl-functions = { path = "lib/vector-vrl-functions" } async-stream = "0.3.2" async-trait = "0.1.52" futures = { version = "0.3.19", default-features = false, features = ["compat", "io-compat"], package = "futures" } -tokio = { version = "1.15.0", default-features = false, features = ["full"] } -tokio-openssl = { version = "0.6.3", default-features = false } -tokio-stream = { version = "0.1.8", default-features = false, features = ["net", "sync", "time"] } -tokio-util = { version = "0.6", default-features = false, features = ["time"] } +tokio = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", default-features = true, features = ["full"] } +tokio-openssl = { version = "0.6.3", default-features = true } +tokio-stream = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", default-features = true, features = ["net", "sync", "time"] } +tokio-util = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", default-features = true, features = ["time", "codec"] } console-subscriber = { version = "0.1.0", optional = true } # Tracing @@ -328,7 +328,7 @@ pretty_assertions = "1.0.0" reqwest = { version = "0.11.9", features = ["json"] } proptest = "1.0" tempfile = "3.2.0" -tokio = { version = "1.15.0", features = ["test-util"] } +tokio = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", features = ["test-util"] } tokio-test = "0.4.2" tower-test = "0.4.0" vector_core = { path = "lib/vector-core", default-features = false, features = ["vrl", "test"] } @@ -346,6 +346,7 @@ leveldb-sys = { git = "https://github.com/vectordotdev/leveldb-sys.git", branch # Removes dependency on `time` v0.1 # https://github.com/chronotope/chrono/pull/578 chrono = { git = "https://github.com/vectordotdev/chrono.git", branch = "no-default-time" } +tokio = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5" } [features] # Default features for *-unknown-linux-gnu and *-apple-darwin diff --git a/lib/k8s-e2e-tests/Cargo.toml b/lib/k8s-e2e-tests/Cargo.toml index a38abe78580bf..38e18fa73f993 100644 --- a/lib/k8s-e2e-tests/Cargo.toml +++ b/lib/k8s-e2e-tests/Cargo.toml @@ -14,7 +14,7 @@ k8s-test-framework = { version = "0.1", path = "../k8s-test-framework" } regex = "1" reqwest = { version = "0.11.9", features = ["json"] } serde_json = "1" -tokio = { version = "1.15.0", features = ["full"] } +tokio = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", features = ["full"] } indoc = "1.0.3" env_logger = "0.9" tracing = { version = "0.1", features = ["log"] } diff --git a/lib/k8s-test-framework/Cargo.toml b/lib/k8s-test-framework/Cargo.toml index 0a2807b10fbc5..e8541c38660ea 100644 --- a/lib/k8s-test-framework/Cargo.toml +++ b/lib/k8s-test-framework/Cargo.toml @@ -12,5 +12,5 @@ k8s-openapi = { version = "0.13.1", default-features = false, features = ["v1_16 once_cell = "1" serde_json = "1" tempfile = "3" -tokio = { version = "1.15.0", features = ["full"] } +tokio = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", features = ["full"] } log = "0.4" diff --git a/lib/vector-api-client/Cargo.toml b/lib/vector-api-client/Cargo.toml index 86154f1ce2dc6..c1bf17b8102e0 100644 --- a/lib/vector-api-client/Cargo.toml +++ b/lib/vector-api-client/Cargo.toml @@ -19,8 +19,8 @@ anyhow = "1.0.52" async-stream = "0.3.2" async-trait = "0.1" futures = { version = "0.3", default-features = false, features = ["compat", "io-compat"] } -tokio = { version = "1.15.0", features = ["full"] } -tokio-stream = { version = "0.1.8", features = ["sync"] } +tokio = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", features = ["full"] } +tokio-stream = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", features = ["sync"] } # GraphQL graphql_client = "0.10.0" diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml index c15d6352f5a51..7a92bc94a3059 100644 --- a/lib/vector-core/Cargo.toml +++ b/lib/vector-core/Cargo.toml @@ -44,9 +44,9 @@ serde_json = { version = "1.0.74", default-features = false } shared = { path = "../shared" } snafu = { version = "0.7.0", default-features = false } substring = { version = "1.4", default-features = false } -tokio = { version = "1.15.0", default-features = false } -tokio-stream = { version = "0.1", default-features = false, optional = true } -tokio-util = { version = "0.6", default-features = false, features = ["time"] } +tokio = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", default-features = false } +tokio-stream = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", default-features = false, optional = true } +tokio-util = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", default-features = false, features = ["time"] } toml = { version = "0.5.8", default-features = false } tower = { version = "0.4", default-features = false, features = ["util"] } tracing = { version = "0.1.29", default-features = false } diff --git a/lib/vector-core/buffers/Cargo.toml b/lib/vector-core/buffers/Cargo.toml index 3a3a9d80ec5e5..08adcf9c555b1 100644 --- a/lib/vector-core/buffers/Cargo.toml +++ b/lib/vector-core/buffers/Cargo.toml @@ -24,9 +24,9 @@ pin-project = { version = "1.0.10", default-features = false } rkyv = { version = "0.7.29", default-features = false, features = ["size_32", "std", "strict", "validation"] } serde = { version = "1.0.133", default-features = false, features = ["derive"] } snafu = { version = "0.7.0", default-features = false, features = ["std"] } -tokio = { version = "1.15.0", default-features = false, features = ["rt", "macros", "rt-multi-thread", "sync", "fs", "io-util", "time"] } -tokio-stream = { version = "0.1", default-features = false, features = ["sync"] } -tokio-util = { version = "0.6", default-features = false } +tokio = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", features = ["rt", "macros", "rt-multi-thread", "sync", "fs", "io-util", "time"] } +tokio-stream = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", default-features = false, features = ["sync"] } +tokio-util = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", default-features = false } tracing = { version = "0.1.29", default-features = false } [dev-dependencies]