refactor(proxy/http): create linkerd-http-stream-timeouts crate (#3382)

this commit outlines the stream timeout middleware, pulling it out of
`linkerd-proxy-http` and into a standalone crate.

again, reëxports are added to make this a backwards compatible change.

Signed-off-by: katelyn martin <[email protected]>

Author: cratelyn

Cargo.lock

@@ -1829,6 +1829,22 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "linkerd-http-stream-timeouts"
+version = "0.1.0"
+dependencies = [
+ "futures",
+ "http",
+ "http-body",
+ "linkerd-error",
+ "linkerd-stack",
+ "parking_lot",
+ "pin-project",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "linkerd-http-version"
 version = "0.1.0"
@@ -2200,6 +2216,7 @@ dependencies = [
  "linkerd-http-h2",
  "linkerd-http-insert",
  "linkerd-http-retain",
+ "linkerd-http-stream-timeouts",
  "linkerd-http-version",
  "linkerd-io",
  "linkerd-proxy-balance",

Cargo.toml

@@ -35,6 +35,7 @@ members = [
     "linkerd/http/retain",
     "linkerd/http/retry",
     "linkerd/http/route",
+    "linkerd/http/stream-timeouts",
     "linkerd/http/version",
     "linkerd/identity",
     "linkerd/idle-cache",

linkerd/http/stream-timeouts/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "linkerd-http-stream-timeouts"
+version = "0.1.0"
+authors = ["Linkerd Developers <[email protected]>"]
+license = "Apache-2.0"
+edition = "2021"
+publish = false
+description = """
+Tower middleware to express deadlines on streams.
+"""
+
+[dependencies]
+futures = { version = "0.3", default-features = false }
+http = "0.2"
+http-body = "0.4"
+parking_lot = "0.12"
+pin-project = "1"
+thiserror = "1"
+tokio = { version = "1", default-features = false }
+tracing = "0.1"
+
+linkerd-error = { path = "../../error" }
+linkerd-stack = { path = "../../stack" }

linkerd/proxy/http/src/stream_timeouts.rs renamed to linkerd/http/stream-timeouts/src/lib.rs

@@ -1,3 +1,7 @@
+//! Tower middleware to express deadlines on streams.
+//!
+//! See [`EnforceTimeouts<S>`].
+
 use futures::FutureExt;
 use linkerd_error::{Error, Result};
 use linkerd_stack as svc;
@@ -345,9 +349,9 @@ where
 
 // === impl RequestBody ===
 
-impl<B> crate::HttpBody for RequestBody<B>
+impl<B> http_body::Body for RequestBody<B>
 where
-    B: crate::HttpBody<Error = Error>,
+    B: http_body::Body<Error = Error>,
 {
     type Data = B::Data;
     type Error = Error;
@@ -405,9 +409,9 @@ where
 
 // === impl ResponseBody ===
 
-impl<B> crate::HttpBody for ResponseBody<B>
+impl<B> http_body::Body for ResponseBody<B>
 where
-    B: crate::HttpBody<Error = Error>,
+    B: http_body::Body<Error = Error>,
 {
     type Data = B::Data;
     type Error = Error;

linkerd/proxy/http/Cargo.toml

@@ -47,6 +47,7 @@ linkerd-http-executor = { path = "../../http/executor" }
 linkerd-http-h2 = { path = "../../http/h2" }
 linkerd-http-insert = { path = "../../http/insert" }
 linkerd-http-retain = { path = "../../http/retain" }
+linkerd-http-stream-timeouts = { path = "../../http/stream-timeouts" }
 linkerd-http-version = { path = "../../http/version" }
 linkerd-io = { path = "../../io" }
 linkerd-proxy-balance = { path = "../balance" }

linkerd/proxy/http/src/lib.rs

@@ -16,7 +16,6 @@ pub mod normalize_uri;
 pub mod orig_proto;
 mod override_authority;
 mod server;
-pub mod stream_timeouts;
 pub mod strip_header;
 pub mod timeout;
 pub mod upgrade;
@@ -33,7 +32,6 @@ pub use self::{
     normalize_uri::{MarkAbsoluteForm, NewNormalizeUri},
     override_authority::{AuthorityOverride, NewOverrideAuthority},
     server::{NewServeHttp, Params as ServerParams, ServeHttp},
-    stream_timeouts::{EnforceTimeouts, StreamTimeouts},
     strip_header::StripHeader,
     timeout::{NewTimeout, ResponseTimeout, ResponseTimeoutError},
 };
@@ -47,6 +45,7 @@ pub use linkerd_http_classify as classify;
 pub use linkerd_http_executor::TracingExecutor;
 pub use linkerd_http_insert as insert;
 pub use linkerd_http_retain::{self as retain, Retain};
+pub use linkerd_http_stream_timeouts::{self as stream_timeouts, EnforceTimeouts, StreamTimeouts};
 pub use linkerd_http_version::{self as version, Version};
 
 #[derive(Clone, Debug)]