diff --git a/Cargo.lock b/Cargo.lock index ed3b98796..313c7a662 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,19 +4,13 @@ version = 4 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -147,6 +141,12 @@ dependencies = [ "syn", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" version = "1.4.0" @@ -155,18 +155,17 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", - "http", + "http 1.2.0", "http-body", - "hyper", + "http-body-util", "itoa", "matchit", "memchr", @@ -176,41 +175,44 @@ dependencies = [ "rustversion", "serde", "sync_wrapper", - "tower", + "tower 0.5.2", "tower-layer", "tower-service", ] [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes", "futures-util", - "http", + "http 1.2.0", "http-body", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper", "tower-layer", "tower-service", ] [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -221,15 +223,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.7" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bindgen" @@ -237,10 +233,10 @@ version = "0.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.8.0", "cexpr", "clang-sys", - "itertools", + "itertools 0.13.0", "proc-macro2", "quote", "regex", @@ -257,9 +253,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" [[package]] name = "block-buffer" @@ -276,7 +272,7 @@ version = "4.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f5aac023c3ba13725de1604aff621a9dbf9a4f3af1ea6fb712bca91ad729a8e" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.8.0", "boring-sys", "foreign-types", "libc", @@ -485,7 +481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d105028bd2b5dfcb33318fd79a445001ead36004dd8dffef1bdd7e493d8bc1e" dependencies = [ "tokio", - "tower", + "tower 0.4.13", ] [[package]] @@ -502,9 +498,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "enum-as-inner" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" dependencies = [ "heck", "proc-macro2", @@ -545,7 +541,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -572,6 +568,12 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +[[package]] +name = "fixedbitset" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" + [[package]] name = "flate2" version = "1.0.35" @@ -579,7 +581,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -765,14 +767,14 @@ dependencies = [ "cfg-if", "libc", "wasi 0.13.3+wasi-0.2.2", - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -809,16 +811,16 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.26" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", - "http", + "http 1.2.0", "indexmap 2.7.1", "slab", "tokio", @@ -840,9 +842,9 @@ checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" @@ -914,9 +916,20 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -925,12 +938,22 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +version = "1.0.1" +source = "git+https://github.com/hyperium/http-body.git?rev=86fdf00ff9f5758a42f76a4d06f82e7887a990d8#86fdf00ff9f5758a42f76a4d06f82e7887a990d8" dependencies = [ "bytes", - "http", + "http 1.2.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "git+https://github.com/hyperium/http-body.git?rev=86fdf00ff9f5758a42f76a4d06f82e7887a990d8#86fdf00ff9f5758a42f76a4d06f82e7887a990d8" +dependencies = [ + "bytes", + "futures-core", + "http 1.2.0", + "http-body", "pin-project-lite", ] @@ -954,25 +977,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.32" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" +checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "h2", - "http", + "http 1.2.0", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] @@ -981,25 +1001,45 @@ name = "hyper-balance" version = "0.1.0" dependencies = [ "futures", - "http", + "http 1.2.0", "http-body", "hyper", "pin-project", "tokio", "tokio-test", - "tower", + "tower 0.4.13", ] [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ "hyper", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.2.0", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", ] [[package]] @@ -1188,6 +1228,24 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.14" @@ -1225,10 +1283,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -1273,7 +1332,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -1286,7 +1345,7 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" name = "linkerd-addr" version = "0.1.0" dependencies = [ - "http", + "http 1.2.0", "ipnet", "linkerd-dns-name", "thiserror 2.0.11", @@ -1312,7 +1371,7 @@ dependencies = [ "tokio", "tokio-stream", "tonic", - "tower", + "tower 0.4.13", "tracing", ] @@ -1323,7 +1382,7 @@ dependencies = [ "bytes", "deflate", "futures", - "http", + "http 1.2.0", "http-body", "hyper", "linkerd-app-core", @@ -1334,7 +1393,7 @@ dependencies = [ "serde_json", "thiserror 2.0.11", "tokio", - "tower", + "tower 0.4.13", "tracing", ] @@ -1345,7 +1404,7 @@ dependencies = [ "bytes", "drain", "futures", - "http", + "http 1.2.0", "http-body", "hyper", "ipnet", @@ -1404,7 +1463,7 @@ dependencies = [ "tokio", "tokio-stream", "tonic", - "tower", + "tower 0.4.13", "tracing", ] @@ -1413,7 +1472,7 @@ name = "linkerd-app-gateway" version = "0.1.0" dependencies = [ "futures", - "http", + "http 1.2.0", "linkerd-app-core", "linkerd-app-inbound", "linkerd-app-outbound", @@ -1425,7 +1484,7 @@ dependencies = [ "tokio", "tokio-test", "tonic", - "tower", + "tower 0.4.13", "tower-test", "tracing", ] @@ -1437,7 +1496,7 @@ dependencies = [ "arbitrary", "bytes", "futures", - "http", + "http 1.2.0", "hyper", "libfuzzer-sys", "linkerd-app-core", @@ -1461,7 +1520,7 @@ dependencies = [ "tokio", "tokio-test", "tonic", - "tower", + "tower 0.4.13", "tracing", ] @@ -1473,7 +1532,7 @@ dependencies = [ "flate2", "futures", "h2", - "http", + "http 1.2.0", "http-body", "hyper", "ipnet", @@ -1495,7 +1554,7 @@ dependencies = [ "tokio-rustls", "tokio-stream", "tonic", - "tower", + "tower 0.4.13", "tracing", "tracing-subscriber", ] @@ -1508,7 +1567,7 @@ dependencies = [ "bytes", "futures", "futures-util", - "http", + "http 1.2.0", "http-body", "hyper", "linkerd-app-core", @@ -1540,7 +1599,7 @@ dependencies = [ "tokio-rustls", "tokio-test", "tonic", - "tower", + "tower 0.4.13", "tower-test", "tracing", ] @@ -1551,7 +1610,7 @@ version = "0.1.0" dependencies = [ "futures", "h2", - "http", + "http 1.2.0", "http-body", "hyper", "linkerd-app-core", @@ -1567,7 +1626,7 @@ dependencies = [ "tokio-stream", "tokio-test", "tonic", - "tower", + "tower 0.4.13", "tracing", "tracing-subscriber", ] @@ -1587,7 +1646,7 @@ dependencies = [ "linkerd-stack", "thiserror 2.0.11", "tokio", - "tower", + "tower 0.4.13", "tracing", ] @@ -1677,7 +1736,7 @@ name = "linkerd-http-access-log" version = "0.1.0" dependencies = [ "futures-core", - "http", + "http 1.2.0", "humantime", "linkerd-identity", "linkerd-proxy-transport", @@ -1693,7 +1752,7 @@ dependencies = [ name = "linkerd-http-body-compat" version = "0.1.0" dependencies = [ - "http", + "http 1.2.0", "http-body", ] @@ -1703,7 +1762,7 @@ version = "0.1.0" dependencies = [ "bytes", "futures", - "http", + "http 1.2.0", "http-body", "linkerd-error", "linkerd-stack", @@ -1715,7 +1774,7 @@ name = "linkerd-http-classify" version = "0.1.0" dependencies = [ "futures", - "http", + "http 1.2.0", "http-body", "linkerd-error", "linkerd-http-box", @@ -1746,10 +1805,10 @@ name = "linkerd-http-insert" version = "0.1.0" dependencies = [ "futures", - "http", + "http 1.2.0", "linkerd-stack", "pin-project", - "tower", + "tower 0.4.13", ] [[package]] @@ -1758,7 +1817,7 @@ version = "0.1.0" dependencies = [ "bytes", "futures", - "http", + "http 1.2.0", "http-body", "hyper", "linkerd-error", @@ -1768,7 +1827,7 @@ dependencies = [ "parking_lot", "pin-project", "tokio", - "tower", + "tower 0.4.13", "tracing", ] @@ -1776,9 +1835,9 @@ dependencies = [ name = "linkerd-http-override-authority" version = "0.1.0" dependencies = [ - "http", + "http 1.2.0", "linkerd-stack", - "tower", + "tower 0.4.13", "tracing", ] @@ -1788,7 +1847,7 @@ version = "0.1.0" dependencies = [ "bytes", "futures", - "http", + "http 1.2.0", "http-body", "linkerd-error", "linkerd-http-box", @@ -1805,11 +1864,11 @@ dependencies = [ name = "linkerd-http-retain" version = "0.1.0" dependencies = [ - "http", + "http 1.2.0", "http-body", "linkerd-stack", "pin-project", - "tower", + "tower 0.4.13", ] [[package]] @@ -1818,7 +1877,7 @@ version = "0.1.0" dependencies = [ "bytes", "futures", - "http", + "http 1.2.0", "http-body", "hyper", "linkerd-error", @@ -1833,7 +1892,7 @@ dependencies = [ "pin-project", "thiserror 2.0.11", "tokio", - "tower", + "tower 0.4.13", "tracing", ] @@ -1841,7 +1900,7 @@ dependencies = [ name = "linkerd-http-route" version = "0.1.0" dependencies = [ - "http", + "http 1.2.0", "linkerd2-proxy-api", "maplit", "rand 0.9.0", @@ -1856,7 +1915,7 @@ name = "linkerd-http-stream-timeouts" version = "0.1.0" dependencies = [ "futures", - "http", + "http 1.2.0", "http-body", "linkerd-error", "linkerd-stack", @@ -1874,7 +1933,7 @@ dependencies = [ "bytes", "drain", "futures", - "http", + "http 1.2.0", "http-body", "hyper", "linkerd-duplex", @@ -1886,7 +1945,7 @@ dependencies = [ "pin-project", "thiserror 2.0.11", "tokio", - "tower", + "tower 0.4.13", "tracing", "try-lock", ] @@ -1895,7 +1954,7 @@ dependencies = [ name = "linkerd-http-variant" version = "0.1.0" dependencies = [ - "http", + "http 1.2.0", "thiserror 2.0.11", ] @@ -1922,7 +1981,7 @@ dependencies = [ "linkerd-tracing", "parking_lot", "tokio", - "tower", + "tower 0.4.13", "tracing", ] @@ -2022,7 +2081,7 @@ name = "linkerd-metrics" version = "0.1.0" dependencies = [ "deflate", - "http", + "http 1.2.0", "http-body", "hyper", "linkerd-http-box", @@ -2040,7 +2099,7 @@ name = "linkerd-mock-http-body" version = "0.1.0" dependencies = [ "bytes", - "http", + "http 1.2.0", "http-body", "linkerd-error", "tokio", @@ -2055,7 +2114,7 @@ name = "linkerd-opencensus" version = "0.1.0" dependencies = [ "futures", - "http", + "http 1.2.0", "http-body", "linkerd-error", "linkerd-metrics", @@ -2072,7 +2131,7 @@ name = "linkerd-opentelemetry" version = "0.1.0" dependencies = [ "futures", - "http", + "http 0.2.12", "http-body", "linkerd-error", "linkerd-metrics", @@ -2126,7 +2185,7 @@ dependencies = [ "rand 0.9.0", "tokio", "tokio-test", - "tower", + "tower 0.4.13", "tower-test", "tracing", ] @@ -2136,7 +2195,7 @@ name = "linkerd-proxy-api-resolve" version = "0.1.0" dependencies = [ "futures", - "http", + "http 1.2.0", "http-body", "linkerd-addr", "linkerd-error", @@ -2148,9 +2207,9 @@ dependencies = [ "linkerd-tonic-stream", "linkerd2-proxy-api", "pin-project", - "prost", + "prost 0.13.5", "tonic", - "tower", + "tower 0.4.13", "tracing", ] @@ -2168,7 +2227,7 @@ dependencies = [ "linkerd-stack", "rand 0.9.0", "tokio", - "tower", + "tower 0.4.13", "tracing", ] @@ -2209,7 +2268,7 @@ name = "linkerd-proxy-client-policy" version = "0.1.0" dependencies = [ "ahash", - "http", + "http 1.2.0", "ipnet", "linkerd-error", "linkerd-exp-backoff", @@ -2221,7 +2280,7 @@ dependencies = [ "linkerd2-proxy-api", "maplit", "once_cell", - "prost-types", + "prost-types 0.13.5", "quickcheck", "thiserror 2.0.11", "tonic", @@ -2233,7 +2292,7 @@ version = "0.1.0" dependencies = [ "futures", "linkerd-error", - "tower", + "tower 0.4.13", ] [[package]] @@ -2248,7 +2307,7 @@ dependencies = [ "linkerd-stack", "tokio", "tokio-stream", - "tower", + "tower 0.4.13", "tracing", ] @@ -2261,7 +2320,7 @@ dependencies = [ "drain", "futures", "h2", - "http", + "http 1.2.0", "http-body", "httparse", "hyper", @@ -2289,7 +2348,7 @@ dependencies = [ "thiserror 2.0.11", "tokio", "tokio-test", - "tower", + "tower 0.4.13", "tower-test", "tracing", "try-lock", @@ -2324,7 +2383,7 @@ dependencies = [ "linkerd-proxy-core", "pin-project", "thiserror 2.0.11", - "tower", + "tower 0.4.13", "tracing", ] @@ -2333,13 +2392,13 @@ name = "linkerd-proxy-server-policy" version = "0.1.0" dependencies = [ "governor", - "http", + "http 1.2.0", "ipnet", "linkerd-http-route", "linkerd-identity", "linkerd2-proxy-api", "maplit", - "prost-types", + "prost-types 0.13.5", "quickcheck", "thiserror 2.0.11", "tokio", @@ -2363,7 +2422,7 @@ dependencies = [ "tokio", "tokio-test", "tonic", - "tower", + "tower 0.4.13", "tracing", "x509-parser", ] @@ -2374,7 +2433,7 @@ version = "0.1.0" dependencies = [ "bytes", "futures", - "http", + "http 1.2.0", "http-body", "hyper", "ipnet", @@ -2388,13 +2447,13 @@ dependencies = [ "linkerd2-proxy-api", "parking_lot", "pin-project", - "prost-types", + "prost-types 0.13.5", "quickcheck", "rand 0.9.0", "thiserror 2.0.11", "tokio", "tonic", - "tower", + "tower 0.4.13", "tracing", ] @@ -2410,7 +2469,7 @@ dependencies = [ "pin-project", "rand 0.9.0", "tokio", - "tower", + "tower 0.4.13", ] [[package]] @@ -2441,7 +2500,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tower", + "tower 0.4.13", "tower-test", "tracing", ] @@ -2453,7 +2512,7 @@ dependencies = [ "futures", "linkerd-error", "linkerd-stack", - "tower", + "tower 0.4.13", "tracing", ] @@ -2476,7 +2535,7 @@ version = "0.1.0" dependencies = [ "bytes", "futures", - "http", + "http 1.2.0", "http-body", "linkerd-addr", "linkerd-dns-name", @@ -2488,14 +2547,14 @@ dependencies = [ "linkerd-tonic-watch", "linkerd2-proxy-api", "once_cell", - "prost-types", + "prost-types 0.13.5", "quickcheck", "regex", "thiserror 2.0.11", "tokio", "tokio-stream", "tonic", - "tower", + "tower 0.4.13", "tracing", ] @@ -2520,7 +2579,7 @@ dependencies = [ "tokio", "tokio-test", "tokio-util", - "tower", + "tower 0.4.13", "tower-test", "tracing", ] @@ -2533,7 +2592,7 @@ dependencies = [ "parking_lot", "tokio", "tokio-test", - "tower", + "tower 0.4.13", "tower-test", ] @@ -2544,7 +2603,7 @@ dependencies = [ "futures", "linkerd-error", "linkerd-stack", - "tower", + "tower 0.4.13", "tracing", ] @@ -2574,7 +2633,7 @@ dependencies = [ "pin-project", "thiserror 2.0.11", "tokio", - "tower", + "tower 0.4.13", "tracing", "untrusted", ] @@ -2635,12 +2694,12 @@ dependencies = [ "bytes", "futures", "hex", - "http", + "http 1.2.0", "linkerd-error", "linkerd-stack", "rand 0.8.5", "thiserror 1.0.69", - "tower", + "tower 0.4.13", "tracing", ] @@ -2670,8 +2729,8 @@ dependencies = [ "linkerd-error", "linkerd-io", "linkerd-stack", - "prost", - "prost-build", + "prost 0.13.5", + "prost-build 0.12.6", "tokio", "tokio-test", "tracing", @@ -2711,16 +2770,15 @@ dependencies = [ [[package]] name = "linkerd2-proxy-api" version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4682c00263191a5bfa4fbe64f6d80b22ff2b49aaa294da5aac062f5abc6eb9e" +source = "git+https://github.com/linkerd/linkerd2-proxy-api.git?rev=981369a18918ce5570b2d49c329eca55ae831e87#981369a18918ce5570b2d49c329eca55ae831e87" dependencies = [ "h2", - "http", + "http 1.2.0", "ipnet", - "prost", - "prost-types", + "prost 0.13.5", + "prost-types 0.13.5", "quickcheck", - "thiserror 1.0.69", + "thiserror 2.0.11", "tonic", ] @@ -2817,18 +2875,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b" dependencies = [ "adler2", ] @@ -2966,8 +3015,8 @@ name = "opencensus-proto" version = "0.1.0" dependencies = [ "bytes", - "prost", - "prost-types", + "prost 0.13.5", + "prost-types 0.13.5", "tonic", "tonic-build", ] @@ -3003,7 +3052,7 @@ version = "0.1.0" dependencies = [ "opentelemetry", "opentelemetry_sdk", - "prost", + "prost 0.13.5", "tonic", "tonic-build", ] @@ -3049,7 +3098,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -3058,7 +3107,7 @@ version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "serde", ] @@ -3074,7 +3123,17 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ - "fixedbitset", + "fixedbitset 0.4.2", + "indexmap 2.7.1", +] + +[[package]] +name = "petgraph" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772" +dependencies = [ + "fixedbitset 0.5.7", "indexmap 2.7.1", ] @@ -3137,9 +3196,9 @@ dependencies = [ "nix", "once_cell", "parking_lot", - "prost", - "prost-build", - "prost-derive", + "prost 0.12.6", + "prost-build 0.12.6", + "prost-derive 0.12.6", "sha2", "smallvec", "symbolic-demangle", @@ -3181,7 +3240,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.8.0", "hex", "procfs-core", "rustix", @@ -3193,7 +3252,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.8.0", "hex", ] @@ -3227,7 +3286,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.12.6", +] + +[[package]] +name = "prost" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" +dependencies = [ + "bytes", + "prost-derive 0.13.5", ] [[package]] @@ -3238,14 +3307,34 @@ checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes", "heck", - "itertools", + "itertools 0.12.1", "log", "multimap", "once_cell", - "petgraph", + "petgraph 0.6.5", "prettyplease", - "prost", - "prost-types", + "prost 0.12.6", + "prost-types 0.12.6", + "regex", + "syn", + "tempfile", +] + +[[package]] +name = "prost-build" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" +dependencies = [ + "heck", + "itertools 0.14.0", + "log", + "multimap", + "once_cell", + "petgraph 0.7.1", + "prettyplease", + "prost 0.13.5", + "prost-types 0.13.5", "regex", "syn", "tempfile", @@ -3258,7 +3347,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools", + "itertools 0.12.1", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "prost-derive" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" +dependencies = [ + "anyhow", + "itertools 0.14.0", "proc-macro2", "quote", "syn", @@ -3270,7 +3372,16 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost", + "prost 0.12.6", +] + +[[package]] +name = "prost-types" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" +dependencies = [ + "prost 0.13.5", ] [[package]] @@ -3315,8 +3426,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" dependencies = [ "rand_chacha 0.9.0", - "rand_core 0.9.0", - "zerocopy 0.8.14", + "rand_core 0.9.1", + "zerocopy 0.8.18", ] [[package]] @@ -3336,7 +3447,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core 0.9.0", + "rand_core 0.9.1", ] [[package]] @@ -3350,12 +3461,12 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff" +checksum = "a88e0da7a2c97baa202165137c158d0a2e824ac465d13d81046727b34cb247d3" dependencies = [ "getrandom 0.3.1", - "zerocopy 0.8.14", + "zerocopy 0.8.18", ] [[package]] @@ -3379,11 +3490,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.8.0", ] [[package]] @@ -3394,7 +3505,7 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] @@ -3409,9 +3520,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -3481,11 +3592,11 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.8.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3662,8 +3773,8 @@ name = "spiffe-proto" version = "0.1.0" dependencies = [ "bytes", - "prost", - "prost-types", + "prost 0.13.5", + "prost-types 0.13.5", "tonic", "tonic-build", ] @@ -3725,9 +3836,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" [[package]] name = "synstructure" @@ -3751,7 +3862,7 @@ dependencies = [ "getrandom 0.3.1", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3900,16 +4011,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.5.0" @@ -3983,26 +4084,29 @@ dependencies = [ [[package]] name = "tonic" -version = "0.10.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.7", + "base64 0.22.1", "bytes", "h2", - "http", + "http 1.2.0", "http-body", + "http-body-util", "hyper", "hyper-timeout", + "hyper-util", "percent-encoding", "pin-project", - "prost", + "prost 0.13.5", + "socket2", "tokio", "tokio-stream", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -4010,13 +4114,14 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.10.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" +checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11" dependencies = [ "prettyplease", "proc-macro2", - "prost-build", + "prost-build 0.13.5", + "prost-types 0.13.5", "quote", "syn", ] @@ -4048,6 +4153,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -4120,9 +4239,9 @@ dependencies = [ [[package]] name = "tracing-serde" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" dependencies = [ "serde", "tracing-core", @@ -4130,9 +4249,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "matchers", "nu-ansi-term", @@ -4241,9 +4360,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", @@ -4252,13 +4371,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn", @@ -4267,9 +4385,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4277,9 +4395,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -4290,9 +4408,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "widestring" @@ -4337,7 +4458,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -4357,17 +4487,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4378,9 +4509,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4390,9 +4521,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4402,9 +4533,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4414,9 +4551,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4426,9 +4563,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4438,9 +4575,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4450,9 +4587,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winreg" @@ -4470,7 +4607,7 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.8.0", ] [[package]] @@ -4547,11 +4684,11 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.14" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a367f292d93d4eab890745e75a778da40909cab4d6ff8173693812f79c4a2468" +checksum = "79386d31a42a4996e3336b0919ddb90f81112af416270cff95b5f5af22b839c2" dependencies = [ - "zerocopy-derive 0.8.14", + "zerocopy-derive 0.8.18", ] [[package]] @@ -4567,9 +4704,9 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.8.14" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3931cb58c62c13adec22e38686b559c86a30565e16ad6e8510a337cedc611e1" +checksum = "76331675d372f91bf8d17e13afbd5fe639200b73d01f0fc748bb059f9cca2db7" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 71c722a77..5efaa2314 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 diff --git a/hyper-balance/Cargo.toml b/hyper-balance/Cargo.toml index 110d9707b..e985266eb 100644 --- a/hyper-balance/Cargo.toml +++ b/hyper-balance/Cargo.toml @@ -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"] } diff --git a/linkerd/app/admin/Cargo.toml b/linkerd/app/admin/Cargo.toml index a800578bd..c5a7dfe33 100644 --- a/linkerd/app/admin/Cargo.toml +++ b/linkerd/app/admin/Cargo.toml @@ -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" diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml index 7c4dda476..7c343a241 100644 --- a/linkerd/app/core/Cargo.toml +++ b/linkerd/app/core/Cargo.toml @@ -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" diff --git a/linkerd/app/inbound/Cargo.toml b/linkerd/app/inbound/Cargo.toml index 46d849353..9d0d2c84c 100644 --- a/linkerd/app/inbound/Cargo.toml +++ b/linkerd/app/inbound/Cargo.toml @@ -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"] } diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml index 6b615ede7..93bf3547b 100644 --- a/linkerd/app/integration/Cargo.toml +++ b/linkerd/app/integration/Cargo.toml @@ -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", ] } diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml index cfa7103d6..f7b36067a 100644 --- a/linkerd/app/outbound/Cargo.toml +++ b/linkerd/app/outbound/Cargo.toml @@ -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" diff --git a/linkerd/app/test/Cargo.toml b/linkerd/app/test/Cargo.toml index a58afcef7..babc2a38e 100644 --- a/linkerd/app/test/Cargo.toml +++ b/linkerd/app/test/Cargo.toml @@ -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" } diff --git a/linkerd/http/executor/Cargo.toml b/linkerd/http/executor/Cargo.toml index ef75f18f6..4922ed293 100644 --- a/linkerd/http/executor/Cargo.toml +++ b/linkerd/http/executor/Cargo.toml @@ -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" diff --git a/linkerd/http/metrics/Cargo.toml b/linkerd/http/metrics/Cargo.toml index 02c1e87a8..6ccc7e19a 100644 --- a/linkerd/http/metrics/Cargo.toml +++ b/linkerd/http/metrics/Cargo.toml @@ -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"] } diff --git a/linkerd/http/retry/Cargo.toml b/linkerd/http/retry/Cargo.toml index dfbc05b50..2eabc86b2 100644 --- a/linkerd/http/retry/Cargo.toml +++ b/linkerd/http/retry/Cargo.toml @@ -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"] } diff --git a/linkerd/http/retry/src/replay.rs b/linkerd/http/retry/src/replay.rs index 91f2a5261..806ce8b02 100644 --- a/linkerd/http/retry/src/replay.rs +++ b/linkerd/http/retry/src/replay.rs @@ -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. // diff --git a/linkerd/http/upgrade/Cargo.toml b/linkerd/http/upgrade/Cargo.toml index ceb0da30e..3ed458d08 100644 --- a/linkerd/http/upgrade/Cargo.toml +++ b/linkerd/http/upgrade/Cargo.toml @@ -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 } diff --git a/linkerd/metrics/Cargo.toml b/linkerd/metrics/Cargo.toml index e4d863fca..08d33de55 100644 --- a/linkerd/metrics/Cargo.toml +++ b/linkerd/metrics/Cargo.toml @@ -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 } diff --git a/linkerd/proxy/http/Cargo.toml b/linkerd/proxy/http/Cargo.toml index df9adc657..d16c0026a 100644 --- a/linkerd/proxy/http/Cargo.toml +++ b/linkerd/proxy/http/Cargo.toml @@ -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" diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml index b7ee18b1c..ab7589079 100644 --- a/linkerd/proxy/tap/Cargo.toml +++ b/linkerd/proxy/tap/Cargo.toml @@ -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"] }