deps: update to tokio 1.17.0 and tower 0.4.12, and unpatch (#1503)

hawkw · olix0r · commit c2d3bea0aa3d · 2022-03-30T03:02:48.000Z
This branch updates the proxy's dependencies on Tokio and Tower to 1.17.0 and 0.4.12, respectively. These releases contain fixes for panics when `std::time::Instant` fails to be properly monotonic. Previously, we were using Git dependencies to ensure we got these fixes. Now, we can remove those patches, as the released versions of these crates have the necessary changes. (cherry picked from commit c876fe1) Signed-off-by: Oliver Gould <ver@buoyant.io>
diff --git a/Cargo.lock b/Cargo.lock
@@ -326,7 +326,7 @@ checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.10.2+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -1562,14 +1562,15 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.7.14"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
+checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
 dependencies = [
  "libc",
  "log",
  "miow",
  "ntapi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "winapi",
 ]
 
@@ -2131,19 +2132,20 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.16.1"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a"
+checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee"
 dependencies = [
  "bytes",
  "libc",
  "memchr",
  "mio",
  "num_cpus",
  "once_cell",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.0",
  "pin-project-lite",
  "signal-hook-registry",
+ "socket2",
  "tokio-macros",
  "winapi",
 ]
@@ -2278,9 +2280,9 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5651b5f6860a99bd1adb59dbfe1db8beb433e73709d9032b413a77e2fb7c066a"
+checksum = "9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e"
 dependencies = [
  "futures-core",
  "futures-util",
@@ -2290,8 +2292,7 @@ dependencies = [
  "rand",
  "slab",
  "tokio",
- "tokio-stream",
- "tokio-util 0.6.9",
+ "tokio-util 0.7.0",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -2528,6 +2529,12 @@ version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.79"
diff --git a/hyper-balance/Cargo.toml b/hyper-balance/Cargo.toml
@@ -11,7 +11,7 @@ futures = { version = "0.3", default-features = false }
 http = "0.2"
 hyper = "0.14"
 pin-project = "1"
-tower = { version = "0.4.11", default-features = false, features = ["load"] }
+tower = { version = "0.4", default-features = false, features = ["load"] }
 tokio = { version = "1", features = ["macros"] }
 
 [dev-dependencies]
diff --git a/linkerd/app/Cargo.toml b/linkerd/app/Cargo.toml
@@ -28,5 +28,5 @@ thiserror = "1.0"
 tokio = { version = "1", features = ["rt"] }
 tokio-stream = { version = "0.1.8", features = ["time", "sync"] }
 tonic = { version = "0.6", default-features = false, features = ["prost"] }
-tower = "0.4.11"
+tower = "0.4"
 tracing = "0.1.30"
diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml
@@ -59,15 +59,15 @@ linkerd-trace-context = { path = "../../trace-context" }
 regex = "1.5.4"
 serde_json = "1"
 thiserror = "1.0"
-tokio = { version = "1", features = ["macros", "sync", "parking_lot"]}
+tokio = { version = "1", features = ["macros", "sync", "parking_lot"] }
 tokio-stream = { version = "0.1.8", features = ["time"] }
 tonic = { version = "0.6", default-features = false, features = ["prost"] }
 tracing = "0.1.30"
 parking_lot = "0.12"
 pin-project = "1"
 
 [dependencies.tower]
-version = "0.4.11"
+version = "0.4"
 default-features = false
 features = [
     "buffer",
diff --git a/linkerd/app/gateway/Cargo.toml b/linkerd/app/gateway/Cargo.toml
@@ -14,12 +14,12 @@ linkerd-app-inbound = { path = "../inbound" }
 linkerd-app-outbound = { path = "../outbound" }
 thiserror = "1.0"
 tokio = { version = "1", features = ["sync"] }
-tower = { version = "0.4.11", default-features = false }
+tower = { version = "0.4", default-features = false }
 tracing = "0.1.30"
 
 [dev-dependencies]
 tokio = { version = "1", features = ["rt", "macros"] }
 tokio-test = "0.4"
-tower = { version = "0.4.11", default-features = false, features = ["util"] }
+tower = { version = "0.4", default-features = false, features = ["util"] }
 tower-test = "0.4"
 linkerd-app-test = { path = "../test" }
diff --git a/linkerd/app/inbound/Cargo.toml b/linkerd/app/inbound/Cargo.toml
@@ -21,7 +21,7 @@ parking_lot = "0.12"
 thiserror = "1.0"
 tokio = { version = "1", features = ["sync"] }
 tonic = { version = "0.6", default-features = false }
-tower = { version = "0.4.11", features = ["util"] }
+tower = { version = "0.4", features = ["util"] }
 tracing = "0.1.30"
 
 [target.'cfg(fuzzing)'.dependencies]
diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml
@@ -35,7 +35,7 @@ socket2 = "0.4"
 tokio = { version = "1", features = ["io-util", "net", "rt", "macros"] }
 tokio-stream = { version = "0.1.8", features = ["sync"] }
 tokio-rustls = "0.22"
-tower = { version = "0.4.11", default-features = false }
+tower = { version = "0.4", default-features = false }
 tonic = { version = "0.6", default-features = false }
 tracing = "0.1"
 webpki = "0.21"
diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml
@@ -26,7 +26,7 @@ linkerd-retry = { path = "../../retry" }
 parking_lot = "0.12"
 thiserror = "1.0"
 tokio = { version = "1", features = ["sync"] }
-tower = { version = "0.4.11", features = ["util"] }
+tower = { version = "0.4", features = ["util"] }
 tracing = "0.1.30"
 pin-project = "1"
 
diff --git a/linkerd/app/test/Cargo.toml b/linkerd/app/test/Cargo.toml
@@ -30,7 +30,7 @@ regex = "1"
 tokio = { version = "1", features = ["io-util", "net", "rt", "sync"] }
 tokio-test = "0.4"
 tokio-stream = { version = "0.1.8", features = ["sync"] }
-tower = { version = "0.4.11", default-features = false }
+tower = { version = "0.4", default-features = false }
 tracing = "0.1.30"
 thiserror = "1"
 
diff --git a/linkerd/cache/Cargo.toml b/linkerd/cache/Cargo.toml
@@ -12,7 +12,7 @@ linkerd-error = { path = "../error" }
 linkerd-stack = { path = "../stack" }
 parking_lot = "0.12"
 tokio = { version = "1", default-features = false, features = ["macros", "rt", "sync", "time"] }
-tower = { version = "0.4.11", default-features = false, features = ["util"] }
+tower = { version = "0.4", default-features = false, features = ["util"] }
 tracing = "0.1.30"
 
 [dev-dependencies]
diff --git a/linkerd/detect/Cargo.toml b/linkerd/detect/Cargo.toml
@@ -14,5 +14,5 @@ linkerd-io = { path = "../io" }
 linkerd-stack = { path = "../stack" }
 tokio = { version = "1", features = ["time"] }
 thiserror = "1.0"
-tower = "0.4.11"
+tower = "0.4"
 tracing = "0.1.30"
diff --git a/linkerd/http-classify/Cargo.toml b/linkerd/http-classify/Cargo.toml
@@ -10,4 +10,4 @@ publish = false
 http = "0.2"
 linkerd-error = { path = "../error" }
 linkerd-stack = { path = "../stack" }
-tower = { version = "0.4.11", default-features = false }
+tower = { version = "0.4", default-features = false }
diff --git a/linkerd/http-metrics/Cargo.toml b/linkerd/http-metrics/Cargo.toml
@@ -19,5 +19,5 @@ linkerd-stack = { path = "../stack" }
 parking_lot = "0.12"
 pin-project = "1"
 tokio = { version = "1", features = ["time"] }
-tower = "0.4.11"
+tower = "0.4"
 tracing = "0.1.30"
diff --git a/linkerd/proxy/api-resolve/Cargo.toml b/linkerd/proxy/api-resolve/Cargo.toml
@@ -26,5 +26,5 @@ http-body = "0.4"
 pin-project = "1"
 prost = "0.9"
 tonic = { version = "0.6", default-features = false }
-tower = { version = "0.4.11", default-features = false }
+tower = { version = "0.4", default-features = false }
 tracing = "0.1.30"
diff --git a/linkerd/proxy/core/Cargo.toml b/linkerd/proxy/core/Cargo.toml
@@ -12,4 +12,4 @@ Core interfaces needed to implement proxy components
 [dependencies]
 futures = { version = "0.3", default-features = false }
 linkerd-error = { path = "../../error" }
-tower = { version = "0.4.11", default-features = false }
+tower = { version = "0.4", default-features = false }
diff --git a/linkerd/proxy/discover/Cargo.toml b/linkerd/proxy/discover/Cargo.toml
@@ -17,11 +17,11 @@ linkerd-proxy-core = { path = "../core" }
 linkerd-stack = { path = "../../stack" }
 tokio = { version = "1", features = ["rt", "sync", "time"] }
 tokio-util = "0.7"
-tower = { version = "0.4.11", features = ["discover"] }
+tower = { version = "0.4", features = ["discover"] }
 tracing = "0.1.30"
 pin-project = "1"
 
 [dev-dependencies]
 async-stream = "0.3"
 tokio = { version = "1", features = ["macros"] }
-tower = { version = "0.4.11", default-features = false, features = ["discover", "util"]}
+tower = { version = "0.4", default-features = false, features = ["discover", "util"]}
diff --git a/linkerd/proxy/dns-resolve/Cargo.toml b/linkerd/proxy/dns-resolve/Cargo.toml
@@ -17,6 +17,6 @@ linkerd-dns = { path = "../../dns" }
 linkerd-proxy-core = { path = "../core" }
 linkerd-stack = { path = "../../stack" }
 tokio = { version = "1", features = ["sync"] }
-tokio-stream = { version = "0.1.8", features = ["sync"]}
-tower = "0.4.11"
+tokio-stream = { version = "0.1.8", features = ["sync"] }
+tower = "0.4"
 tracing = "0.1.30"
diff --git a/linkerd/proxy/http/Cargo.toml b/linkerd/proxy/http/Cargo.toml
@@ -31,7 +31,7 @@ linkerd-stack = { path = "../../stack" }
 rand = "0.8"
 thiserror = "1.0"
 tokio = { version = "1", features = ["time", "rt"] }
-tower = { version = "0.4.11", default-features = false, features = ["balance", "load", "discover"] }
+tower = { version = "0.4", default-features = false, features = ["balance", "load", "discover"] }
 tracing = "0.1.30"
 try-lock = "0.2"
 pin-project = "1"
diff --git a/linkerd/proxy/resolve/Cargo.toml b/linkerd/proxy/resolve/Cargo.toml
@@ -14,6 +14,6 @@ futures = { version = "0.3", default-features = false }
 linkerd-error = { path = "../../error" }
 linkerd-proxy-core = { path = "../core" }
 thiserror = "1.0"
-tower = "0.4.11"
+tower = "0.4"
 tracing = "0.1"
 pin-project = "1"
diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml
@@ -25,8 +25,8 @@ linkerd-tls = { path = "../../tls" }
 parking_lot = "0.12"
 rand = { version = "0.8" }
 thiserror = "1.0"
-tokio = { version = "1", features = ["time"]}
-tower = { version = "0.4.11", default-features = false }
+tokio = { version = "1", features = ["time"] }
+tower = { version = "0.4", default-features = false }
 tonic = { version = "0.6", default-features = false }
 tracing = "0.1.30"
 pin-project = "1"
diff --git a/linkerd/proxy/tcp/Cargo.toml b/linkerd/proxy/tcp/Cargo.toml
@@ -14,5 +14,5 @@ linkerd-error = { path = "../../error" }
 linkerd-stack = { path = "../../stack" }
 rand = "0.8"
 tokio = { version = "1" }
-tower = { version = "0.4.11", default-features = false, features = ["balance", "load", "discover"] }
+tower = { version = "0.4", default-features = false, features = ["balance", "load", "discover"] }
 pin-project = "1"
diff --git a/linkerd/reconnect/Cargo.toml b/linkerd/reconnect/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 linkerd-error = { path = "../error" }
 linkerd-stack = { path = "../stack" }
 futures = { version = "0.3", default-features = false }
-tower = { version = "0.4.11", default-features = false }
+tower = { version = "0.4", default-features = false }
 tracing = "0.1.30"
 pin-project = "1"
 
diff --git a/linkerd/retry/Cargo.toml b/linkerd/retry/Cargo.toml
@@ -10,5 +10,5 @@ publish = false
 futures = { version = "0.3", default-features = false }
 linkerd-error = { path = "../error" }
 linkerd-stack = { path = "../stack" }
-tower = { version = "0.4.11", default-features = false, features = ["retry"] }
+tower = { version = "0.4", default-features = false, features = ["retry"] }
 tracing = "0.1.30"
diff --git a/linkerd/service-profiles/Cargo.toml b/linkerd/service-profiles/Cargo.toml
@@ -31,7 +31,7 @@ regex = "1.5.4"
 tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
 tokio-stream = { version = "0.1", features = ["sync"] }
 tonic = { version = "0.6", default-features = false }
-tower = { version = "0.4.11", features = [ "ready-cache", "retry", "util"] }
+tower = { version = "0.4", features = [ "ready-cache", "retry", "util"] }
 thiserror = "1"
 tracing = "0.1.30"
 pin-project = "1"
diff --git a/linkerd/stack/Cargo.toml b/linkerd/stack/Cargo.toml
@@ -16,7 +16,7 @@ parking_lot = "0.12"
 pin-project = "1"
 thiserror = "1"
 tokio = { version = "1", features = ["time"] }
-tower = { version = "0.4.11", features = ["filter", "util"] }
+tower = { version = "0.4", features = ["filter", "util"] }
 tracing = "0.1"
 
 [dev-dependencies]
diff --git a/linkerd/stack/metrics/Cargo.toml b/linkerd/stack/metrics/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 [dependencies]
 linkerd-metrics = { path = "../../metrics" }
 parking_lot = "0.12"
-tower = { version = "0.4.11", default-features = false }
+tower = { version = "0.4", default-features = false }
 tokio = { version = "1", features = ["time"] }
diff --git a/linkerd/stack/tracing/Cargo.toml b/linkerd/stack/tracing/Cargo.toml
@@ -10,5 +10,5 @@ publish = false
 futures = { version = "0.3", default-features = false }
 linkerd-error = { path = "../../error" }
 linkerd-stack = { path = ".." }
-tower = "0.4.11"
+tower = "0.4"
 tracing = "0.1.30"
