diff --git a/Cargo.lock b/Cargo.lock index 313e3c3344c8f..fcfdfc0dd04df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2923,9 +2923,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" +checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" dependencies = [ "libc", "log", @@ -6367,10 +6367,11 @@ dependencies = [ [[package]] name = "tokio" -version = "1.19.2" +version = "1.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" +checksum = "0020c875007ad96677dcc890298f4b942882c5d4eb7cc8f439fc3bf813dc9c95" dependencies = [ + "autocfg", "bytes", "libc", "memchr", diff --git a/src/adapter/Cargo.toml b/src/adapter/Cargo.toml index 9be4fc2d2763b..ecd91b1e4899b 100644 --- a/src/adapter/Cargo.toml +++ b/src/adapter/Cargo.toml @@ -48,7 +48,7 @@ semver = "1.0.13" serde = "1.0.144" serde_json = "1.0.85" timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode"] } -tokio = { version = "1.19.2", features = ["rt", "time"] } +tokio = { version = "1.21.1", features = ["rt", "time"] } tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } tokio-stream = "0.1.9" tracing = "0.1.36" diff --git a/src/billing-demo/Cargo.toml b/src/billing-demo/Cargo.toml index c13ff3c61aa16..ab0afab7a5109 100644 --- a/src/billing-demo/Cargo.toml +++ b/src/billing-demo/Cargo.toml @@ -17,7 +17,7 @@ prost = { version = "0.11.0", features = ["no-recursion-limit"] } prost-types = "0.11.1" rand = "0.8.5" rand_distr = "0.4.3" -tokio = "1.19.2" +tokio = "1.21.1" tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } tracing = "0.1.36" tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/src/ccsr/Cargo.toml b/src/ccsr/Cargo.toml index 11f18a7bfe403..458792b309a4e 100644 --- a/src/ccsr/Cargo.toml +++ b/src/ccsr/Cargo.toml @@ -20,7 +20,7 @@ hyper = { version = "0.14.20", features = ["server"] } once_cell = "1.13.1" mz-ore = { path = "../ore", features = ["task"] } serde_json = "1.0.85" -tokio = { version = "1.19.2", features = ["macros"] } +tokio = { version = "1.21.1", features = ["macros"] } tracing = "0.1.36" [build-dependencies] diff --git a/src/compute-client/Cargo.toml b/src/compute-client/Cargo.toml index 2cb7d12a52da2..6bae3648da3ca 100644 --- a/src/compute-client/Cargo.toml +++ b/src/compute-client/Cargo.toml @@ -29,7 +29,7 @@ prost = { version = "0.11.0", features = ["no-recursion-limit"] } serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.85" timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode"] } -tokio = "1.19.2" +tokio = "1.21.1" tokio-stream = "0.1.9" tonic = "0.8.0" tracing = "0.1.36" diff --git a/src/compute/Cargo.toml b/src/compute/Cargo.toml index 5447cb71a9b8d..f4ab8c52122f6 100644 --- a/src/compute/Cargo.toml +++ b/src/compute/Cargo.toml @@ -32,7 +32,7 @@ prometheus = { version = "0.13.1", default-features = false } scopeguard = "1.1.0" serde = { version = "1.0.144", features = ["derive"] } timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode"] } -tokio = { version = "1.19.2", features = ["fs", "rt", "sync"] } +tokio = { version = "1.21.1", features = ["fs", "rt", "sync"] } tracing = "0.1.36" uuid = { version = "1.1.2", features = ["serde", "v4"] } diff --git a/src/controller/Cargo.toml b/src/controller/Cargo.toml index 9929645749bdb..8943c83e83d65 100644 --- a/src/controller/Cargo.toml +++ b/src/controller/Cargo.toml @@ -26,6 +26,6 @@ prost = { version = "0.11.0", features = ["no-recursion-limit"] } regex = "1.6.0" serde = { version = "1.0.144", features = ["derive"] } timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode"] } -tokio = "1.19.2" +tokio = "1.21.1" tracing = "0.1.36" uuid = { version = "1.1.2" } diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml index 0b56f2497f1ab..f57471cac6a16 100644 --- a/src/environmentd/Cargo.toml +++ b/src/environmentd/Cargo.toml @@ -63,7 +63,7 @@ sysctl = "0.5.2" sysinfo = "0.25.3" tempfile = "3.2.0" thiserror = "1.0.32" -tokio = { version = "1.19.2", features = ["sync"] } +tokio = { version = "1.21.1", features = ["sync"] } tokio-openssl = "0.6.3" tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } tokio-stream = { version = "0.1.9", features = ["net"] } diff --git a/src/frontegg-auth/Cargo.toml b/src/frontegg-auth/Cargo.toml index 5b338f051e170..7831c7120c51b 100644 --- a/src/frontegg-auth/Cargo.toml +++ b/src/frontegg-auth/Cargo.toml @@ -15,6 +15,6 @@ mz-ore = { path = "../ore" } reqwest = "0.11.11" serde = { version = "1.0.144", features = ["derive"] } thiserror = "1.0.32" -tokio = "1.19.2" +tokio = "1.21.1" tracing = "0.1.36" uuid = "1.1.2" diff --git a/src/interchange/Cargo.toml b/src/interchange/Cargo.toml index 709fd41481827..9e0fd89f2391c 100644 --- a/src/interchange/Cargo.toml +++ b/src/interchange/Cargo.toml @@ -34,7 +34,7 @@ uuid = { version = "1.1.2", features = ["serde"] } [dev-dependencies] criterion = { git = "https://github.com/bheisler/criterion.rs.git", branch = "version-0.4", features = ["async_tokio"] } -tokio = { version = "1.19.2", features = ["macros"] } +tokio = { version = "1.21.1", features = ["macros"] } [build-dependencies] prost-build = "0.11.1" diff --git a/src/kafka-util/Cargo.toml b/src/kafka-util/Cargo.toml index bc941a254de42..a186b6b977488 100644 --- a/src/kafka-util/Cargo.toml +++ b/src/kafka-util/Cargo.toml @@ -23,7 +23,7 @@ rand = "0.8.5" rdkafka = { git = "https://github.com/fede1024/rust-rdkafka.git", features = ["cmake-build", "ssl-vendored", "libz-static", "zstd"] } serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.85" -tokio = { version = "1.19.2", features = ["macros"] } +tokio = { version = "1.21.1", features = ["macros"] } thiserror = "1.0.32" tracing = "0.1.36" url = "2.2.2" diff --git a/src/mz/Cargo.toml b/src/mz/Cargo.toml index 6b920e2f6af37..af8c48731df95 100644 --- a/src/mz/Cargo.toml +++ b/src/mz/Cargo.toml @@ -10,7 +10,7 @@ publish = false [dependencies] serde = { version = "1.0.144", features = ["derive"] } clap = { version = "3.2.17", features = [ "derive" ] } -tokio = { version = "1.19.2", features = ["full"] } +tokio = { version = "1.21.1", features = ["full"] } open = "3.0.2" axum = "0.5.15" rpassword = "7.0" diff --git a/src/orchestrator-process/Cargo.toml b/src/orchestrator-process/Cargo.toml index 692fbd22d43a9..1ea79bf6f3bef 100644 --- a/src/orchestrator-process/Cargo.toml +++ b/src/orchestrator-process/Cargo.toml @@ -21,7 +21,7 @@ mz-secrets = { path = "../secrets" } serde_json = "1.0.85" scopeguard = "1.1.0" sysinfo = "0.25.3" -tokio = { version = "1.19.2", features = ["process"] } +tokio = { version = "1.21.1", features = ["process"] } tracing = "0.1.36" [dev-dependencies] diff --git a/src/ore/Cargo.toml b/src/ore/Cargo.toml index 9b44b0a64fdad..ef94c35c0ec10 100644 --- a/src/ore/Cargo.toml +++ b/src/ore/Cargo.toml @@ -34,7 +34,7 @@ stacker = { version = "0.1.15", optional = true } serde = { version = "1.0.144", features = ["derive"], optional = true } serde_json = { version = "1.0.82", optional = true } ssh-key = { version = "0.4.2", optional = true } -tokio = { version = "1.19.2", features = ["io-util", "net", "rt-multi-thread", "time"], optional = true } +tokio = { version = "1.21.1", features = ["io-util", "net", "rt-multi-thread", "time"], optional = true } tokio-openssl = { version = "0.6.3", optional = true } # TODO(guswynn): determine, when, if ever, we can remove `tracing-log` # The `tracing-log` feature here is load-bearing: While our busiest-logging dependency (`rdkafka`) is now hooked-up @@ -60,7 +60,7 @@ opentelemetry-otlp = { git = "https://github.com/MaterializeInc/opentelemetry-ru console-subscriber = { version = "0.1.7", optional = true } [dev-dependencies] -tokio = { version = "1.19.2", features = ["macros"] } +tokio = { version = "1.21.1", features = ["macros"] } [features] default = ["network", "chrono", "cli", "metrics", "stack", "test"] diff --git a/src/persist-client/Cargo.toml b/src/persist-client/Cargo.toml index 71edeba8a2e87..a2efd5e54d15f 100644 --- a/src/persist-client/Cargo.toml +++ b/src/persist-client/Cargo.toml @@ -48,7 +48,7 @@ prost = { version = "0.11.0", features = ["no-recursion-limit"] } semver = "1.0.13" serde = { version = "1.0.144", features = ["derive"] } timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode"] } -tokio = { version = "1.19.2", default-features = false, features = ["macros", "sync", "rt", "rt-multi-thread", "time"] } +tokio = { version = "1.21.1", default-features = false, features = ["macros", "sync", "rt", "rt-multi-thread", "time"] } tracing = "0.1.36" uuid = { version = "1.1.2", features = ["v4"] } diff --git a/src/persist/Cargo.toml b/src/persist/Cargo.toml index 23e75c5c24d1b..807f97d0fa295 100644 --- a/src/persist/Cargo.toml +++ b/src/persist/Cargo.toml @@ -44,7 +44,7 @@ prost = { version = "0.11.0", features = ["no-recursion-limit"] } rand = { version = "0.8.5", features = ["small_rng"] } serde = { version = "1.0.144", features = ["derive"] } timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode"] } -tokio = { version = "1.19.2", default-features = false, features = ["fs", "macros", "sync", "rt", "rt-multi-thread"] } +tokio = { version = "1.21.1", default-features = false, features = ["fs", "macros", "sync", "rt", "rt-multi-thread"] } tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } tracing = "0.1.36" url = "2.2.2" diff --git a/src/pgwire/Cargo.toml b/src/pgwire/Cargo.toml index d9864720daf5f..54baaa2c2103e 100644 --- a/src/pgwire/Cargo.toml +++ b/src/pgwire/Cargo.toml @@ -23,7 +23,7 @@ mz-repr = { path = "../repr" } mz-sql = { path = "../sql" } openssl = { version = "0.10.41", features = ["vendored"] } postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } -tokio = "1.19.2" +tokio = "1.21.1" tokio-openssl = "0.6.3" tokio-util = { version = "0.7.3", features = ["codec"] } tracing = "0.1.36" diff --git a/src/postgres-util/Cargo.toml b/src/postgres-util/Cargo.toml index 68798e9f1afe0..251c85c4e2eca 100644 --- a/src/postgres-util/Cargo.toml +++ b/src/postgres-util/Cargo.toml @@ -16,7 +16,7 @@ postgres-openssl = { git = "https://github.com/MaterializeInc/rust-postgres" } proptest = { git = "https://github.com/MaterializeInc/proptest.git", default-features = false, features = ["std"]} prost = { version = "0.11.0", features = ["no-recursion-limit"] } serde = { version = "1.0.144", features = ["derive"] } -tokio = { version = "1.19.2", features = ["fs", "rt", "sync"] } +tokio = { version = "1.21.1", features = ["fs", "rt", "sync"] } tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } [build-dependencies] diff --git a/src/prof/Cargo.toml b/src/prof/Cargo.toml index 5cd9bb5f88d34..6cd4e9b2aed77 100644 --- a/src/prof/Cargo.toml +++ b/src/prof/Cargo.toml @@ -23,7 +23,7 @@ pprof = { git = "https://github.com/MaterializeInc/pprof-rs.git" } serde = { version = "1.0.144", features = ["derive"] } tempfile = "3.2.0" tracing = "0.1.36" -tokio = { version = "1.19.2", features = ["time"] } +tokio = { version = "1.21.1", features = ["time"] } [target.'cfg(not(target_os = "macos"))'.dependencies] tikv-jemalloc-ctl = { version = "0.4.1", features = ["use_std"], optional = true } diff --git a/src/s3-datagen/Cargo.toml b/src/s3-datagen/Cargo.toml index e0ee2af84dd52..c25fefdd64f3a 100644 --- a/src/s3-datagen/Cargo.toml +++ b/src/s3-datagen/Cargo.toml @@ -15,6 +15,6 @@ clap = { version = "3.2.17", features = ["derive"] } futures = "0.3.23" indicatif = "0.17.0" mz-ore = { path = "../ore" } -tokio = { version = "1.19.2", features = ["macros", "net", "rt", "time"] } +tokio = { version = "1.21.1", features = ["macros", "net", "rt", "time"] } tracing = "0.1.36" tracing-subscriber = { version = "0.3.15", default-features = false, features = ["env-filter", "fmt"] } diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml index 19e004ebc5b3a..047477e5092a4 100644 --- a/src/service/Cargo.toml +++ b/src/service/Cargo.toml @@ -21,7 +21,7 @@ mz-orchestrator-process = { path = "../orchestrator-process" } mz-orchestrator-kubernetes = { path = "../orchestrator-kubernetes" } once_cell = "1.13.1" semver = "1.0.13" -tokio = "1.19.2" +tokio = "1.21.1" tokio-stream = "0.1.9" tonic = "0.8.0" tower = "0.4.13" diff --git a/src/sql/Cargo.toml b/src/sql/Cargo.toml index 3cfcd2608a720..6dff60d9e3bae 100644 --- a/src/sql/Cargo.toml +++ b/src/sql/Cargo.toml @@ -38,7 +38,7 @@ regex = "1.6.0" reqwest = "0.11.11" serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.85" -tokio = { version = "1.19.2", features = ["fs"] } +tokio = { version = "1.21.1", features = ["fs"] } tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["serde"] } tracing = "0.1.36" typemap_rev = "0.1.5" diff --git a/src/sqllogictest/Cargo.toml b/src/sqllogictest/Cargo.toml index e883ef55363e3..30771cb5de617 100644 --- a/src/sqllogictest/Cargo.toml +++ b/src/sqllogictest/Cargo.toml @@ -34,7 +34,7 @@ regex = "1.6.0" serde_json = "1.0.85" tempfile = "3.2.0" time = "0.3.14" -tokio = "1.19.2" +tokio = "1.21.1" tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["with-chrono-0_4", "with-uuid-1", "with-serde_json-1"] } tower-http = { version = "0.3.4", features = ["cors"] } uuid = "1.1.2" diff --git a/src/stash/Cargo.toml b/src/stash/Cargo.toml index 6a81c9b5147f7..b1e4acb8fa320 100644 --- a/src/stash/Cargo.toml +++ b/src/stash/Cargo.toml @@ -22,7 +22,7 @@ rusqlite = { version = "0.28.0", features = ["bundled"] } serde = "1.0.144" serde_json = "1.0.85" timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false } -tokio = "1.19.2" +tokio = "1.21.1" tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = [ "with-serde_json-1" ] } tracing = "0.1.36" @@ -30,4 +30,4 @@ tracing = "0.1.36" anyhow = "1.0.62" mz-postgres-util = { path = "../postgres-util" } tempfile = "3.2.0" -tokio = { version = "1.19.2", features = ["macros"] } +tokio = { version = "1.21.1", features = ["macros"] } diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index 1084a701d716a..94798f47736cb 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -64,7 +64,7 @@ regex = { version = "1.6.0" } serde = { version = "1.0.144", features = ["derive"] } serde_json = { version = "1.0.85" } timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode"] } -tokio = { version = "1.19.2", features = ["fs", "rt", "sync", "test-util"] } +tokio = { version = "1.21.1", features = ["fs", "rt", "sync", "test-util"] } tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["serde"] } tokio-stream = "0.1.9" tokio-util = { version = "0.7.3", features = ["io"] } @@ -81,7 +81,7 @@ tonic-build = "0.8.0" [dev-dependencies] itertools = "0.10.3" -tokio = { version = "1.19.2", features = ["test-util"] } +tokio = { version = "1.21.1", features = ["test-util"] } [package.metadata.cargo-udeps.ignore] # only used on linux diff --git a/src/storaged/Cargo.toml b/src/storaged/Cargo.toml index 2c4ea3086be70..697f8ad7b7d15 100644 --- a/src/storaged/Cargo.toml +++ b/src/storaged/Cargo.toml @@ -21,7 +21,7 @@ mz-service = { path = "../service" } mz-storage = { path = "../storage" } once_cell = "1.13.1" timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode"] } -tokio = { version = "1.19.2", features = ["net"] } +tokio = { version = "1.21.1", features = ["net"] } tracing = "0.1.36" tracing-subscriber = "0.3.15" diff --git a/src/testdrive/Cargo.toml b/src/testdrive/Cargo.toml index 3aac6fc28d6a9..d836c1de872b3 100644 --- a/src/testdrive/Cargo.toml +++ b/src/testdrive/Cargo.toml @@ -63,7 +63,7 @@ tiberius = { version = "0.10.0", default-features = false } time = "0.3.14" tracing = "0.1.36" tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } -tokio = { version = "1.19.2", features = ["process"] } +tokio = { version = "1.21.1", features = ["process"] } tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["with-chrono-0_4", "with-serde_json-1"] } tokio-stream = "0.1.9" tokio-util = { version = "0.7.3", features = ["compat"] } diff --git a/src/timely-util/Cargo.toml b/src/timely-util/Cargo.toml index 7efd4d384af87..80a3af04ecf85 100644 --- a/src/timely-util/Cargo.toml +++ b/src/timely-util/Cargo.toml @@ -13,4 +13,4 @@ proptest = { git = "https://github.com/MaterializeInc/proptest.git", default-fea timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false } [dev-dependencies] -tokio = { version = "1.19.2", features = ["macros", "rt-multi-thread", "time"] } +tokio = { version = "1.21.1", features = ["macros", "rt-multi-thread", "time"] } diff --git a/test/metabase/smoketest/Cargo.toml b/test/metabase/smoketest/Cargo.toml index 87e428519c2a5..41696fff763de 100644 --- a/test/metabase/smoketest/Cargo.toml +++ b/test/metabase/smoketest/Cargo.toml @@ -11,6 +11,6 @@ anyhow = "1.0.62" itertools = "0.10.3" mz-metabase = { path = "../../../src/metabase" } mz-ore = { path = "../../../src/ore", features = ["task"] } -tokio = "1.19.2" +tokio = "1.21.1" tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } tracing = "0.1.36" diff --git a/test/perf-kinesis/Cargo.toml b/test/perf-kinesis/Cargo.toml index 37b26b1c123a8..8f39435954b61 100644 --- a/test/perf-kinesis/Cargo.toml +++ b/test/perf-kinesis/Cargo.toml @@ -18,7 +18,7 @@ mz-kinesis-util = { path = "../../src/kinesis-util" } mz-ore = { path = "../../src/ore", features = ["task"] } mz-test-util = { path = "../test-util" } rand = "0.8.5" -tokio = "1.19.2" +tokio = "1.21.1" tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } tracing = "0.1.36" tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/test/test-util/Cargo.toml b/test/test-util/Cargo.toml index 0c5caf981ffb8..7945385cc823d 100644 --- a/test/test-util/Cargo.toml +++ b/test/test-util/Cargo.toml @@ -13,6 +13,6 @@ mz-kafka-util = { path = "../../src/kafka-util" } mz-ore = { path = "../../src/ore", features = ["task"] } rand = "0.8.5" rdkafka = { git = "https://github.com/fede1024/rust-rdkafka.git", features = ["cmake-build", "ssl-vendored", "libz-static", "zstd"] } -tokio = "1.19.2" +tokio = "1.21.1" tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } tracing = "0.1.36"