update to Tokio 1.0 (#826)

This branch updates the proxy to Tokio 1.0 and its ecosystem, including:

- `tokio` 1.0 (obviously)
- the `tokio` 1.0 versions of `tokio-test` and `tokio-util`
- `bytes` 1.0
- `tower` 0.4
- `hyper` 0.14.2
- `h2` 0.3
- `tonic`, via git dependency
- `prost` 0.7
- `tokio-rustls` 0.22
- `rustls` 0.19
- `trust-dns-resolver` 0.20
- `linkerd2-proxy-api`, via git dependency
- `rand` 0.8

For the most part, the change here is pretty straightforward, just
updating the specified dependency versions. The API changes in `tokio`
were mostly made in 0.3, so we have already tracked most of them.
However, the following small changes were necessary:

- Hyper now has feature flags that must be enabled.
- `bytes` renamed `Buf::bytes` and `Buf::bytes_vectored` and
  `BufMut::bytes_mut` to `chunk`, `chunk_vectored`, and `chunk_mut`,
  respectively.
- `tokio::sync::Semaphore` now has a `close` method, and `acquire`
  returns a `Result`. Updated `linkerd2-channel` to track this. This
  also allowed removing some kind of janky jury-rigged code for closing
  a semaphore.
- The `tokio::Runtime::builder::max_threads` method was renamed to
  `max_blocking_threads`.

There were also a couple of larger changes. In particular:

- `tokio` no longer re-exports the `Stream` trait from `Futures`, for
  stability reasons. I added a wrapper API for implementing `Stream` for
  `mpsc`  receivers and for `tokio::time::Interval`.
- `tokio::time::Sleep` is now `!Unpin`, since it no longer contains an
  internal heap allocation. This reduces heap overhead when used with
  async/await syntax. However, for manual `Future` and `tower::Service`
  impls, the `Box` must be added _outside_ the `Sleep` to preserve
  `Unpin`nedness. I've done this in all places where it was necessary. I
  also changed some `Service` impls (`failfast` and `switch_ready`) which
  repeatedly create new `Sleep` futures, to use `Sleep::reset` instead,
  allowing them to avoid reallocations.

  This also means that `tower`'s `Timeout` middleware's future is no
  longer `Unpin`. Since connect futures are required to be `Unpin`, and
  the connect stacks contain timeout layers, I added a new `BoxResponse`
  middleware layer for boxing *just* response futures, while preserving
  the type of the wrapped `Service` (so that connect stacks are still
  `Clone`).
- Removed the `linkerd-app-profiling` crate, which has bit-rotted.

The latest `tower` release also adds upstream implementations of a
number of middlewares we've written our own versions of. As a follow-up,
we probably want to replace some of this stuff with the upstream
versions. However, I thought that we would probably want to do this in a
separate PR, to minimize the size of this change.

Author: hawkw

Cargo.lock

@@ -63,19 +63,5 @@ debug = false
 
 [patch.crates-io]
 webpki = { git = "https://github.com/linkerd/webpki", branch = "cert-dns-names-0.21", rev = "b2c3bb3" }
-# TODO(eliza): when the Tokio 0.3 versions of our various dependencies are
-# published, remove these patches...
-tower = { version = "0.4", git = "https://github.com/tower-rs/tower", rev = "450fa3d2be2b43850ceb125009d636d1d8629ad7" }
-hyper = { git = "https://github.com/hyperium/hyper", rev = "d6aadb830072959497f414c01bcdba4c8e681088" }
-# this isn't pinned to a rev because it needs to be consistent with Hyper's git
-# dep (which is not pinned).
-h2 = { git = "https://github.com/hyperium/h2" }
-# this isn't pinned to a rev because it needs to be consistent with Hyper's git
-# dep (which is `branch = "master"`).
-http-body = { git = "https://github.com/hyperium/http-body", branch = "master" }
-tokio-rustls = { git = "https://github.com/tokio-rs/tls", rev = "e6ef54641b911cfcf23b77a8c4826ae0f8e9870e" }
-tonic = { git = "https://github.com/hawkw/tonic", branch = "eliza/tokio-0.3" }
-tonic-build = { git = "https://github.com/hawkw/tonic", branch = "eliza/tokio-0.3" }
-prost = { git = "https://github.com/danburkert/prost" }
-prost-build = { git = "https://github.com/danburkert/prost" }
-prost-types = { git = "https://github.com/danburkert/prost" }
+tonic = { git = "https://github.com/hyperium/tonic" }
+tonic-build = { git = "https://github.com/hyperium/tonic" }

Cargo.toml

@@ -9,10 +9,10 @@ publish = false
 [dependencies]
 futures = "0.3"
 http = "0.2"
-hyper = "0.14.0-dev"
+hyper = "0.14.2"
 pin-project = "0.4"
-tower = { version = "0.4", default-features = false, features = ["load"]}
-tokio = { version = "0.3", features = ["macros"]}
+tower = { version = "0.4.1", default-features = false, features = ["load"]}
+tokio = { version = "1", features = ["macros"]}
 
 [dev-dependencies]
-tokio-test = "0.3"
+tokio-test = "0.4"

hyper-balance/Cargo.toml

@@ -22,10 +22,11 @@ linkerd2-app-core = { path = "./core" }
 linkerd2-app-gateway = { path = "./gateway" }
 linkerd2-app-inbound = { path = "./inbound" }
 linkerd2-app-outbound = { path = "./outbound" }
+linkerd2-channel = { path = "../channel" }
 linkerd2-opencensus = { path = "../opencensus" }
 linkerd2-error = { path = "../error" }
 regex = "1.0.0"
-tokio = { version = "0.3", features = ["rt"] }
+tokio = { version = "1", features = ["rt"] }
 tonic = { version = "0.3", default-features = false, features = ["prost"] }
 tower = "0.4"
 tracing = "0.1.22"

linkerd/app/Cargo.toml

@@ -16,10 +16,10 @@ independently of the inbound and outbound proxy logic.
 mock-orig-dst  = ["linkerd2-proxy-transport/mock-orig-dst"]
 
 [dependencies]
-bytes = "0.6"
+bytes = "1"
 http = "0.2"
 http-body = "0.4"
-hyper = "0.14.0-dev"
+hyper = { version = "0.14.2", features = ["http1", "http2"] }
 futures = "0.3"
 indexmap = "1.0"
 ipnet = "2.0"
@@ -42,7 +42,7 @@ linkerd2-metrics = { path = "../../metrics" }
 linkerd2-transport-header = { path = "../../transport-header" }
 linkerd2-opencensus = { path = "../../opencensus" }
 linkerd2-proxy-core = { path = "../../proxy/core" }
-linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.16" }
+linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", branch = "ver/tonic-git" }
 linkerd2-proxy-api-resolve = { path = "../../proxy/api-resolve" }
 linkerd2-proxy-discover = { path = "../../proxy/discover" }
 linkerd2-proxy-identity = { path = "../../proxy/identity" }
@@ -62,7 +62,7 @@ linkerd2-stack-metrics = { path = "../../stack/metrics" }
 linkerd2-stack-tracing = { path = "../../stack/tracing" }
 linkerd2-trace-context = { path = "../../trace-context" }
 regex = "1.0.0"
-tokio = { version = "0.3", features = ["macros", "sync", "parking_lot"]}
+tokio = { version = "1", features = ["macros", "sync", "parking_lot"]}
 tokio-timer = "0.2"
 tonic = { version = "0.3", default-features = false, features = ["prost"] }
 tracing = "0.1.22"
@@ -86,5 +86,5 @@ libc = "0.2"
 procinfo = "0.4.2"
 
 [dev-dependencies]
-linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.16", features = ["arbitrary"] }
-prost-types = "0.6.0"
+linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", branch = "ver/tonic-git", features = ["arbitrary"] }
+prost-types = "0.7.0"

linkerd/app/core/Cargo.toml

@@ -13,12 +13,12 @@ indexmap = "1.0"
 linkerd2-app-core = { path = "../core" }
 linkerd2-app-inbound = { path = "../inbound" }
 linkerd2-app-outbound = { path = "../outbound" }
-tower = { version = "0.4", default-features = false }
+tower = { version = "0.4.1", default-features = false }
 tracing = "0.1.22"
 
 [dev-dependencies]
-tokio = { version = "0.3", features = ["rt", "macros"] }
-tokio-test = "0.3"
-tower = { version = "0.4", default-features = false, features = ["util"] }
-tower-test = "0.3"
+tokio = { version = "1", features = ["rt", "macros"] }
+tokio-test = "0.4"
+tower = { version = "0.4.1", default-features = false, features = ["util"] }
+tower-test = "0.4"
 linkerd2-app-test = { path = "../test" }

linkerd/app/gateway/Cargo.toml

@@ -10,12 +10,12 @@ Configures and runs the inbound proxy
 """
 
 [dependencies]
-bytes = "0.6"
+bytes = "1"
 http = "0.2"
 futures = { version = "0.3" }
 indexmap = "1.0"
 linkerd2-app-core = { path = "../core" }
-tokio = { version = "0.3", features = ["sync"] }
+tokio = { version = "1", features = ["sync"] }
 tracing = "0.1.22"
 
 [dependencies.tower]

linkerd/app/inbound/Cargo.toml

@@ -69,6 +69,7 @@ pub fn tcp_connect<T: Into<u16>>(
         .push_map_target(|t: T| ([127, 0, 0, 1], t.into()))
         // Limits the time we wait for a connection to be established.
         .push_timeout(config.timeout)
+        .push(svc::stack::BoxFuture::layer())
         .into_inner()
 }
 

linkerd/app/inbound/src/lib.rs

@@ -15,27 +15,26 @@ a dedicated crate to help the compiler cache dependencies properly.
 [features]
 # Disable to skip certain tests that should not be run on CI.
 flaky_tests = []
-# Enable to run tests for functionality that hasn't been ported to Tokio 0.2
-nyi = []
 
 [dependencies]
-bytes = "0.6"
+bytes = "1"
 futures = "0.3"
 h2 = "0.3"
 http = "0.2"
 http-body = "0.4"
-hyper = "0.14.0-dev"
+hyper = { version = "0.14.2", features = ["http1", "http2", "stream", "client", "server"] }
+linkerd2-channel = { path = "../../channel" }
 linkerd2-app = { path = "..", features = ["mock-orig-dst"] }
 linkerd2-app-core = { path = "../core", features = ["mock-orig-dst"] }
 linkerd2-metrics = { path = "../../metrics", features = ["test_util"] }
-linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.16", features = ["arbitrary"] }
+linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", branch = "ver/tonic-git", features = ["arbitrary"] }
 linkerd2-app-test = { path = "../test" }
 regex = "0.1"
 socket2 = "0.3.12"
-rustls = "0.18"
-tokio = { version = "0.3", features = ["io-util", "net", "rt", "macros"]}
-tokio-rustls = "0.20"
-tower = { version = "0.4", default-features = false}
+rustls = "0.19"
+tokio = { version = "1", features = ["io-util", "net", "rt", "macros"]}
+tokio-rustls = "0.22"
+tower = { version = "0.4.1", default-features = false}
 tonic = { version = "0.3", default-features = false }
 tracing = "0.1.22"
 tracing-futures = { version = "0.2", features = ["std-future"] }

linkerd/app/integration/Cargo.toml

@@ -1,5 +1,4 @@
 use super::*;
-use hyper::body::Buf;
 use linkerd2_app_core::proxy::http::trace;
 use rustls::ClientConfig;
 use std::io;
@@ -121,10 +120,7 @@ impl Client {
             res.status(),
         );
         let stream = res.into_parts().1;
-        let mut body = hyper::body::aggregate(stream).await.expect("wait body");
-        std::str::from_utf8(body.copy_to_bytes(body.remaining()).as_ref())
-            .unwrap()
-            .to_string()
+        http_util::body_to_string(stream).await
     }
 
     pub fn request(