linkerd
/
linkerd2-proxy
mirror of https://github.com/linkerd/linkerd2-proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore(deps): upgrade to hyper 1.x 

note: this commit will not compile, code changes are intentionally
elided from this commit.

this commit upgrades hyper, http, tonic, prost, related dependencies,
and their assorted cargo features.

see <https://github.com/linkerd/linkerd2/issues/8733>.

---

squash:

chore(deps): add hyper-util workspace dependency

chore(deps): add http-body-util workspace dependency

chore(deps): upgrade linkerd2-proxy-api

this commit represents main as of linkerd/linkerd2-proxy-api#421.

Signed-off-by: katelyn martin <kate@buoyant.io>
This commit is contained in:
katelyn martin 2025-01-01 00:00:00 +00:00
parent 30a9f24a98
commit 29e08065c1
17 changed files with 444 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

659
Cargo.lock
View File

File diff suppressed because it is too large Load Diff

37
Cargo.toml
View File

@ -100,20 +100,35 @@ lto = true
[workspace.dependencies]
bytes = { version = "1" }
h2 = { version = "0.3" }
http = { version = "0.2" }
http-body = { version = "0.4" }
hyper = { version = "0.14.32", default-features = false }
prost = { version = "0.12" }
prost-types = { version = "0.12" }
h2 = { version = "0.4" }
http = { version = "1" }
http-body = { version = "1" }
hyper = { version = "1", default-features = false }
hyper-util = { version = "0.1", default-features = false }
prost = { version = "0.13" }
prost-types = { version = "0.13" }
tokio-rustls = { version = "0.26", default-features = false, features = [
"ring",
"logging",
] }
tonic = { version = "0.10", default-features = false }
tonic-build = { version = "0.10", default-features = false }
tonic = { version = "0.12", default-features = false }
tonic-build = { version = "0.12", default-features = false }
[workspace.dependencies.http-body-util]
version = "0.1"
# git = "https://github.com/hyperium/http-body.git"
# rev = "981369a18918ce5570b2d49c329eca55ae831e87"
default-features = false
features = ["channel"]
[patch.crates-io.http-body]
git = "https://github.com/hyperium/http-body.git"
rev = "86fdf00ff9f5758a42f76a4d06f82e7887a990d8"
[patch.crates-io.http-body-util]
git = "https://github.com/hyperium/http-body.git"
rev = "86fdf00ff9f5758a42f76a4d06f82e7887a990d8"
[workspace.dependencies.linkerd2-proxy-api]
version = "0.15.0"
# git = "https://github.com/linkerd/linkerd2-proxy-api.git"
# branch = "main"
git = "https://github.com/linkerd/linkerd2-proxy-api.git"
rev = "981369a18918ce5570b2d49c329eca55ae831e87"
# https://github.com/linkerd/linkerd2-proxy-api/commit/981369a18918ce5570b2d49c329eca55ae831e87

2
hyper-balance/Cargo.toml
View File

@ -10,7 +10,7 @@ publish = false
futures = { version = "0.3", default-features = false }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated"] }
hyper = { workspace = true }
pin-project = "1"
tower = { version = "0.4", default-features = false, features = ["load"] }
tokio = { version = "1", features = ["macros"] }

2
linkerd/app/admin/Cargo.toml
View File

@ -19,7 +19,7 @@ bytes = { workspace = true }
deflate = { version = "1", optional = true, features = ["gzip"] }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
futures = { version = "0.3", default-features = false }
pprof = { version = "0.14", optional = true, features = ["prost-codec"] }
serde = "1"

2
linkerd/app/core/Cargo.toml
View File

@ -17,7 +17,7 @@ bytes = { workspace = true }
drain = { version = "0.1", features = ["retain"] }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
futures = { version = "0.3", default-features = false }
ipnet = "2.11"
prometheus-client = "0.22"

4
linkerd/app/inbound/Cargo.toml
View File

@ -45,7 +45,7 @@ path = "../../proxy/server-policy"
features = ["proto"]
[target.'cfg(fuzzing)'.dependencies]
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
linkerd-app-test = { path = "../test" }
arbitrary = { version = "1", features = ["derive"] }
libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
@ -54,7 +54,7 @@ linkerd-meshtls-rustls = { path = "../../meshtls/rustls", features = [
] }
[dev-dependencies]
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
linkerd-app-test = { path = "../test" }
linkerd-http-metrics = { path = "../../http/metrics", features = ["test-util"] }
linkerd-idle-cache = { path = "../../idle-cache", features = ["test-util"] }

3
linkerd/app/integration/Cargo.toml
View File

@ -23,11 +23,8 @@ h2 = { workspace = true }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = [
"backports",
"deprecated",
"http1",
"http2",
"stream",
"client",
"server",
] }

2
linkerd/app/outbound/Cargo.toml
View File

@ -54,7 +54,7 @@ linkerd-tonic-watch = { path = "../../tonic-watch" }
[dev-dependencies]
futures-util = "0.3"
http-body = { workspace = true }
hyper = { workspace = true, features = ["backports", "deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
tokio = { version = "1", features = ["macros", "sync", "time"] }
tokio-rustls = { workspace = true }
tokio-test = "0.4"

2
linkerd/app/test/Cargo.toml
View File

@ -17,7 +17,7 @@ futures = { version = "0.3", default-features = false }
h2 = { workspace = true }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
linkerd-app-core = { path = "../core" }
linkerd-http-route = { path = "../../http/route", optional = true }
linkerd-identity = { path = "../../identity" }

2
linkerd/http/executor/Cargo.toml
View File

@ -10,6 +10,6 @@ HTTP runtime components for Linkerd.
"""
[dependencies]
hyper = { workspace = true, features = ["deprecated"] }
hyper = { workspace = true }
tokio = { version = "1", features = ["rt"] }
tracing = "0.1"

2
linkerd/http/metrics/Cargo.toml
View File

@ -14,7 +14,7 @@ bytes = { workspace = true }
futures = { version = "0.3", default-features = false }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
parking_lot = "0.12"
pin-project = "1"
tokio = { version = "1", features = ["time"] }

2
linkerd/http/retry/Cargo.toml
View File

@ -26,7 +26,7 @@ linkerd-metrics = { path = "../../metrics" }
linkerd-stack = { path = "../../stack" }
[dev-dependencies]
hyper = { workspace = true, features = ["deprecated"] }
hyper = { workspace = true }
linkerd-tracing = { path = "../../tracing", features = ["ansi"] }
linkerd-mock-http-body = { path = "../../mock/http-body" }
tokio = { version = "1", features = ["macros", "rt"] }

7
linkerd/http/retry/src/replay.rs
View File

@ -196,6 +196,13 @@ where
return Poll::Ready(Some(Err(Capped.into())));
}
}
if this.replay_trailers {
this.replay_trailers = false;
if let Some(ref trailers) = state.trailers {
tracing::trace!("Replaying trailers");
return Poll::Ready(Some(Ok(Frame::trailers(trailers.clone()))));
}
}
// If the inner body has previously ended, don't poll it again.
//

5
linkerd/http/upgrade/Cargo.toml
View File

@ -15,10 +15,7 @@ drain = "0.1"
futures = { version = "0.3", default-features = false }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, default-features = false, features = [
"deprecated",
"client",
] }
hyper = { workspace = true, default-features = false, features = ["client"] }
pin-project = "1"
thiserror = "2"
tokio = { version = "1", default-features = false }

2
linkerd/metrics/Cargo.toml
View File

@ -16,7 +16,7 @@ test_util = []
deflate = { version = "1", features = ["gzip"] }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
linkerd-http-box = { path = "../http/box" }
linkerd-stack = { path = "../stack", optional = true }
linkerd-system = { path = "../system", optional = true }

4
linkerd/proxy/http/Cargo.toml
View File

@ -21,14 +21,10 @@ http = { workspace = true }
http-body = { workspace = true }
httparse = "1"
hyper = { workspace = true, features = [
"backports",
"client",
"deprecated",
"http1",
"http2",
"server",
"stream",
"runtime",
] }
hyper-balance = { path = "../../../hyper-balance" }
parking_lot = "0.12"

2
linkerd/proxy/tap/Cargo.toml
View File

@ -10,7 +10,7 @@ publish = false
bytes = { workspace = true }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = ["backports", "deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
futures = { version = "0.3", default-features = false }
ipnet = "2.11"
linkerd2-proxy-api = { workspace = true, features = ["tap"] }