Skip to content

Commit 3992d74

Browse files
cratelyncratelyn
committed
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 <linkerd/linkerd2#8733>. see also: * #3379 * #3380 * #3382 * #3405 * hyperium/hyper#3796 * #3411 * #3421 * #3427 * #3428 * #3432 * #3433 * #3444 * #3445 * #3454 * #3455 * #3456 * #3457 * #3461 * #3459 * #3465 * #3466 * #3467 * #3468 * linkerd/linkerd2-proxy-api#421 * linkerd/linkerd2#13492 * linkerd/linkerd2#13493 * hyperium/hyper#3816 * #3472 * #3473 * #3479 * tokio-rs/tokio#7059 * #3509 * hyperium/http-body#140 * #3515 * hyperium/http-body#141 * #3530 * #3531 * #3540 * #3556 * #3558 * #3559 * #3564 * #3567 * #3573 * #3583 * hyperium/http-body#144 * #3585 * #3586 * #3597 * #3598 * #3611 * #3614 * #3615 * #3616 * #3647 * #3651 * #3653 * #3654 * #3655 * #3656 * #3657 * #3660 * #3671 * #3672 * #3673 * #3676 * hyperium/http-body#147 * #3692 * #3699 * #3700 * #3701 * #3708 * linkerd/drain-rs#36 * #3715 * #3717 * eminence/procfs#340 --- 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 <[email protected]>
1 parent 04d86a0 commit 3992d74

File tree

17 files changed

+236
-144
lines changed

17 files changed

+236
-144
lines changed

‎Cargo.lock

Lines changed: 198 additions & 108 deletions
Large diffs are not rendered by default.

‎Cargo.toml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,25 +108,30 @@ publish = false
108108
[workspace.dependencies]
109109
bytes = { version = "1" }
110110
drain = { version = "0.1", default-features = false }
111-
h2 = { version = "0.3" }
112-
http = { version = "0.2" }
113-
http-body = { version = "0.4" }
114-
hyper = { version = "0.14.32", default-features = false }
111+
h2 = { version = "0.4" }
112+
http = { version = "1" }
113+
http-body = { version = "1" }
114+
hyper = { version = "1", default-features = false }
115+
hyper-util = { version = "0.1", default-features = false }
115116
prometheus-client = { version = "0.23" }
116-
prost = { version = "0.12" }
117-
prost-build = { version = "0.12", default-features = false }
118-
prost-types = { version = "0.12" }
117+
prost = { version = "0.13" }
118+
prost-build = { version = "0.13", default-features = false }
119+
prost-types = { version = "0.13" }
119120
tokio-rustls = { version = "0.26", default-features = false, features = [
120121
"ring",
121122
"logging",
122123
] }
123-
tonic = { version = "0.10", default-features = false }
124-
tonic-build = { version = "0.10", default-features = false }
125-
tower = { version = "0.4.13", default-features = false }
124+
tonic = { version = "0.12", default-features = false }
125+
tonic-build = { version = "0.12", default-features = false }
126+
tower = { version = "0.4", default-features = false }
126127
tower-service = { version = "0.3" }
127128
tower-test = { version = "0.4" }
128129

130+
[workspace.dependencies.http-body-util]
131+
version = "0.1.3"
132+
default-features = false
133+
features = ["channel"]
134+
129135
[workspace.dependencies.linkerd2-proxy-api]
130-
version = "0.15.0"
131-
# git = "https://github.com/linkerd/linkerd2-proxy-api.git"
132-
# branch = "main"
136+
git = "https://github.com/linkerd/linkerd2-proxy-api"
137+
branch = "main"

‎hyper-balance/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ publish = { workspace = true }
1010
futures = { version = "0.3", default-features = false }
1111
http = { workspace = true }
1212
http-body = { workspace = true }
13-
hyper = { workspace = true, features = ["deprecated"] }
13+
hyper = { workspace = true }
1414
pin-project = "1"
1515
tower = { workspace = true, default-features = false, features = ["load"] }
1616
tokio = { version = "1", features = ["macros"] }

‎linkerd/app/admin/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ bytes = { workspace = true }
1919
deflate = { version = "1", optional = true, features = ["gzip"] }
2020
http = { workspace = true }
2121
http-body = { workspace = true }
22-
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
22+
hyper = { workspace = true, features = ["http1", "http2"] }
2323
futures = { version = "0.3", default-features = false }
2424
pprof = { version = "0.14", optional = true, features = ["prost-codec"] }
2525
serde = "1"

‎linkerd/app/core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ bytes = { workspace = true }
1717
drain = { workspace = true, features = ["retain"] }
1818
http = { workspace = true }
1919
http-body = { workspace = true }
20-
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
20+
hyper = { workspace = true, features = ["http1", "http2"] }
2121
futures = { version = "0.3", default-features = false }
2222
ipnet = "2.11"
2323
prometheus-client = { workspace = true }

‎linkerd/app/inbound/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ path = "../../proxy/server-policy"
4545
features = ["proto"]
4646

4747
[target.'cfg(fuzzing)'.dependencies]
48-
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
48+
hyper = { workspace = true, features = ["http1", "http2"] }
4949
linkerd-app-test = { path = "../test" }
5050
arbitrary = { version = "1", features = ["derive"] }
5151
libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
@@ -54,7 +54,7 @@ linkerd-meshtls-rustls = { path = "../../meshtls/rustls", features = [
5454
] }
5555

5656
[dev-dependencies]
57-
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
57+
hyper = { workspace = true, features = ["http1", "http2"] }
5858
linkerd-app-test = { path = "../test" }
5959
linkerd-http-body-compat = { path = "../../http/body-compat" }
6060
linkerd-http-metrics = { path = "../../http/metrics", features = ["test-util"] }

‎linkerd/app/integration/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@ h2 = { workspace = true }
2323
http = { workspace = true }
2424
http-body = { workspace = true }
2525
hyper = { workspace = true, features = [
26-
"backports",
27-
"deprecated",
2826
"http1",
2927
"http2",
30-
"stream",
3128
"client",
3229
"server",
3330
] }

‎linkerd/app/outbound/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ linkerd-tonic-watch = { path = "../../tonic-watch" }
5454
[dev-dependencies]
5555
futures-util = "0.3"
5656
http-body = { workspace = true }
57-
hyper = { workspace = true, features = ["backports", "deprecated", "http1", "http2"] }
57+
hyper = { workspace = true, features = ["http1", "http2"] }
5858
tokio = { version = "1", features = ["macros", "sync", "time"] }
5959
tokio-rustls = { workspace = true }
6060
tokio-test = "0.4"

‎linkerd/app/test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ futures = { version = "0.3", default-features = false }
1717
h2 = { workspace = true }
1818
http = { workspace = true }
1919
http-body = { workspace = true }
20-
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
20+
hyper = { workspace = true, features = ["http1", "http2"] }
2121
linkerd-app-core = { path = "../core" }
2222
linkerd-http-route = { path = "../../http/route", optional = true }
2323
linkerd-identity = { path = "../../identity" }

‎linkerd/http/executor/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ HTTP runtime components for Linkerd.
1010
"""
1111

1212
[dependencies]
13-
hyper = { workspace = true, features = ["deprecated"] }
13+
hyper = { workspace = true }
1414
tokio = { version = "1", features = ["rt"] }
1515
tracing = "0.1"

‎linkerd/http/metrics/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ bytes = { workspace = true }
1414
futures = { version = "0.3", default-features = false }
1515
http = { workspace = true }
1616
http-body = { workspace = true }
17-
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
17+
hyper = { workspace = true, features = ["http1", "http2"] }
1818
parking_lot = "0.12"
1919
pin-project = "1"
2020
tokio = { version = "1", features = ["time"] }

‎linkerd/http/retry/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ linkerd-metrics = { path = "../../metrics" }
2626
linkerd-stack = { path = "../../stack" }
2727

2828
[dev-dependencies]
29-
hyper = { workspace = true, features = ["deprecated"] }
29+
hyper = { workspace = true }
3030
linkerd-tracing = { path = "../../tracing", features = ["ansi"] }
3131
linkerd-mock-http-body = { path = "../../mock/http-body" }
3232
tokio = { version = "1", features = ["macros", "rt"] }

‎linkerd/http/retry/src/replay.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,13 @@ where
196196
return Poll::Ready(Some(Err(Capped.into())));
197197
}
198198
}
199+
if this.replay_trailers {
200+
this.replay_trailers = false;
201+
if let Some(ref trailers) = state.trailers {
202+
tracing::trace!("Replaying trailers");
203+
return Poll::Ready(Some(Ok(Frame::trailers(trailers.clone()))));
204+
}
205+
}
199206

200207
// If the inner body has previously ended, don't poll it again.
201208
//

‎linkerd/http/upgrade/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ drain = { workspace = true }
1515
futures = { version = "0.3", default-features = false }
1616
http = { workspace = true }
1717
http-body = { workspace = true }
18-
hyper = { workspace = true, default-features = false, features = [
19-
"deprecated",
20-
"client",
21-
] }
18+
hyper = { workspace = true, default-features = false, features = ["client"] }
2219
pin-project = "1"
2320
thiserror = "2"
2421
tokio = { version = "1", default-features = false }

‎linkerd/metrics/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ test_util = []
1616
deflate = { version = "1", features = ["gzip"] }
1717
http = { workspace = true }
1818
http-body = { workspace = true }
19-
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
19+
hyper = { workspace = true, features = ["http1", "http2"] }
2020
kubert-prometheus-process = { version = "0.2", optional = true }
2121
parking_lot = "0.12"
2222
prometheus-client = { workspace = true }

‎linkerd/proxy/http/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,10 @@ http = { workspace = true }
2121
http-body = { workspace = true }
2222
httparse = "1"
2323
hyper = { workspace = true, features = [
24-
"backports",
2524
"client",
26-
"deprecated",
2725
"http1",
2826
"http2",
2927
"server",
30-
"stream",
31-
"runtime",
3228
] }
3329
hyper-balance = { path = "../../../hyper-balance" }
3430
parking_lot = "0.12"

‎linkerd/proxy/tap/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ publish = { workspace = true }
1010
bytes = { workspace = true }
1111
http = { workspace = true }
1212
http-body = { workspace = true }
13-
hyper = { workspace = true, features = ["backports", "deprecated", "http1", "http2"] }
13+
hyper = { workspace = true, features = ["http1", "http2"] }
1414
futures = { version = "0.3", default-features = false }
1515
ipnet = "2.11"
1616
linkerd2-proxy-api = { workspace = true, features = ["tap"] }

0 commit comments

Comments
 (0)