*: update some dependencies (tikv#11458)

close tikv#10997, ref tikv#11276 Signed-off-by: tabokie <xy.tao@outlook.com>
tabokie · Dec 23, 2021 · 57639d1 · 57639d1
1 parent 41a5482
commit 57639d1
Show file tree

Hide file tree

Showing 28 changed files with 91 additions and 120 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -146,7 +146,7 @@ engine_test = { path = "components/engine_test", default-features = false }
 engine_traits = { path = "components/engine_traits", default-features = false }
 engine_traits_tests = { path = "components/engine_traits_tests", default-features = false }
 error_code = { path = "components/error_code", default-features = false }
-fail = "0.4"
+fail = "0.5"
 file_system = { path = "components/file_system", default-features = false }
 fs2 = "0.4"
 futures = { version = "0.3", features = ["thread-pool", "compat"] }
@@ -199,7 +199,7 @@ slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debu
 slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
 strum = { version = "0.20", features = ["derive"] }
 parking_lot = "0.11"
-prometheus = { version = "0.12", features = ["nightly"] }
+prometheus = { version = "0.13", features = ["nightly"] }
 prometheus-static-metric = "0.5"
 sst_importer = { path = "components/sst_importer", default-features = false }
 sysinfo = "0.16"

diff --git a/cmd/tikv-ctl/Cargo.toml b/cmd/tikv-ctl/Cargo.toml
@@ -105,7 +105,7 @@ log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug
 log_wrappers = { path = "../../components/log_wrappers" }
 nix = "0.19"
 pd_client = { path = "../../components/pd_client", default-features = false }
-prometheus = { version = "0.12", features = ["nightly"] }
+prometheus = { version = "0.13", features = ["nightly"] }
 promptly = "0.3.0"
 protobuf = "2.8"
 raft = { version = "0.6.0-alpha", default-features = false }

diff --git a/components/backup/Cargo.toml b/components/backup/Cargo.toml
@@ -85,8 +85,8 @@ kvproto = { git = "https://github.com/pingcap/kvproto.git", default-features = f
 lazy_static = "1.3"
 log_wrappers = { path = "../log_wrappers" }
 pd_client = { path = "../pd_client", default-features = false }
-prometheus = { version = "0.12", default-features = false, features = ["nightly"] }
-raft = { version = "0.6.0-alpha", default-features = false }
+prometheus = { version = "0.13", default-features = false, features = ["nightly"] }
+raft = { version = "0.6.0-alpha", default-features = false, features = ["protobuf-codec"] }
 raftstore = { path = "../raftstore", default-features = false }
 security = { path = "../security", default-features = false }
 serde = "1.0"

diff --git a/components/batch-system/Cargo.toml b/components/batch-system/Cargo.toml
@@ -26,7 +26,7 @@ serde_derive = "1.0"
 slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
 slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
 derive_more = { version = "0.99", optional = true }
-prometheus = { version = "0.12", default-features = false, features = ["nightly"] }
+prometheus = { version = "0.13", default-features = false, features = ["nightly"] }
 lazy_static = "1.3"
 
 [dev-dependencies]

diff --git a/components/cdc/Cargo.toml b/components/cdc/Cargo.toml
@@ -76,10 +76,10 @@ collections = { path = "../collections" }
 tokio = { version = "1.5", features = ["rt-multi-thread", "time"]}
 txn_types = { path = "../txn_types", default-features = false }
 concurrency_manager = { path = "../concurrency_manager", default-features = false }
-fail = "0.4"
+fail = "0.5"
 lazy_static = "1.3"
 log_wrappers = { path = "../log_wrappers" }
-prometheus = { version = "0.12", default-features = false, features = ["nightly"] }
+prometheus = { version = "0.13", default-features = false, features = ["nightly"] }
 prometheus-static-metric = "0.5"
 protobuf = "2.8"
 prost = "0.7"

diff --git a/components/cloud/Cargo.toml b/components/cloud/Cargo.toml
@@ -30,4 +30,4 @@ tikv_util = { path = "../tikv_util", default-features = false }
 url = "2.0"
 
 [dev-dependencies]
-fail = "0.4"
+fail = "0.5"
diff --git a/components/cloud/aws/Cargo.toml b/components/cloud/aws/Cargo.toml
@@ -22,7 +22,7 @@ failpoints = ["fail/failpoints"]
 async-trait = "0.1"
 bytes = "1.0"
 cloud = { path = "../", default-features = false }
-fail = "0.4"
+fail = "0.5"
 futures = "0.3"
 futures-util = { version = "0.3", default-features = false, features = ["io"] }
 # This is only a dependency to vendor openssl for rusoto. It's not clear exactly

diff --git a/components/concurrency_manager/Cargo.toml b/components/concurrency_manager/Cargo.toml
@@ -17,7 +17,7 @@ prost-codec = [
 parking_lot = "0.11"
 tokio = { version = "1.5", features = ["macros", "sync", "time"] }
 txn_types = { path = "../txn_types", default-features = false }
-fail = "0.4"
+fail = "0.5"
 
 # FIXME: switch to the crates.io version after crossbeam-skiplist is released
 [dependencies.crossbeam-skiplist]

diff --git a/components/encryption/Cargo.toml b/components/encryption/Cargo.toml
@@ -33,11 +33,11 @@ crc32fast = "1.2"
 derive_more = "0.99.3"
 engine_traits = { path = "../engine_traits", default-features = false }
 error_code = { path = "../error_code", default-features = false }
-fail = "0.4"
+fail = "0.5"
 file_system = { path = "../file_system", default-features = false }
 futures = "0.3"
 lazy_static = "1.3"
-prometheus = { version = "0.12", features = ["nightly"] }
+prometheus = { version = "0.13", features = ["nightly"] }
 futures-util = { version = "0.3", default-features = false, features = ["std", "io"] }
 hex = "0.4.2"
 kvproto = { git = "https://github.com/pingcap/kvproto.git", default-features = false }

diff --git a/components/engine_rocks/Cargo.toml b/components/engine_rocks/Cargo.toml
@@ -50,7 +50,7 @@ engine_traits = { path = "../engine_traits", default-features = false }
 file_system = { path = "../file_system", default-features = false }
 keys = { path = "../keys", default-features = false }
 num_cpus = "1"
-prometheus = { version = "0.12", features = ["nightly"] }
+prometheus = { version = "0.13", features = ["nightly"] }
 prometheus-static-metric = "0.5"
 slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
 slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
@@ -68,7 +68,7 @@ serde_derive = "1.0"
 kvproto = { git = "https://github.com/pingcap/kvproto.git", default-features = false }
 raft = { version = "0.6.0-alpha", default-features = false }
 protobuf = "2"
-fail = "0.4"
+fail = "0.5"
 
 [dependencies.rocksdb]
 git = "https://github.com/tikv/rust-rocksdb.git"

diff --git a/components/engine_traits/Cargo.toml b/components/engine_traits/Cargo.toml
@@ -37,9 +37,9 @@ txn_types = { path = "../txn_types", default-features = false }
 serde = "1.0"
 slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
 slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
-kvproto = { git = "https://github.com/pingcap/kvproto.git", default-features = false }
-raft = { version = "0.6.0-alpha", default-features = false }
-fail = "0.4"
+kvproto = { git = "https://github.com/pingcap/kvproto.git" }
+raft = { version = "0.6.0-alpha", default-features = false, features = ["protobuf-codec"] }
+fail = "0.5"
 
 [dev-dependencies]
 toml = "0.5"

diff --git a/components/external_storage/Cargo.toml b/components/external_storage/Cargo.toml
@@ -32,7 +32,7 @@ failpoints = ["fail/failpoints"]
 [dependencies]
 anyhow = "1.0"
 bytes = "1.0"
-fail = "0.4"
+fail = "0.5"
 ffi-support = { optional = true, version = "0.4.2" }
 file_system = { path = "../file_system" }
 futures = "0.3"
@@ -43,7 +43,7 @@ grpcio = { optional = true, version = "0.9",  default-features = false, features
 kvproto = { git = "https://github.com/pingcap/kvproto.git", default-features = false }
 lazy_static = "1.3"
 libloading = { optional = true, version = "0.7.0" }
-prometheus = { version = "0.12", default-features = false, features = ["nightly", "push"] }
+prometheus = { version = "0.13", default-features = false, features = ["nightly", "push"] }
 protobuf = { optional = true, version = "2" }
 rand = "0.8"
 rusoto_core = "0.46.0"

diff --git a/components/file_system/Cargo.toml b/components/file_system/Cargo.toml
@@ -25,7 +25,7 @@ nix = "0.19"
 online_config = { path = "../online_config" }
 openssl = "0.10"
 parking_lot = "0.11"
-prometheus = { version = "0.12", features = ["nightly"] }
+prometheus = { version = "0.13", features = ["nightly"] }
 prometheus-static-metric = "0.5"
 rand = "0.8"
 serde = "1.0"

diff --git a/components/pd_client/Cargo.toml b/components/pd_client/Cargo.toml
@@ -32,7 +32,7 @@ kvproto = { git = "https://github.com/pingcap/kvproto.git", default-features = f
 lazy_static = "1.3"
 log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug"] }
 log_wrappers = { path = "../log_wrappers" }
-prometheus = { version = "0.12", features = ["nightly"] }
+prometheus = { version = "0.13", features = ["nightly"] }
 security = { path = "../security", default-features = false }
 serde = "1.0"
 serde_derive = "1.0"
@@ -46,5 +46,5 @@ tokio = { version = "1", features = ["sync"] }
 tokio-timer = "0.2"
 txn_types = { path = "../txn_types", default-features = false }
 semver = "0.10"
-fail = "0.4"
+fail = "0.5"
 yatp = { git = "https://github.com/tikv/yatp.git", branch = "master" }
diff --git a/components/raftstore/Cargo.toml b/components/raftstore/Cargo.toml
@@ -70,7 +70,7 @@ derivative = "2"
 encryption = { path = "../encryption", default-features = false }
 engine_traits = { path = "../engine_traits", default-features = false }
 error_code = { path = "../error_code", default-features = false }
-fail = "0.4"
+fail = "0.5"
 openssl = "0.10"
 file_system = { path = "../file_system", default-features = false }
 fs2 = "0.4"
@@ -86,7 +86,7 @@ log_wrappers = { path = "../log_wrappers" }
 memory_trace_macros = { path = "../memory_trace_macros" }
 ordered-float = "2.6"
 pd_client = { path = "../pd_client", default-features = false }
-prometheus = { version = "0.12", features = ["nightly"] }
+prometheus = { version = "0.13", features = ["nightly"] }
 prometheus-static-metric = "0.5"
 prost = { version = "0.7", optional = true }
 protobuf = "2.8"

diff --git a/components/resolved_ts/Cargo.toml b/components/resolved_ts/Cargo.toml
@@ -46,18 +46,17 @@ crossbeam = "0.8"
 concurrency_manager = { path = "../concurrency_manager", default-features = false }
 online_config = { path = "../online_config" }
 engine_traits = { path = "../engine_traits", default-features = false }
-fail = "0.4"
+fail = "0.5"
 futures = "0.3"
 grpcio = { version = "0.9", default-features = false, features = ["openssl-vendored"] }
 hex = "0.4"
 kvproto = { git = "https://github.com/pingcap/kvproto.git", default-features = false }
 lazy_static = "1.3"
 log_wrappers = { path = "../log_wrappers" }
 pd_client = { path = "../pd_client", default-features = false }
-prost = "0.7"
-prometheus = { version = "0.12", default-features = false, features = ["nightly"] }
-protobuf = "2.8"
-raft = { version = "0.6.0-alpha", default-features = false }
+prometheus = { version = "0.13", default-features = false, features = ["nightly"] }
+protobuf = { version = "2.8", features = ["bytes"] }
+raft = { version = "0.6.0-alpha", default-features = false, features = ["protobuf-codec"] }
 raftstore = { path = "../raftstore", default-features = false }
 thiserror = "1.0"
 tikv = { path = "../../", default-features = false }

diff --git a/components/resource_metering/Cargo.toml b/components/resource_metering/Cargo.toml
@@ -21,7 +21,7 @@ collections = { path = "../collections" }
 libc = "0.2"
 crossbeam = "0.8"
 pin-project = "1.0"
-prometheus = { version = "0.12", features = ["nightly"] }
+prometheus = { version = "0.13", features = ["nightly"] }
 prometheus-static-metric = "0.5"
 kvproto = { git = "https://github.com/pingcap/kvproto.git", default-features = false }
 tikv_util = { path = "../tikv_util" }
@@ -34,7 +34,7 @@ slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debu
 slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
 futures = "0.3"
 pdqselect = "0.1"
-fail = "0.4"
+fail = "0.5"
 thread-id = "4.0.0"
 
 [target.'cfg(target_os = "linux")'.dependencies]

diff --git a/components/server/Cargo.toml b/components/server/Cargo.toml
@@ -95,7 +95,7 @@ log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug
 log_wrappers = { path = "../log_wrappers" }
 nix = "0.11"
 pd_client = { path = "../pd_client", default-features = false }
-prometheus = { version = "0.12", features = ["nightly"] }
+prometheus = { version = "0.13", features = ["nightly"] }
 promptly = "0.3.0"
 protobuf = "2.8"
 raft = { version = "0.6.0-alpha", default-features = false }

diff --git a/components/sst_importer/Cargo.toml b/components/sst_importer/Cargo.toml
@@ -52,7 +52,7 @@ keys = { path = "../keys", default-features = false }
 kvproto = { git = "https://github.com/pingcap/kvproto.git", default-features = false }
 lazy_static = "1.3"
 log_wrappers = { path = "../log_wrappers" }
-prometheus = { version = "0.12", default-features = false }
+prometheus = { version = "0.13", default-features = false }
 serde = "1.0"
 serde_derive = "1.0"
 slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }

diff --git a/components/test_pd/Cargo.toml b/components/test_pd/Cargo.toml
@@ -22,7 +22,7 @@ prost-codec = [
 ]
 
 [dependencies]
-fail = "0.4"
+fail = "0.5"
 futures = "0.3"
 grpcio = { version = "0.9",  default-features = false, features = ["openssl-vendored"] }
 kvproto = { git = "https://github.com/pingcap/kvproto.git", default-features = false }

diff --git a/components/test_raftstore/Cargo.toml b/components/test_raftstore/Cargo.toml
@@ -82,4 +82,4 @@ txn_types = { path = "../txn_types", default-features = false }
 encryption_export = { path = "../encryption/export", default-features = false }
 tokio = { version = "1.5", features = ["rt-multi-thread"]}
 concurrency_manager = { path = "../concurrency_manager", default-features = false }
-fail = "0.4"
+fail = "0.5"
diff --git a/components/test_util/Cargo.toml b/components/test_util/Cargo.toml
@@ -26,9 +26,9 @@ cloud-gcp = [ "encryption_export/cloud-gcp" ]
 [dependencies]
 backtrace = "0.3"
 encryption_export = { path = "../encryption/export", default-features = false }
-fail = "0.4"
-grpcio = { version = "0.9",  default-features = false, features = ["openssl-vendored"] }
-kvproto = { git = "https://github.com/pingcap/kvproto.git", default-features = false }
+fail = "0.5"
+grpcio = { version = "0.9",  default-features = false, features = ["openssl-vendored", "protobuf-codec"] }
+kvproto = { git = "https://github.com/pingcap/kvproto.git" }
 rand = "0.8"
 rand_isaac = "0.3"
 security = { path = "../security", default-features = false }

diff --git a/components/tidb_query_common/Cargo.toml b/components/tidb_query_common/Cargo.toml
@@ -22,8 +22,8 @@ time = "0.1"
 derive_more = "0.99.3"
 error_code = { path = "../error_code", default-features = false }
 tikv_util = { path = "../tikv_util", default-features = false }
-kvproto = { git = "https://github.com/pingcap/kvproto.git", default-features = false }
-prometheus = { version = "0.12", features = ["nightly"] }
+kvproto = { git = "https://github.com/pingcap/kvproto.git" }
+prometheus = { version = "0.13", features = ["nightly"] }
 prometheus-static-metric = "0.5"
 lazy_static = "1.3"
 log_wrappers = { path = "../log_wrappers" }

diff --git a/components/tidb_query_executors/Cargo.toml b/components/tidb_query_executors/Cargo.toml
@@ -32,8 +32,8 @@ prost-codec = [
 [dependencies]
 protobuf = "2.8"
 codec = { path = "../codec", default-features = false }
-fail = "0.4"
-kvproto = { git = "https://github.com/pingcap/kvproto.git", default-features = false }
+fail = "0.5"
+kvproto = { git = "https://github.com/pingcap/kvproto.git" }
 match_template = { path = "../match_template" }
 slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
 slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }

diff --git a/components/tikv_kv/Cargo.toml b/components/tikv_kv/Cargo.toml
@@ -43,13 +43,13 @@ engine_panic = { path = "../engine_panic", default-features = false }
 engine_rocks = { path = "../engine_rocks", default-features = false }
 engine_traits = { path = "../engine_traits", default-features = false }
 error_code = { path = "../error_code", default-features = false }
-fail = "0.4"
+fail = "0.5"
 file_system = { path = "../file_system" }
 futures = { version = "0.3", features = ["thread-pool", "compat"] }
 into_other = { path = "../into_other", default-features = false }
 kvproto = { git = "https://github.com/pingcap/kvproto.git", default-features = false }
 log_wrappers = { path = "../log_wrappers" }
-prometheus = { version = "0.12", features = ["nightly"] }
+prometheus = { version = "0.13", features = ["nightly"] }
 prometheus-static-metric = "0.5"
 raftstore = { path = "../raftstore", default-features = false }
 slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }

diff --git a/components/tikv_util/Cargo.toml b/components/tikv_util/Cargo.toml
@@ -33,7 +33,7 @@ crc32fast = "1.2"
 crossbeam = "0.8"
 error_code = { path = "../error_code", default-features = false }
 derive_more = "0.99.3"
-fail = "0.4"
+fail = "0.5"
 fs2 = "0.4"
 futures = { version = "0.3", features = ["compat"] }
 futures-util = { version = "0.3", default-features = false, features = ["io"] }
@@ -45,7 +45,7 @@ log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug
 log_wrappers = { path = "../log_wrappers" }
 num_cpus = "1"
 openssl = "0.10"
-prometheus = { version = "0.12", features = ["nightly"] }
+prometheus = { version = "0.13", features = ["nightly"] }
 rand = "0.8"
 rusoto_core = "0.46.0"
 serde = { version = "1.0", features = ["derive"] }

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -116,7 +116,7 @@ sse = ["tikv/sse"]
 portable = ["tikv/portable"]
 
 [dependencies]
-fail = "0.4"
+fail = "0.5"
 batch-system = { path = "../components/batch-system", default-features = false }
 crc64fast = "0.1"
 crossbeam = "0.8"