deps: Update tokio, tonic, and prost

olix0r · olix0r · commit 9fb4fb4fbdeb · 2023-12-03T17:00:45.000Z
* tokio 1.34 * tonic 0.10 * prost 0.12 * linkerd2-proxy-api 0.12 (linkerd/linkerd2-proxy-api#269)
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -75,3 +75,6 @@ members = [
 [profile.release]
 debug = 1
 lto = true
+
+[patch.crates-io]
+linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", branch = "ver/deps" }
diff --git a/deny.toml b/deny.toml
@@ -79,17 +79,13 @@ skip = [
     # https://github.com/hawkw/matchers/pull/4
     { name = "regex-automata", version = "0.1" },
     { name = "regex-syntax", version = "0.6" },
-    # linkerd2-proxy-api needs to upgrade tonic to upgrade prost...
-    { name = "prost", version = "0.11" },
-    { name = "prost-build", version = "0.11" },
-    { name = "prost-derive", version = "0.11" },
-    { name = "prost-types", version = "0.11" },
-    { name = "prettyplease", version = "0.1" },
 ]
 skip-tree = [
     # right now we have a mix of versions of this crate in the ecosystem
     # procfs uses 0.36.14, tempfile uses 0.37.4
     { name = "rustix" },
+    # Hyper v0.14 depends on an older socket2 version.
+    { name = "socket2" },
 ]
 
 [sources]
diff --git a/linkerd/app/Cargo.toml b/linkerd/app/Cargo.toml
@@ -30,6 +30,6 @@ regex = "1"
 thiserror = "1"
 tokio = { version = "1", features = ["rt"] }
 tokio-stream = { version = "0.1", features = ["time", "sync"] }
-tonic = { version = "0.8", default-features = false, features = ["prost"] }
+tonic = { version = "0.10", default-features = false, features = ["prost"] }
 tower = "0.4"
 tracing = "0.1"
diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml
@@ -63,7 +63,7 @@ serde_json = "1"
 thiserror = "1"
 tokio = { version = "1", features = ["macros", "sync", "parking_lot"] }
 tokio-stream = { version = "0.1", features = ["time"] }
-tonic = { version = "0.8", default-features = false, features = ["prost"] }
+tonic = { version = "0.10", default-features = false, features = ["prost"] }
 tracing = "0.1"
 parking_lot = "0.12"
 pin-project = "1"
diff --git a/linkerd/app/gateway/Cargo.toml b/linkerd/app/gateway/Cargo.toml
@@ -16,7 +16,7 @@ linkerd-proxy-client-policy = { path = "../../proxy/client-policy" }
 once_cell = "1"
 thiserror = "1"
 tokio = { version = "1", features = ["sync"] }
-tonic = { version = "0.8", default-features = false }
+tonic = { version = "0.10", default-features = false }
 tower = { version = "0.4", default-features = false }
 tracing = "0.1"
 
diff --git a/linkerd/app/inbound/Cargo.toml b/linkerd/app/inbound/Cargo.toml
@@ -29,13 +29,13 @@ linkerd-meshtls = { path = "../../meshtls", optional = true }
 linkerd-meshtls-rustls = { path = "../../meshtls/rustls", optional = true }
 linkerd-proxy-client-policy = { path = "../../proxy/client-policy" }
 linkerd-tonic-watch = { path = "../../tonic-watch" }
-linkerd2-proxy-api = { version = "0.11", features = ["inbound"] }
+linkerd2-proxy-api = { version = "0.12", features = ["inbound"] }
 once_cell = "1"
 parking_lot = "0.12"
 rangemap = "1"
 thiserror = "1"
 tokio = { version = "1", features = ["sync"] }
-tonic = { version = "0.8", default-features = false }
+tonic = { version = "0.10", default-features = false }
 tower = { version = "0.4", features = ["util"] }
 tracing = "0.1"
 
diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml
@@ -33,7 +33,7 @@ ipnet = "2"
 linkerd-app = { path = "..", features = ["allow-loopback"] }
 linkerd-app-core = { path = "../core" }
 linkerd-metrics = { path = "../../metrics", features = ["test_util"] }
-linkerd2-proxy-api = { version = "0.11", features = [
+linkerd2-proxy-api = { version = "0.12", features = [
     "destination",
     "arbitrary",
 ] }
@@ -48,7 +48,7 @@ tokio-stream = { version = "0.1", features = ["sync"] }
 tokio-rustls = "0.24"
 rustls-pemfile = "1.0"
 tower = { version = "0.4", default-features = false }
-tonic = { version = "0.8", features = ["transport"], default-features = false }
+tonic = { version = "0.10", features = ["transport"], default-features = false }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", default-features = false, features = [
     "fmt",
diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml
@@ -20,7 +20,7 @@ ahash = "0.8"
 bytes = "1"
 http = "0.2"
 futures = { version = "0.3", default-features = false }
-linkerd2-proxy-api = { version = "0.11", features = ["outbound"] }
+linkerd2-proxy-api = { version = "0.12", features = ["outbound"] }
 linkerd-app-core = { path = "../core" }
 linkerd-app-test = { path = "../test", optional = true }
 linkerd-distribute = { path = "../../distribute" }
@@ -38,7 +38,7 @@ once_cell = "1"
 parking_lot = "0.12"
 thiserror = "1"
 tokio = { version = "1", features = ["sync"] }
-tonic = { version = "0.8", default-features = false }
+tonic = { version = "0.10", default-features = false }
 tower = { version = "0.4", features = ["util"] }
 tracing = "0.1"
 pin-project = "1"
diff --git a/linkerd/app/test/Cargo.toml b/linkerd/app/test/Cargo.toml
@@ -29,7 +29,7 @@ regex = "1"
 tokio = { version = "1", features = ["io-util", "net", "rt", "sync"] }
 tokio-test = "0.4"
 tokio-stream = { version = "0.1", features = ["sync"] }
-tonic = { version = "0.8", default-features = false, optional = true }
+tonic = { version = "0.10", default-features = false, optional = true }
 tower = { version = "0.4", default-features = false }
 tracing = "0.1"
 thiserror = "1"
diff --git a/linkerd/exp-backoff/Cargo.toml b/linkerd/exp-backoff/Cargo.toml
@@ -6,7 +6,6 @@ license = "Apache-2.0"
 edition = "2021"
 publish = false
 
-
 [dependencies]
 futures = { version = "0.3", default-features = false }
 rand = { version = "0.8", features = ["small_rng"] }
diff --git a/linkerd/http-route/Cargo.toml b/linkerd/http-route/Cargo.toml
@@ -17,7 +17,7 @@ tracing = "0.1"
 url = "2"
 
 [dependencies.linkerd2-proxy-api]
-version = "0.11"
+version = "0.12"
 features = ["http-route", "grpc-route"]
 optional = true
 
diff --git a/linkerd/opencensus/Cargo.toml b/linkerd/opencensus/Cargo.toml
@@ -13,7 +13,10 @@ http-body = "0.4"
 linkerd-error = { path = "../error" }
 linkerd-metrics = { path = "../metrics" }
 opencensus-proto = { path = "../../opencensus-proto" }
-tonic = { version = "0.8", default-features = false, features = ["prost", "codegen"] }
+tonic = { version = "0.10", default-features = false, features = [
+    "prost",
+    "codegen",
+] }
 tokio = { version = "1", features = ["macros", "sync", "time"] }
 tokio-stream = { version = "0.1", features = ["sync"] }
 tracing = "0.1"
diff --git a/linkerd/proxy/api-resolve/Cargo.toml b/linkerd/proxy/api-resolve/Cargo.toml
@@ -14,14 +14,14 @@ async-stream = "0.3"
 futures = { version = "0.3", default-features = false }
 linkerd-addr = { path = "../../addr" }
 linkerd-error = { path = "../../error" }
-linkerd2-proxy-api = { version = "0.11", features = ["destination"] }
+linkerd2-proxy-api = { version = "0.12", features = ["destination"] }
 linkerd-proxy-core = { path = "../core" }
 linkerd-stack = { path = "../../stack" }
 linkerd-tls = { path = "../../tls" }
 http = "0.2"
 http-body = "0.4"
 pin-project = "1"
-prost = "0.11"
-tonic = { version = "0.8", default-features = false }
+prost = "0.12"
+tonic = { version = "0.10", default-features = false }
 tower = { version = "0.4", default-features = false }
 tracing = "0.1"
diff --git a/linkerd/proxy/client-policy/Cargo.toml b/linkerd/proxy/client-policy/Cargo.toml
@@ -18,7 +18,7 @@ proto = [
 ahash = "0.8"
 ipnet = "2"
 http = "0.2"
-linkerd2-proxy-api = { version = "0.11", optional = true, features = [
+linkerd2-proxy-api = { version = "0.12", optional = true, features = [
     "outbound",
 ] }
 linkerd-error = { path = "../../error" }
@@ -27,8 +27,8 @@ linkerd-http-route = { path = "../../http-route" }
 linkerd-proxy-api-resolve = { path = "../api-resolve" }
 linkerd-proxy-core = { path = "../core" }
 once_cell = { version = "1" }
-prost-types = { version = "0.11", optional = true }
-tonic = { version = "0.8", default-features = false }
+prost-types = { version = "0.12", optional = true }
+tonic = { version = "0.10", default-features = false }
 thiserror = { version = "1", optional = true }
 
 [dev-dependencies]
diff --git a/linkerd/proxy/identity-client/Cargo.toml b/linkerd/proxy/identity-client/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 
 [dependencies]
 futures = { version = "0.3", default-features = false }
-linkerd2-proxy-api = { version = "0.11", features = ["identity"] }
+linkerd2-proxy-api = { version = "0.12", features = ["identity"] }
 linkerd-dns-name = { path = "../../dns/name" }
 linkerd-error = { path = "../../error" }
 linkerd-identity = { path = "../../identity" }
@@ -18,6 +18,6 @@ parking_lot = "0.12"
 pin-project = "1"
 thiserror = "1"
 tokio = { version = "1", features = ["time", "sync"] }
-tonic = { version = "0.8", default-features = false }
+tonic = { version = "0.10", default-features = false }
 tracing = "0.1"
 http-body = "0.4"
diff --git a/linkerd/proxy/server-policy/Cargo.toml b/linkerd/proxy/server-policy/Cargo.toml
@@ -13,11 +13,11 @@ proto = ["linkerd-http-route/proto", "linkerd2-proxy-api", "prost-types"]
 ipnet = "2"
 http = "0.2"
 linkerd-http-route = { path = "../../http-route" }
-prost-types = { version = "0.11", optional = true }
+prost-types = { version = "0.12", optional = true }
 thiserror = "1"
 
 [dependencies.linkerd2-proxy-api]
-version = "0.11"
+version = "0.12"
 features = ["inbound"]
 optional = true
 
diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml
@@ -11,7 +11,7 @@ http = "0.2"
 hyper = { version = "0.14", features = ["http1", "http2"] }
 futures = { version = "0.3", default-features = false }
 ipnet = "2.7"
-linkerd2-proxy-api = { version = "0.11", features = ["tap"] }
+linkerd2-proxy-api = { version = "0.12", features = ["tap"] }
 linkerd-conditional = { path = "../../conditional" }
 linkerd-error = { path = "../../error" }
 linkerd-meshtls = { path = "../../meshtls" }
@@ -20,15 +20,15 @@ linkerd-proxy-http = { path = "../http" }
 linkerd-stack = { path = "../../stack" }
 linkerd-tls = { path = "../../tls" }
 parking_lot = "0.12"
-prost-types = "0.11"
+prost-types = "0.12"
 rand = { version = "0.8" }
 thiserror = "1"
 tokio = { version = "1", features = ["time"] }
 tower = { version = "0.4", default-features = false }
-tonic = { version = "0.8", default-features = false }
+tonic = { version = "0.10", default-features = false }
 tracing = "0.1"
 pin-project = "1"
 
 [dev-dependencies]
-linkerd2-proxy-api = { version = "0.11", features = ["arbitrary"] }
+linkerd2-proxy-api = { version = "0.12", features = ["arbitrary"] }
 quickcheck = { version = "1", default-features = false }
diff --git a/linkerd/service-profiles/Cargo.toml b/linkerd/service-profiles/Cargo.toml
@@ -21,17 +21,17 @@ linkerd-http-box = { path = "../http-box" }
 linkerd-proxy-api-resolve = { path = "../proxy/api-resolve" }
 linkerd-stack = { path = "../stack" }
 linkerd-tonic-watch = { path = "../tonic-watch" }
-linkerd2-proxy-api = { version = "0.11", features = ["destination"] }
+linkerd2-proxy-api = { version = "0.12", features = ["destination"] }
 once_cell = "1.17"
-prost-types = "0.11"
+prost-types = "0.12"
 regex = "1"
 tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
 tokio-stream = { version = "0.1", features = ["sync"] }
-tonic = { version = "0.8", default-features = false }
+tonic = { version = "0.10", default-features = false }
 tower = { version = "0.4.13", features = ["retry", "util"] }
 thiserror = "1"
 tracing = "0.1"
 
 [dev-dependencies]
-linkerd2-proxy-api = { version = "0.11", features = ["arbitrary"] }
+linkerd2-proxy-api = { version = "0.12", features = ["arbitrary"] }
 quickcheck = { version = "1", default-features = false }
diff --git a/linkerd/tonic-watch/Cargo.toml b/linkerd/tonic-watch/Cargo.toml
@@ -13,7 +13,7 @@ Provides a utility for creating robust watches from a service that returns a str
 futures = { version = "0.3", default-features = false }
 linkerd-error = { path = "../error" }
 linkerd-stack = { path = "../stack" }
-tonic = { version = "0.8", default-features = false }
+tonic = { version = "0.10", default-features = false }
 tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
 tracing = "0.1"
 
diff --git a/linkerd/transport-header/Cargo.toml b/linkerd/transport-header/Cargo.toml
@@ -14,7 +14,7 @@ linkerd-dns-name = { path = "../dns/name" }
 linkerd-error = { path = "../error" }
 linkerd-io = { path = "../io" }
 linkerd-stack = { path = "../stack" }
-prost = "0.11"
+prost = "0.12"
 tokio = { version = "1", features = ["time"] }
 tracing = "0.1"
 
@@ -23,6 +23,6 @@ arbitrary = { version = "1", features = ["derive"] }
 libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
 
 [dev-dependencies]
-prost-build = { version = "0.11", default-features = false }
+prost-build = { version = "0.12", default-features = false }
 tokio = { version = "1", features = ["macros"] }
 tokio-test = "0.4"
diff --git a/opencensus-proto/Cargo.toml b/opencensus-proto/Cargo.toml
@@ -13,16 +13,16 @@ Vendored from https://github.com/census-instrumentation/opencensus-proto/.
 
 [dependencies]
 bytes = "1"
-prost = "0.11"
-prost-types = "0.11"
+prost = "0.12"
+prost-types = "0.12"
 
 [dependencies.tonic]
-version = "0.8"
+version = "0.10"
 default-features = false
 features = ["prost", "codegen"]
 
 [dev-dependencies.tonic-build]
-version = "0.8"
+version = "0.10"
 default-features = false
 features = ["prost"]
 
diff --git a/opencensus-proto/src/gen/opencensus.proto.agent.trace.v1.rs b/opencensus-proto/src/gen/opencensus.proto.agent.trace.v1.rs
diff --git a/opencensus-proto/src/gen/opencensus.proto.trace.v1.rs b/opencensus-proto/src/gen/opencensus.proto.trace.v1.rs
diff --git a/tools/Cargo.toml b/tools/Cargo.toml
