Use connect deadline instead of timeout

Author: arjan-bal

grpc/src/client/transport/mod.rs

@@ -1,4 +1,5 @@
 use crate::{rt::Runtime, service::Service};
+use std::time::Instant;
 use std::{sync::Arc, time::Duration};
 
 mod registry;
@@ -34,7 +35,7 @@ pub(crate) struct TransportOptions {
     pub rate_limit: Option<(u64, Duration)>,
     pub tcp_keepalive: Option<Duration>,
     pub tcp_nodelay: bool,
-    pub connect_timeout: Option<Duration>,
+    pub connect_deadline: Option<Instant>,
 }
 
 #[async_trait]

grpc/src/client/transport/tonic/mod.rs

@@ -17,6 +17,7 @@ use http::Uri;
 use hyper::client::conn::http2::Builder;
 use hyper::client::conn::http2::SendRequest;
 use std::any::Any;
+use std::time::Instant;
 use std::{
     error::Error,
     future::Future,
@@ -191,7 +192,8 @@ impl Transport for TransportBuilder {
                 keepalive: opts.tcp_keepalive,
             },
         );
-        let tcp_stream = if let Some(timeout) = opts.connect_timeout {
+        let tcp_stream = if let Some(deadline) = opts.connect_deadline {
+            let timeout = deadline.saturating_duration_since(Instant::now());
             tokio::select! {
             _ = runtime.sleep(timeout) => {
                 return Err("timed out waiting for TCP stream to connect".to_string())