chore(cargo.toml): define more workspace dependencies #3473

cratelyn · 2024-12-19T02:53:43Z

in linkerd/linkerd2#8733, we're tracking work to upgrade to hyper 1.0.

when upgrading from 0.14 to 1.0, some related crates that depend on hyper, http, and http-body must also be upgraded as well. in linkerd/linkerd2-proxy-api#421, as part of the upgrade to hyper 1.0 we additionally bump the following:

h2: 0.3 -> 0.4
http: 0.2 -> 1.2
prost: 0.12 -> 0.13
prost-types: 0.12 -> 0.13
tonic: 0.10 -> 0.12
tonic-build: 0.10 -> 0.12

unlike linkerd2-proxy-api, the linkerd2-proxy repository is a particularly large cargo workspace. as a consequence of this, bumping these crates across our cargo workspace is a particularly noisy and involved change today. there are ~35 distinct package manifests that need to be changed!

to help ease development, future maintenance, and review of impending hyper upgrade changes, this branch consolidates all of the above into workspace dependencies. no changes to the lockfile are made because this branch does not affect the dependency graph of the project.

this follows from #3456 and #3466, which did this for hyper, http, and http-body. for more information, see:

this commit modifies the workspace manifest, defining prost and prost-types as common workspace dependencies. no changes to the lockfile are made because this commit does not affect the dependency graph of the project. * linkerd/linkerd2#8733 Signed-off-by: katelyn martin <[email protected]>

this commit modifies the workspace manifest, defining tonic and tonic-build as common workspace dependencies. no changes to the lockfile are made because this commit does not affect the dependency graph of the project. * linkerd/linkerd2#8733 Signed-off-by: katelyn martin <[email protected]>

this commit modifies the workspace manifest, defining bytes as a workspace dependency. no changes to the lockfile are made because this commit does not affect the dependency graph of the project. * linkerd/linkerd2#8733 Signed-off-by: katelyn martin <[email protected]>

this commit modifies the workspace manifest, defining h2 as a workspace dependency. no changes to the lockfile are made because this commit does not affect the dependency graph of the project. * linkerd/linkerd2#8733 Signed-off-by: katelyn martin <[email protected]>

this is a small cosmetic tweak to the cargo workspace manifest. this defines the proxy api as a toml table, to help give us a more natural place to hang the (inert) example of a git dependency used in development. Signed-off-by: katelyn martin <[email protected]>

cratelyn · 2024-12-19T17:53:16Z

i've enabled auto-merge for this 🙂

sfleen · 2024-12-19T19:19:49Z

linkerd/app/Cargo.toml

@@ -32,6 +32,6 @@ regex = "1"
 thiserror = "2"
 tokio = { version = "1", features = ["rt"] }
 tokio-stream = { version = "0.1", features = ["time", "sync"] }
-tonic = { version = "0.10", default-features = false, features = ["prost"] }
+tonic = { workspace = true, default-features = false, features = ["prost"] }


Not for this change, but we should consider moving the default-features/features up to the workspace level in the future, IIRC it helps with feature unification and can speed up incremental builds.

that's a very good call. i would be on board with that!

this commit modifies the workspace manifest, defining prost and prost-types as common workspace dependencies. no changes to the lockfile are made because this commit does not affect the dependency graph of the project. * linkerd/linkerd2#8733 Signed-off-by: katelyn martin <[email protected]>

this commit modifies the workspace manifest, defining tonic and tonic-build as common workspace dependencies. no changes to the lockfile are made because this commit does not affect the dependency graph of the project. * linkerd/linkerd2#8733 Signed-off-by: katelyn martin <[email protected]>

this commit modifies the workspace manifest, defining bytes as a workspace dependency. no changes to the lockfile are made because this commit does not affect the dependency graph of the project. * linkerd/linkerd2#8733 Signed-off-by: katelyn martin <[email protected]>

this commit modifies the workspace manifest, defining h2 as a workspace dependency. no changes to the lockfile are made because this commit does not affect the dependency graph of the project. * linkerd/linkerd2#8733 Signed-off-by: katelyn martin <[email protected]>

see linkerd/linkerd2#8733 for more information. this commit moves `prost-build` so that it is now managed as a workspace dependency. while only used in tests, these tests can fail if this is not versioned in lockstep with our other protobuffer dependencies. see #3456 (c740b6d), #3466 (ca50d6b), and especially #3473 (b87455a) for some other previous pr's that moved dependencies to be managed at the workspace level. Signed-off-by: katelyn martin <[email protected]>

see linkerd/linkerd2#8733 for more information. see #3504 as well. see #3456 (c740b6d), #3466 (ca50d6b), #3473 (b87455a), and #3701 (cf4ef39) for some other previous pr's that moved dependencies to be managed at the workspace level. see also linkerd/drain-rs#36 for another related pull request that relates to our tower dependency. Signed-off-by: katelyn martin <[email protected]>

* chore(deps): `tower` is a workspace dependency see linkerd/linkerd2#8733 for more information. see #3504 as well. see #3456 (c740b6d), #3466 (ca50d6b), #3473 (b87455a), and #3701 (cf4ef39) for some other previous pr's that moved dependencies to be managed at the workspace level. see also linkerd/drain-rs#36 for another related pull request that relates to our tower dependency. Signed-off-by: katelyn martin <[email protected]> * chore(deps): `tower-service` is a workspace dependency Signed-off-by: katelyn martin <[email protected]> * chore(deps): `tower-test` is a workspace dependency Signed-off-by: katelyn martin <[email protected]> --------- Signed-off-by: katelyn martin <[email protected]>

see linkerd/linkerd2#8733 and #3504 for more information. see also linkerd/drain-rs#36 for a related pull request that updated `drain`'s `tower` dependency. see #3715 (2f97549) for a related pull request that made `tower` a workspace dependency. see #3456 (c740b6d), #3466 (ca50d6b), #3473 (b87455a), and #3701 (cf4ef39), for some other previous pr's that moved dependencies to be managed at the workspace level. Signed-off-by: katelyn martin <[email protected]>

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]>

## ✨ chore(deps): upgrade to hyperium 1.x crates this branch performs an exciting upgrade for our proxy. this branch upgrades a number of our dependencies so that we use the 1.0 release family of the `hyper` http framework, and its ecosystem. see the [v1.0 announcement][hyper-v1] for more information. this branch upgrades the following dependencies: * `h2`: 0.3 -> 0.4 * `http`: 0.2 -> 1 * `http-body`: 0.4 -> 1 * `hyper`: 0.14.32 -> 1 * `prost`: 0.12 -> 0.13 * `prost-build`: 0.12 -> 0.13 * `prost-types`: 0.12 -> 0.13 * `tonic`: 0.10 -> 0.12 * `tonic-build`: 0.10 -> 0.12 a `hyper-util` dependency is added, which provides among other things, legacy-compatible interfaces such as `hyper_util::client::legacy::Client`, or glue to use `hyper` with the tokio runtime. see <https://docs.rs/hyper-util/latest/hyper_util/> for more information. a `http-body-util` dependency is added, which provides a `BodyExt` trait and a channel-backed body for use in unit tests. the `deprecated` feature flag that was active on our `0.14` hyper dependency has been removed, along with the `stream` and `runtime` feature flags. the `linkerd2-proxy-api` dependency is updated. see: <linkerd/linkerd2-proxy-api#421> ### 📝 notes for review bear particular attention to changes involving `http_body::Body` middleware. the change from two separate `poll_data()` and `poll_trailers()` functions, to a single `poll_frame()` method, induces some subtle changes to various pieces of middleware. also bear in mind that failing to set a timer, in our case `hyper_util::rt::TokioTimer`, can cause http/2 clients, or http/1 and http/2 servers, to panic. make sure that any uses of `hyper::server::conn::http1::Builder`, `hyper::client::conn::http1::Builder`, or `hyper::client::conn::http2::Builder` install a timer. ### ❗ breaking change: `l5d-proxy-error` values the `l5d-proxy-error` header can be examined to observe the cause of proxy errors encountered when sending meshed traffic. by virtue of this using a newer `hyper` client in the proxy, some error messages may in turn look different. for example, an error like `"connect timed out after 1s"` may now appear as `"client error (Connect)"`. ### 📚 other notes this work, by virtue of touching so many parts of the system, is carried out in distinct commits. an initial commit upgrades the dependencies at th workspace level. subsequent commits will not compile if the `--workspace` flag is provided, but the intent of this branch is to update each crate individually. use commands like, e.g. `cargo check --tests -p linkerd-proxy-http` to build particular crates at intermediate commits within this branch. this commit is also only the final leaf in an _extended_ line of work. this has been done to mitigate the effort of reviewing this change, and the risk of churn in the event of any unanticipated errors. see the top-level comment in linkerd/linkerd2#8733 for an overview of all of the work that brought us to this juncture. [hyper-v1]: https://seanmonstar.com/blog/hyper-v1/ --- * 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]> * chore(http/box): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(hyper-balance): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(http/retain): ugrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(http/stream-timeouts): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(http/classify): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(http/upgrade): upgrade to hyper 1.x NOTE: there is a comment noting that the upgrade middleware does not expect to be cloneable. it is unfortunately, however, at odds with the new bounds expected of extensions. so, `Http11Upgrade` is now Clone'able, but a comment is left in place noting this weakened invariant. it's worth investigating how upgrades have changed since, in more detail, but for the current moment we are interested in being especially conservative about changing behavior, and focusing on api changes like `Body::poll_frame(..)`. Signed-off-by: katelyn martin <[email protected]> * chore(metrics): upgrade to hyper 1.x a brief note; this commit happened to tickle an unfortunate sharp edge in `BoxBody` and `Full`'s respective constructors. type inference could not figure out how to construct the body, so we refrain from boxing the response body now. Signed-off-by: katelyn martin <[email protected]> * chore(http/metrics): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(http/prom): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(http/insert): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(http/retry): deprecate linkerd-http-body-compat Signed-off-by: katelyn martin <[email protected]> * chore(mock/http-body): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(http/retry): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(proxy/tap): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(proxy/http): update to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(app/core): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(app/test): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(app/admin): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(app/outbound): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(app/inbound): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(app/integration): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(app): upgrade to hyper 1.x Signed-off-by: katelyn martin <[email protected]> * chore(transport-header): update generated code Signed-off-by: katelyn martin <[email protected]> * chore(spiffe-proto): update generated code Signed-off-by: katelyn martin <[email protected]> * chore(opencensus-proto): update generated code Signed-off-by: katelyn martin <[email protected]> * chore(opentelemetry-proto): update generated code Signed-off-by: katelyn martin <[email protected]> * chore(deny.toml): update cargo-deny directives this commit updates the contents of `deny.toml`. Signed-off-by: katelyn martin <[email protected]> * chore: `compile` has been renamed to `compile_protos` this addresses deprecation warnings, updating calls to a function that has since been renamed. Signed-off-by: katelyn martin <[email protected]> * chore(deps): remove `linkerd-http-body-compat` dependencies this commit removes this crate, which we added to future proof code for this upgrade, from its dependents. Signed-off-by: katelyn martin <[email protected]> * chore(http/body-compat): remove `linkerd-http-body-compat` crate Signed-off-by: katelyn martin <[email protected]> * chore(deps): update to drain 0.2.1 see linkerd/drain-rs#41. Signed-off-by: katelyn martin <[email protected]> --------- Signed-off-by: katelyn martin <[email protected]>

cratelyn added 3 commits December 18, 2024 21:57

cratelyn force-pushed the kate/hyper-1.x-dependents-become-workspace-dependencies branch from ecc6ffa to 4d89b1e Compare December 19, 2024 02:58

cratelyn added 2 commits December 18, 2024 22:05

cratelyn force-pushed the kate/hyper-1.x-dependents-become-workspace-dependencies branch from 4d89b1e to ce7a3a7 Compare December 19, 2024 03:05

cratelyn marked this pull request as ready for review December 19, 2024 03:14

cratelyn requested a review from a team as a code owner December 19, 2024 03:14

cratelyn mentioned this pull request Dec 19, 2024

proxy: Figure out the plan for Hyper 1.0 migration linkerd/linkerd2#8733

Open

cratelyn enabled auto-merge (rebase) December 19, 2024 17:52

sfleen approved these changes Dec 19, 2024

View reviewed changes

cratelyn merged commit a1a5713 into main Dec 19, 2024
49 checks passed

cratelyn deleted the kate/hyper-1.x-dependents-become-workspace-dependencies branch December 19, 2024 19:20

cratelyn mentioned this pull request Mar 6, 2025

chore(deps): prost-build is a workspace dependency #3701

Merged

cratelyn mentioned this pull request Mar 7, 2025

chore(deps): tower crates are workspace dependencies #3715

Merged

cratelyn mentioned this pull request Mar 7, 2025

chore(deps): drain is a workspace dependency #3717

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

chore(cargo.toml): define more workspace dependencies #3473

chore(cargo.toml): define more workspace dependencies #3473

Uh oh!

cratelyn commented Dec 19, 2024 •

edited

Loading

Uh oh!

cratelyn commented Dec 19, 2024

Uh oh!

sfleen Dec 19, 2024

Uh oh!

cratelyn Dec 19, 2024

Uh oh!

Uh oh!

Uh oh!

chore(cargo.toml): define more workspace dependencies #3473

chore(cargo.toml): define more workspace dependencies #3473

Uh oh!

Conversation

cratelyn commented Dec 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cratelyn commented Dec 19, 2024

Uh oh!

sfleen Dec 19, 2024

Choose a reason for hiding this comment

Uh oh!

cratelyn Dec 19, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

cratelyn commented Dec 19, 2024 •

edited

Loading