diff --git a/Cargo.lock b/Cargo.lock index 313e3c3344c8f..368d328c14e2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6367,16 +6367,16 @@ dependencies = [ [[package]] name = "tokio" -version = "1.19.2" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" +checksum = "4761e560a37f74e62fbcce107b99a8e54445c1009cf643848f6ae6606cb06c67" dependencies = [ + "autocfg", "bytes", "libc", "memchr", "mio", "num_cpus", - "once_cell", "parking_lot", "pin-project-lite", "signal-hook-registry", diff --git a/src/adapter/Cargo.toml b/src/adapter/Cargo.toml index 9be4fc2d2763b..e64974b504f84 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.20.2", 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..a9215e60462f5 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.20.2" 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..1284780204247 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.20.2", features = ["macros"] } tracing = "0.1.36" [build-dependencies] diff --git a/src/compute-client/Cargo.toml b/src/compute-client/Cargo.toml index 2cb7d12a52da2..04d51fe32a878 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.20.2" 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..be5f9d672552b 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.20.2", 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..1cfcd32bd1149 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.20.2" tracing = "0.1.36" uuid = { version = "1.1.2" } diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml index 0b56f2497f1ab..bb06b69d607f5 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.20.2", 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..ac8e48b4473ce 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.20.2" tracing = "0.1.36" uuid = "1.1.2" diff --git a/src/interchange/Cargo.toml b/src/interchange/Cargo.toml index 709fd41481827..7aead1f25d569 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.20.2", 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..15a8bc75aaaec 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.20.2", 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..b1597e416a56e 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.20.2", 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..4b982053f6cb1 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.20.2", features = ["process"] } tracing = "0.1.36" [dev-dependencies] diff --git a/src/ore/Cargo.toml b/src/ore/Cargo.toml index 9b44b0a64fdad..284a74e47f05b 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.20.2", 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.20.2", 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..47224cb645e51 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.20.2", 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..c3d30cf9463d0 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.20.2", 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..9d608068bc052 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.20.2" 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..ddeeb21426a90 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.20.2", 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..b7207ca8cbf52 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.20.2", 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..3ebc6221ba395 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.20.2", 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..d75fc61227e8f 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.20.2" 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..7001f380e367d 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.20.2", 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..b4d882806ab62 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.20.2" 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..256f0001a1de0 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.20.2" 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.20.2", features = ["macros"] } diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index 1084a701d716a..a43c8c159c642 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.20.2", 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.20.2", 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..51842140e0a74 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.20.2", 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..2aa45c1e250bc 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.20.2", 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..ae359dc39d08c 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.20.2", features = ["macros", "rt-multi-thread", "time"] } diff --git a/test/metabase/smoketest/Cargo.toml b/test/metabase/smoketest/Cargo.toml index 87e428519c2a5..79b9827319e4e 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.20.2" 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..302795dbfa423 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.20.2" 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..ab0416046c33c 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.20.2" tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } tracing = "0.1.36"