From 91537df0d9d23cf54a15164ab8548d25dd0b0af9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Apr 2022 22:26:31 +0000 Subject: [PATCH] build(deps): bump console-subscriber from 0.1.1 to 0.1.4 Bumps [console-subscriber](https://github.com/tokio-rs/console) from 0.1.1 to 0.1.4. - [Release notes](https://github.com/tokio-rs/console/releases) - [Commits](https://github.com/tokio-rs/console/compare/console-subscriber-v0.1.1...console-subscriber-v0.1.4) --- updated-dependencies: - dependency-name: console-subscriber dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 222 ++++++++++++++++++++++++++++-------- src/materialized/Cargo.toml | 2 +- 2 files changed, 174 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d50677bf67806..25350ce218739 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -616,6 +616,49 @@ dependencies = [ "zeroize", ] +[[package]] +name = "axum" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47594e438a243791dba58124b6669561f5baa14cb12046641d8008bf035e5a25" +dependencies = [ + "async-trait", + "axum-core", + "bitflags", + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "itoa 1.0.1", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "serde", + "sync_wrapper", + "tokio", + "tower", + "tower-http", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a671c9ae99531afdd5d3ee8340b8da547779430689947144c140fc74a740244" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", +] + [[package]] name = "backtrace" version = "0.3.64" @@ -933,28 +976,29 @@ dependencies = [ [[package]] name = "console-api" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f67643a7d716307ad10b3e3aef02826382acbe349a3e7605ac57556148bc87" +checksum = "24cb05777feccbb2642d4f2df44d0505601a2cd88ca517d8c913f263a5a8dc8b" dependencies = [ - "prost", - "prost-types", + "prost 0.10.1", + "prost-types 0.10.1", "tonic", - "tonic-build", "tracing-core", ] [[package]] name = "console-subscriber" -version = "0.1.1" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829835c211a0247cd11e65e13cec8696b879374879c35ce162ce8098b23c90d4" +checksum = "f8bd6b23feb4180ccf20cefca9357262818443aafb7159b5e503d170d442a872" dependencies = [ "console-api", "crossbeam-channel", + "crossbeam-utils", "futures", "hdrhistogram", "humantime", + "prost-types 0.10.1", "serde", "serde_json", "thread_local", @@ -1971,7 +2015,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util", + "tokio-util 0.6.9", "tracing", ] @@ -2113,6 +2157,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + [[package]] name = "http-serde" version = "1.1.0" @@ -2590,6 +2640,12 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +[[package]] +name = "matchit" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" + [[package]] name = "materialized" version = "0.20.1-dev" @@ -2817,7 +2873,7 @@ dependencies = [ "thiserror", "tokio", "tokio-native-tls", - "tokio-util", + "tokio-util 0.6.9", "twox-hash", "url", "uuid", @@ -2924,9 +2980,9 @@ dependencies = [ "mz-ore", "mz-test-util", "postgres-types", - "prost", + "prost 0.9.0", "prost-build", - "prost-types", + "prost-types 0.9.0", "rand", "rand_distr", "tokio", @@ -3084,7 +3140,7 @@ dependencies = [ "pdqselect", "postgres-protocol", "prometheus", - "prost", + "prost 0.9.0", "prost-build", "pubnub-hyper", "rand", @@ -3097,7 +3153,7 @@ dependencies = [ "timely", "tokio", "tokio-postgres", - "tokio-util", + "tokio-util 0.6.9", "tracing", "url", "uuid", @@ -3167,7 +3223,7 @@ dependencies = [ "timely", "tokio", "tokio-serde", - "tokio-util", + "tokio-util 0.6.9", "tracing", "tracing-subscriber", ] @@ -3275,7 +3331,7 @@ dependencies = [ "mz-repr", "num-traits", "ordered-float", - "prost", + "prost 0.9.0", "prost-build", "prost-reflect", "regex", @@ -3474,7 +3530,7 @@ dependencies = [ "mz-ore", "mz-persist-types", "parquet2", - "prost", + "prost 0.9.0", "prost-build", "rand", "semver", @@ -3563,7 +3619,7 @@ dependencies = [ "tokio", "tokio-openssl", "tokio-stream", - "tokio-util", + "tokio-util 0.6.9", "tracing", ] @@ -3639,7 +3695,7 @@ dependencies = [ "num_enum", "ordered-float", "proptest", - "prost", + "prost 0.9.0", "prost-build", "rand", "regex", @@ -3848,7 +3904,7 @@ dependencies = [ "mz-sql-parser", "postgres_array", "predicates", - "prost", + "prost 0.9.0", "prost-build", "prost-reflect", "protobuf-src", @@ -3865,7 +3921,7 @@ dependencies = [ "tokio", "tokio-postgres", "tokio-stream", - "tokio-util", + "tokio-util 0.6.9", "url", "uuid", "walkdir", @@ -4668,7 +4724,17 @@ version = "0.9.0" source = "git+https://github.com/MaterializeInc/prost.git#60a377c72d8025bd185f49842d1ff3dec1d4c466" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.9.0", +] + +[[package]] +name = "prost" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a07b0857a71a8cb765763950499cae2413c3f9cede1133478c43600d9e146890" +dependencies = [ + "bytes", + "prost-derive 0.10.1", ] [[package]] @@ -4683,8 +4749,8 @@ dependencies = [ "log", "multimap", "petgraph", - "prost", - "prost-types", + "prost 0.9.0", + "prost-types 0.9.0", "protobuf-src", "regex", "tempfile", @@ -4703,6 +4769,19 @@ dependencies = [ "syn", ] +[[package]] +name = "prost-derive" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost-reflect" version = "0.5.3" @@ -4711,8 +4790,8 @@ checksum = "a3deba7b331019d2f629de4ec8240f0d3aa230f981c850b5d77eaf913eaf7466" dependencies = [ "base64", "chrono", - "prost", - "prost-types", + "prost 0.9.0", + "prost-types 0.9.0", "serde", "serde-value", ] @@ -4723,7 +4802,17 @@ version = "0.9.0" source = "git+https://github.com/MaterializeInc/prost.git#60a377c72d8025bd185f49842d1ff3dec1d4c466" dependencies = [ "bytes", - "prost", + "prost 0.9.0", +] + +[[package]] +name = "prost-types" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" +dependencies = [ + "bytes", + "prost 0.10.1", ] [[package]] @@ -5473,6 +5562,12 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "sync_wrapper" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" + [[package]] name = "synstructure" version = "0.12.3" @@ -5814,7 +5909,7 @@ dependencies = [ "postgres-types", "socket2", "tokio", - "tokio-util", + "tokio-util 0.6.9", ] [[package]] @@ -5858,6 +5953,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" @@ -5869,12 +5978,13 @@ dependencies = [ [[package]] name = "tonic" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" +checksum = "30fb54bf1e446f44d870d260d99957e7d11fb9d0a0f5bd1a662ad1411cc103f9" dependencies = [ "async-stream", "async-trait", + "axum", "base64", "bytes", "futures-core", @@ -5886,11 +5996,11 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost", - "prost-derive", + "prost 0.10.1", + "prost-derive 0.10.1", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.7.1", "tower", "tower-layer", "tower-service", @@ -5898,23 +6008,11 @@ dependencies = [ "tracing-futures", ] -[[package]] -name = "tonic-build" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" -dependencies = [ - "proc-macro2", - "prost-build", - "quote", - "syn", -] - [[package]] name = "tower" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00e500fff5fa1131c866b246041a6bf96da9c965f8fe4128cb1421f23e93c00" +checksum = "5651b5f6860a99bd1adb59dbfe1db8beb433e73709d9032b413a77e2fb7c066a" dependencies = [ "futures-core", "futures-util", @@ -5925,12 +6023,31 @@ dependencies = [ "slab", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.6.9", "tower-layer", "tower-service", "tracing", ] +[[package]] +name = "tower-http" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aba3f3efabf7fb41fae8534fc20a817013dd1c12cb45441efb6c82e6556b4cd8" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.1" @@ -5969,11 +6086,12 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" dependencies = [ "lazy_static", + "valuable", ] [[package]] @@ -6148,6 +6266,12 @@ dependencies = [ "serde", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.8" diff --git a/src/materialized/Cargo.toml b/src/materialized/Cargo.toml index 75e090ad9f9c1..faf733aa60ebd 100644 --- a/src/materialized/Cargo.toml +++ b/src/materialized/Cargo.toml @@ -38,7 +38,7 @@ cfg-if = "1.0.0" chrono = { version = "0.4.0", default-features = false, features = ["std"] } clap = { version = "3.0.14", features = ["wrap_help", "env", "derive"] } compile-time-run = "0.2.12" -console-subscriber = { version = "0.1.1", optional = true } +console-subscriber = { version = "0.1.4", optional = true } mz-coord = { path = "../coord" } crossbeam-channel = "0.5.2" mz-dataflow = { path = "../dataflow" }