Update tower-balance (#392)

olix0r · web-flow · commit 519420ef8b0d · 2019-11-12T15:30:22.000-08:00
tower-balance has been refactored and updated to use a new version of
the `rand` crate.

This change udpates the project to use the latest tower-balance, rand,
and quickcheck dependencies

I've soak-tested this over the weekend and the new balancer
implementation is at least as good as the prior version in terms of
latency and CPU usage.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/linkerd/app/Cargo.toml b/linkerd/app/Cargo.toml
@@ -31,9 +31,9 @@ http = "0.1"
 http-body = "0.1"
 hyper = "0.12"
 linkerd2-metrics = { path = "../metrics", features = ["test_util"] }
-linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", features = ["arbitrary"], tag = "v0.1.10" }
+linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", features = ["arbitrary"], tag = "v0.1.11" }
 net2 = "0.2"
-quickcheck = { version = "0.8", default-features = false }
+quickcheck = { version = "0.9", default-features = false }
 ring = "0.16"
 rustls = "0.16"
 tokio-connect = { git = "https://github.com/carllerche/tokio-connect" }
diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml
@@ -28,7 +28,7 @@ linkerd2-fallback = { path = "../../fallback" }
 linkerd2-metrics = { path = "../../metrics" }
 linkerd2-opencensus = { path = "../../opencensus" }
 linkerd2-proxy-core = { path = "../../proxy/core" }
-linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.10" }
+linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.11" }
 linkerd2-proxy-api-resolve = { path = "../../proxy/api-resolve" }
 linkerd2-proxy-detect = { path = "../../proxy/detect" }
 linkerd2-proxy-discover = { path = "../../proxy/discover" }
@@ -44,7 +44,7 @@ linkerd2-router = { path = "../../router" }
 linkerd2-stack = { path = "../../stack" }
 linkerd2-timeout = { path = "../../timeout" }
 linkerd2-trace-context = { path = "../../trace-context" }
-rand = "0.6"
+rand = { version = "0.7", features = ["small_rng"] }
 regex = "1.0.0"
 tokio = "0.1.14"
 tokio-timer = "0.2"
@@ -70,6 +70,6 @@ procinfo = "0.4.2"
 
 [dev-dependencies]
 linkerd2-test-util = { path = "../../test-util" }
-linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", features = ["arbitrary"], tag = "v0.1.10" }
+linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", features = ["arbitrary"], tag = "v0.1.11" }
 prost-types = "0.5.0"
-quickcheck = { version = "0.8", default-features = false }
+quickcheck = { version = "0.9", default-features = false }
diff --git a/linkerd/app/core/src/trace.rs b/linkerd/app/core/src/trace.rs
@@ -3,13 +3,12 @@ const ENV_LOG: &str = "LINKERD2_PROXY_LOG";
 use linkerd2_error::Error;
 use std::{env, fmt, str, time::Instant};
 use tokio_timer::clock;
-pub use tracing::{debug, error, info, warn};
 use tracing::{Dispatch, Event, Level};
 use tracing_subscriber::{
     filter,
     fmt::{format, Builder, Context, Formatter},
+    reload, EnvFilter, FmtSubscriber,
 };
-use tracing_subscriber::{reload, EnvFilter, FmtSubscriber};
 
 type SubscriberBuilder = Builder<format::NewRecorder, Format, filter::LevelFilter>;
 type Subscriber = Formatter<format::NewRecorder, Format>;
@@ -119,7 +118,7 @@ impl LevelHandle {
         let level = level.as_ref();
         let filter = level.parse::<EnvFilter>()?;
         self.inner.reload(filter)?;
-        info!(message = "set new log level", %level);
+        tracing::info!(%level, "set new log level");
         Ok(())
     }
 
diff --git a/linkerd/app/inbound/Cargo.toml b/linkerd/app/inbound/Cargo.toml
@@ -20,4 +20,4 @@ tower-grpc = { version = "0.1", default-features = false, features = ["protobuf"
 tracing = "0.1.9"
 
 [dev-dependencies]
-quickcheck = { version = "0.8", default-features = false }
+quickcheck = { version = "0.9", default-features = false }
diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml
@@ -26,10 +26,10 @@ linkerd2-app = { path = ".." }
 linkerd2-app-core = { path = "../core" }
 linkerd2-metrics = { path = "../../metrics", features = ["test_util"] }
 linkerd2-test-util = { path = "../../test-util" }
-linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", features = ["arbitrary"], tag = "v0.1.10" }
+linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", features = ["arbitrary"], tag = "v0.1.11" }
 regex = "0.1"
 net2 = "0.2"
-quickcheck = { version = "0.8", default-features = false }
+quickcheck = { version = "0.9", default-features = false }
 ring = "0.16"
 rustls = "0.16"
 tokio = "0.1.14"
diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml
@@ -20,4 +20,4 @@ tower-grpc = { version = "0.1", default-features = false, features = ["protobuf"
 tracing = "0.1.9"
 
 [dev-dependencies]
-quickcheck = { version = "0.8", default-features = false }
+quickcheck = { version = "0.9", default-features = false }
diff --git a/linkerd/exp-backoff/Cargo.toml b/linkerd/exp-backoff/Cargo.toml
@@ -8,8 +8,8 @@ publish = false
 
 [dependencies]
 futures = "0.1"
-rand = "0.6.3"
+rand = { version = "0.7", features = ["small_rng"] }
 tokio-timer = "0.2.6"
 
 [dev-dependencies]
-quickcheck = { version = "0.8", default-features = false }
+quickcheck = { version = "0.9", default-features = false }
diff --git a/linkerd/exp-backoff/src/lib.rs b/linkerd/exp-backoff/src/lib.rs
@@ -1,7 +1,7 @@
 #![deny(warnings, rust_2018_idioms)]
 
 use futures::{try_ready, Future, Poll, Stream};
-use rand::{rngs::SmallRng, FromEntropy};
+use rand::{rngs::SmallRng, SeedableRng};
 use std::fmt;
 use std::ops::Mul;
 use std::time::Duration;
diff --git a/linkerd/metrics/Cargo.toml b/linkerd/metrics/Cargo.toml
@@ -18,4 +18,4 @@ indexmap = "1.0"
 tracing = "0.1.2"
 
 [dev-dependencies]
-quickcheck = { version = "0.8", default-features = false }
+quickcheck = { version = "0.9", default-features = false }
diff --git a/linkerd/proxy/api-resolve/Cargo.toml b/linkerd/proxy/api-resolve/Cargo.toml
@@ -11,7 +11,7 @@ Implements the Resolve trait using the proxy's gRPC API
 [dependencies]
 futures = "0.1"
 linkerd2-identity = { path = "../../identity" }
-linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.10" }
+linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.11" }
 linkerd2-proxy-core = { path = "../core" }
 prost = "0.5.0"
 tower-grpc = { version = "0.1", default-features = false, features = ["protobuf"] }
diff --git a/linkerd/proxy/http/Cargo.toml b/linkerd/proxy/http/Cargo.toml
@@ -33,7 +33,7 @@ linkerd2-metrics = { path  = "../../metrics" }
 linkerd2-stack = { path  = "../../stack" }
 linkerd2-timeout = { path  = "../../timeout" }
 linkerd2-proxy-transport = { path  = "../transport" }
-rand = "0.6.3"
+rand = "0.7"
 regex = "1.0.0"
 tokio = "0.1"
 tokio-connect = { git = "https://github.com/carllerche/tokio-connect" }
diff --git a/linkerd/proxy/http/src/balance.rs b/linkerd/proxy/http/src/balance.rs
@@ -1,8 +1,9 @@
+use crate::Error;
 use futures::{try_ready, Async, Future, Poll};
 use http;
 use hyper::body::Payload;
 pub use hyper_balance::{PendingUntilFirstData, PendingUntilFirstDataBody};
-use rand::{rngs::SmallRng, FromEntropy};
+use rand::{rngs::SmallRng, SeedableRng};
 use std::{marker::PhantomData, time::Duration};
 pub use tower_balance::p2c::Balance;
 use tower_discover::Discover;
@@ -88,6 +89,7 @@ where
     M::Response: Discover,
     <M::Response as Discover>::Service:
         tower::Service<http::Request<A>, Response = http::Response<B>>,
+    <<M::Response as Discover>::Service as tower::Service<http::Request<A>>>::Error: Into<Error>,
     A: Payload,
     B: Payload,
     Balance<PeakEwmaDiscover<M::Response, PendingUntilFirstData>, http::Request<A>>:
@@ -119,6 +121,7 @@ where
     F: Future,
     F::Item: Discover,
     <F::Item as Discover>::Service: tower::Service<http::Request<A>, Response = http::Response<B>>,
+    <<F::Item as Discover>::Service as tower::Service<http::Request<A>>>::Error: Into<Error>,
     A: Payload,
     B: Payload,
     Balance<PeakEwmaDiscover<F::Item, PendingUntilFirstData>, http::Request<A>>:
diff --git a/linkerd/proxy/identity/Cargo.toml b/linkerd/proxy/identity/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 futures = "0.1"
 linkerd2-error = { path = "../../error" }
 linkerd2-identity = { path = "../../identity" }
-linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.10" }
+linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.11" }
 linkerd2-proxy-transport = { path = "../transport" }
 tokio = "0.1.14"
 tokio-timer = "0.2"
diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml
@@ -16,10 +16,10 @@ linkerd2-conditional = { path = "../../conditional" }
 linkerd2-error = { path = "../../error" }
 linkerd2-identity = { path = "../../identity" }
 linkerd2-proxy-core = { path = "../core" }
-linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.10" }
+linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.11" }
 linkerd2-proxy-http = { path = "../http" }
 linkerd2-proxy-transport = { path = "../transport" }
-rand = "0.6"
+rand = { version = "0.7", features = ["small_rng"] }
 tokio = "0.1.14"
 tokio-timer = "0.2"
 tower = "0.1"
@@ -28,6 +28,6 @@ tracing = "0.1.9"
 tracing-futures = "0.1"
 
 [dev-dependencies]
-linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", features = ["arbitrary"], tag = "v0.1.10" }
+linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", features = ["arbitrary"], tag = "v0.1.11" }
 prost-types = "0.5.0"
-quickcheck = { version = "0.8", default-features = false }
+quickcheck = { version = "0.9", default-features = false }
diff --git a/linkerd/trace-context/Cargo.toml b/linkerd/trace-context/Cargo.toml
@@ -12,6 +12,6 @@ futures = "0.1"
 hex = "0.3.2"
 http = "0.1"
 linkerd2-error = { path = "../error" }
-rand = "0.6.3"
+rand = { version = "0.7", features = ["small_rng"] }
 tower = "0.1"
 tracing = "0.1.2"
diff --git a/linkerd/trace-context/src/propagation.rs b/linkerd/trace-context/src/propagation.rs
@@ -1,7 +1,7 @@
 use super::{Error, Flags, Id, InsufficientBytes};
 use bytes::Bytes;
 use http::header::HeaderValue;
-use rand::{rngs::SmallRng, FromEntropy};
+use rand::{rngs::SmallRng, SeedableRng};
 use std::convert::TryInto;
 use std::fmt;
 use tracing::{trace, warn};
diff --git a/linkerd2-proxy/Cargo.toml b/linkerd2-proxy/Cargo.toml
@@ -11,3 +11,4 @@ futures = "0.1"
 linkerd2-app = { path = "../linkerd/app" }
 linkerd2-signal = { path = "../linkerd/signal" }
 tokio = "0.1.14"
+tracing = "0.1"
diff --git a/linkerd2-proxy/src/main.rs b/linkerd2-proxy/src/main.rs
@@ -7,6 +7,7 @@
 use futures::{future, Future};
 use linkerd2_app::{trace, Config};
 use linkerd2_signal as signal;
+pub use tracing::{debug, error, info, warn};
 
 fn main() {
     // Load configuration from the environment without binding ports.
@@ -30,42 +31,42 @@ fn main() {
                 }
             };
 
-            trace::info!("Admin interface on {}", app.admin_addr());
-            trace::info!("Inbound interface on {}", app.inbound_addr());
-            trace::info!("Outbound interface on {}", app.outbound_addr());
+            info!("Admin interface on {}", app.admin_addr());
+            info!("Inbound interface on {}", app.inbound_addr());
+            info!("Outbound interface on {}", app.outbound_addr());
 
             match app.tap_addr() {
-                None => trace::info!("Tap DISABLED"),
-                Some(addr) => trace::info!("Tap interface on {}", addr),
+                None => info!("Tap DISABLED"),
+                Some(addr) => info!("Tap interface on {}", addr),
             }
 
             match app.local_identity() {
-                None => trace::warn!("Identity is DISABLED"),
+                None => warn!("Identity is DISABLED"),
                 Some(identity) => {
-                    trace::info!("Local identity is {}", identity.name());
+                    info!("Local identity is {}", identity.name());
                     let addr = app.identity_addr().expect("must have identity addr");
                     match addr.identity.value() {
-                        None => trace::info!("Identity verified via {}", addr.addr),
+                        None => info!("Identity verified via {}", addr.addr),
                         Some(identity) => {
-                            trace::info!("Identity verified via {} ({})", addr.addr, identity);
+                            info!("Identity verified via {} ({})", addr.addr, identity);
                         }
                     }
                 }
             }
 
             let dst_addr = app.dst_addr();
             match dst_addr.identity.value() {
-                None => trace::info!("Destinations resolved via {}", dst_addr.addr),
+                None => info!("Destinations resolved via {}", dst_addr.addr),
                 Some(identity) => {
-                    trace::info!("Destinations resolved via {} ({})", dst_addr.addr, identity)
+                    info!("Destinations resolved via {} ({})", dst_addr.addr, identity)
                 }
             }
 
             if let Some(oc) = app.opencensus_addr() {
                 match oc.identity.value() {
-                    None => trace::info!("OpenCensus tracing collector at {}", oc.addr),
+                    None => info!("OpenCensus tracing collector at {}", oc.addr),
                     Some(identity) => {
-                        trace::info!("OpenCensus tracing collector at {} ({})", oc.addr, identity)
+                        info!("OpenCensus tracing collector at {} ({})", oc.addr, identity)
                     }
                 }
             }
