diff --git a/Cargo.lock b/Cargo.lock index fe4e77767..c9609016a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -447,7 +447,7 @@ dependencies = [ "httparse", "hyper 0.14.30", "hyper-rustls", - "indexmap 2.5.0", + "indexmap 2.6.0", "once_cell", "pin-project-lite", "pin-utils", @@ -687,9 +687,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.24" +version = "1.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" +checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" dependencies = [ "shlex", ] @@ -702,9 +702,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -712,9 +712,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -1037,6 +1037,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1070,7 +1076,7 @@ dependencies = [ "parking_lot", "rand", "redis-protocol", - "rustls 0.23.13", + "rustls 0.23.14", "rustls-native-certs 0.7.3", "semver", "sha-1", @@ -1096,9 +1102,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1111,9 +1117,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1121,15 +1127,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1138,15 +1144,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", @@ -1155,21 +1161,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1206,9 +1212,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -1228,7 +1234,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -1247,7 +1253,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -1262,12 +1268,13 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" dependencies = [ - "ahash", "allocator-api2", + "equivalent", + "foldhash", ] [[package]] @@ -1500,12 +1507,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -1532,9 +1539,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b" dependencies = [ "wasm-bindgen", ] @@ -1596,11 +1603,11 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.0", ] [[package]] @@ -1709,9 +1716,9 @@ dependencies = [ [[package]] name = "mock_instant" -version = "0.3.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9366861eb2a2c436c20b12c8dbec5f798cea6b47ad99216be0282942e2c81ea0" +checksum = "cdcebb6db83796481097dedc7747809243cc81d9ed83e6a938b76d4ea0b249cf" [[package]] name = "multimap" @@ -1749,9 +1756,9 @@ dependencies = [ "serde_json", "serde_json5", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.0", "tonic", - "tower 0.4.13", + "tower 0.5.1", "tracing", "tracing-subscriber", ] @@ -1903,7 +1910,7 @@ dependencies = [ "tokio", "tokio-stream", "tonic", - "tower 0.4.13", + "tower 0.5.1", "tracing", "uuid", ] @@ -1943,7 +1950,6 @@ dependencies = [ "nativelink-metric-collector", "nativelink-proto", "nativelink-util", - "once_cell", "parking_lot", "patricia_tree", "pretty_assertions", @@ -2021,7 +2027,6 @@ dependencies = [ "nativelink-proto", "nativelink-store", "nativelink-util", - "once_cell", "parking_lot", "pretty_assertions", "prost", @@ -2085,21 +2090,18 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.20.1" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" -dependencies = [ - "portable-atomic", -] +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl-probe" @@ -2109,9 +2111,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "opentelemetry" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b69a91d4893e713e06f724597ad630f1fa76057a5e1026c0ca67054a9032a76" +checksum = "4c365a63eec4f55b7efeceb724f1336f26a9cf3427b70e59e2cd2a5b947fba96" dependencies = [ "futures-core", "futures-sink", @@ -2123,9 +2125,9 @@ dependencies = [ [[package]] name = "opentelemetry-prometheus" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1a24eafe47b693cb938f8505f240dc26c71db60df9aca376b4f857e9653ec7" +checksum = "cc4191ce34aa274621861a7a9d68dbcf618d5b6c66b10081631b61fd81fbc015" dependencies = [ "once_cell", "opentelemetry", @@ -2136,31 +2138,20 @@ dependencies = [ [[package]] name = "opentelemetry_sdk" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae312d58eaa90a82d2e627fd86e075cf5230b3f11794e2ed74199ebbe572d4fd" +checksum = "692eac490ec80f24a17828d49b40b60f5aeaccdfe6a503f939713afd22bc28df" dependencies = [ "async-trait", "futures-channel", "futures-executor", "futures-util", "glob", - "lazy_static", "once_cell", "opentelemetry", - "ordered-float", "thiserror", ] -[[package]] -name = "ordered-float" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537" -dependencies = [ - "num-traits", -] - [[package]] name = "outref" version = "0.5.1" @@ -2269,23 +2260,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.5.0", + "indexmap 2.6.0", ] [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", @@ -2304,12 +2295,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "portable-atomic" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" - [[package]] name = "powerfmt" version = "0.2.0" @@ -2371,9 +2356,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] @@ -2646,22 +2631,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "ring", - "rustls-pki-types", - "rustls-webpki 0.102.8", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls" -version = "0.23.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" dependencies = [ "log", "once_cell", @@ -2765,9 +2737,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ "windows-sys 0.59.0", ] @@ -2849,7 +2821,7 @@ version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itoa", "memchr", "ryu", @@ -3164,24 +3136,13 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls 0.22.4", - "rustls-pki-types", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.13", + "rustls 0.23.14", "rustls-pki-types", "tokio", ] @@ -3397,9 +3358,9 @@ checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" @@ -3502,9 +3463,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887" dependencies = [ "cfg-if", "once_cell", @@ -3513,9 +3474,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e" dependencies = [ "bumpalo", "log", @@ -3528,9 +3489,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3538,9 +3499,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6" dependencies = [ "proc-macro2", "quote", @@ -3551,9 +3512,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9" [[package]] name = "webpki-roots" diff --git a/Cargo.toml b/Cargo.toml index d1c45207d..33fe54582 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,17 +58,17 @@ rustls-pemfile = { version = "2.2.0", default-features = false } scopeguard = { version = "1.2.0", default-features = false } serde_json5 = "0.1.0" tokio = { version = "1.40.0", features = ["fs", "rt-multi-thread", "signal", "io-util"], default-features = false } -tokio-rustls = { version = "0.25.0", default-features = false, features = [ +tokio-rustls = { version = "0.26.0", default-features = false, features = [ "ring", ] } tonic = { version = "0.12.3", features = ["transport", "tls"], default-features = false } -tower = { version = "0.4.13", default-features = false } +tower = { version = "0.5.1", default-features = false } tracing = { version = "0.1.40", default-features = false } -opentelemetry_sdk = { version = "0.23.0", default-features = false } +opentelemetry_sdk = { version = "0.24.1", default-features = false } tracing-subscriber = { version = "0.3.18", default-features = false } -opentelemetry = { version = "0.23.0", default-features = false } +opentelemetry = { version = "0.24.0", default-features = false } prometheus = { version = "0.13.4", default-features = false } -opentelemetry-prometheus = "0.16.0" +opentelemetry-prometheus = "0.17.0" serde_json = "1.0.128" [workspace.cargo-features-manager.keep] diff --git a/nativelink-metric-collector/Cargo.toml b/nativelink-metric-collector/Cargo.toml index 66b44e661..de688c4ef 100644 --- a/nativelink-metric-collector/Cargo.toml +++ b/nativelink-metric-collector/Cargo.toml @@ -6,7 +6,7 @@ rust-version = "1.79.0" [dependencies] nativelink-metric = { path = "../nativelink-metric" } -opentelemetry = { version = "0.23.0", default-features = false } +opentelemetry = { version = "0.24.0", default-features = false } parking_lot = "0.12.3" serde = { version = "1.0.210", default-features = false } tracing = { version = "0.1.40", default-features = false } @@ -14,7 +14,7 @@ tracing-subscriber = { version = "0.3.18", default-features = false } [dev-dependencies] nativelink-error = { path = "../nativelink-error" } -opentelemetry_sdk = { version = "0.23.0", default-features = false } -opentelemetry-prometheus = "0.16.0" +opentelemetry_sdk = { version = "0.24.1", default-features = false } +opentelemetry-prometheus = "0.17.0" prometheus = { version = "0.13.4", default-features = false } serde_json = { version = "1.0.128", default-features = false } diff --git a/nativelink-metric-collector/tests/metric_collector_test.rs b/nativelink-metric-collector/tests/metric_collector_test.rs index c45263a57..def159a94 100644 --- a/nativelink-metric-collector/tests/metric_collector_test.rs +++ b/nativelink-metric-collector/tests/metric_collector_test.rs @@ -182,7 +182,7 @@ fn test_prometheus_exporter() -> Result<(), Error> { nativelink_custom_handler_num_counter 6 nativelink_foo_custom_handler_num_counter 4 nativelink_pub_u64 1 -target_info{service_name="unknown_service",telemetry_sdk_language="rust",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="0.23.0"} 1 +target_info{service_name="unknown_service",telemetry_sdk_language="rust",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="0.24.1"} 1 "#.trim()).lines().map(|v| v.unwrap()).collect(); // We need to sort because the output order is non-deterministic. diff --git a/nativelink-scheduler/Cargo.toml b/nativelink-scheduler/Cargo.toml index 1f6a4e8a0..09e10ac7f 100644 --- a/nativelink-scheduler/Cargo.toml +++ b/nativelink-scheduler/Cargo.toml @@ -20,7 +20,7 @@ prost = { version = "0.13.3", default-features = false } uuid = { version = "1.10.0", default-features = false, features = ["v4", "serde"] } futures = { version = "0.3.30", default-features = false } lru = { version = "0.12.4", default-features = false } -mock_instant = "0.3.2" +mock_instant = "0.5.1" parking_lot = "0.12.3" rand = { version = "0.8.5", default-features = false } scopeguard = { version = "1.2.0", default-features = false } diff --git a/nativelink-scheduler/tests/redis_store_awaited_action_db_test.rs b/nativelink-scheduler/tests/redis_store_awaited_action_db_test.rs index 9c5ff530d..419551534 100644 --- a/nativelink-scheduler/tests/redis_store_awaited_action_db_test.rs +++ b/nativelink-scheduler/tests/redis_store_awaited_action_db_test.rs @@ -24,7 +24,7 @@ use fred::error::{RedisError, RedisErrorKind}; use fred::mocks::{MockCommand, Mocks}; use fred::prelude::Builder; use fred::types::{RedisConfig, RedisValue}; -use mock_instant::SystemTime as MockSystemTime; +use mock_instant::thread_local::SystemTime as MockSystemTime; use nativelink_error::Error; use nativelink_macro::nativelink_test; use nativelink_scheduler::awaited_action_db::{ diff --git a/nativelink-scheduler/tests/simple_scheduler_test.rs b/nativelink-scheduler/tests/simple_scheduler_test.rs index 61da818df..acac8a50f 100644 --- a/nativelink-scheduler/tests/simple_scheduler_test.rs +++ b/nativelink-scheduler/tests/simple_scheduler_test.rs @@ -23,7 +23,7 @@ use std::time::{Duration, SystemTime, UNIX_EPOCH}; use async_lock::Mutex; use futures::task::Poll; use futures::{poll, Stream, StreamExt}; -use mock_instant::{MockClock, SystemTime as MockSystemTime}; +use mock_instant::thread_local::{MockClock, SystemTime as MockSystemTime}; use nativelink_config::schedulers::PropertyType; use nativelink_error::{make_err, Code, Error, ResultExt}; use nativelink_macro::nativelink_test; diff --git a/nativelink-service/Cargo.toml b/nativelink-service/Cargo.toml index 12b203fa6..92b9e6b51 100644 --- a/nativelink-service/Cargo.toml +++ b/nativelink-service/Cargo.toml @@ -22,7 +22,7 @@ prost = { version = "0.13.3", default-features = false } tokio = { version = "1.40.0", features = ["fs", "rt-multi-thread", "signal", "io-util"], default-features = false } tokio-stream = { version = "0.1.16", features = ["fs"], default-features = false } tonic = { version = "0.12.3", features = ["transport", "tls"], default-features = false } -tower = { version = "0.4.13", default-features = false } +tower = { version = "0.5.1", default-features = false } tracing = { version = "0.1.40", default-features = false } uuid = { version = "1.10.0", default-features = false, features = ["v4", "serde"] } diff --git a/nativelink-store/BUILD.bazel b/nativelink-store/BUILD.bazel index 0e7c5d2ed..2c2db113c 100644 --- a/nativelink-store/BUILD.bazel +++ b/nativelink-store/BUILD.bazel @@ -120,7 +120,6 @@ rust_test_suite( "@crates//:hyper-0.14.30", "@crates//:memory-stats", "@crates//:mock_instant", - "@crates//:once_cell", "@crates//:parking_lot", "@crates//:pretty_assertions", "@crates//:rand", diff --git a/nativelink-store/Cargo.toml b/nativelink-store/Cargo.toml index 9c61f5ef4..fa3094417 100644 --- a/nativelink-store/Cargo.toml +++ b/nativelink-store/Cargo.toml @@ -63,8 +63,7 @@ nativelink-macro = { path = "../nativelink-macro" } nativelink-metric-collector = { path = "../nativelink-metric-collector" } pretty_assertions = { version = "1.4.1", features = ["std"] } memory-stats = "1.2.0" -mock_instant = "0.3.2" -once_cell = { version = "1.20.1", default-features = false } +mock_instant = "0.5.1" sha2 = { version = "0.10.8", default-features = false } http = { version = "1.1.0", default-features = false } aws-smithy-types = "1.2.7" diff --git a/nativelink-store/tests/existence_store_test.rs b/nativelink-store/tests/existence_store_test.rs index 5fafb9d36..2f47eabe0 100644 --- a/nativelink-store/tests/existence_store_test.rs +++ b/nativelink-store/tests/existence_store_test.rs @@ -14,7 +14,7 @@ use std::time::Duration; -use mock_instant::MockClock; +use mock_instant::thread_local::MockClock; use nativelink_config::stores::{ EvictionPolicy, ExistenceCacheStore as ExistenceCacheStoreConfig, StoreConfig, }; diff --git a/nativelink-store/tests/filesystem_store_test.rs b/nativelink-store/tests/filesystem_store_test.rs index 1c5f5d39b..62e813147 100644 --- a/nativelink-store/tests/filesystem_store_test.rs +++ b/nativelink-store/tests/filesystem_store_test.rs @@ -19,7 +19,7 @@ use std::marker::PhantomData; use std::ops::DerefMut; use std::path::Path; use std::sync::atomic::{AtomicBool, AtomicU32, Ordering}; -use std::sync::Arc; +use std::sync::{Arc, LazyLock}; use std::time::{Duration, SystemTime}; use async_lock::RwLock; @@ -40,7 +40,6 @@ use nativelink_util::evicting_map::LenEntry; use nativelink_util::origin_context::ContextAwareFuture; use nativelink_util::store_trait::{Store, StoreLike, UploadSizeInfo}; use nativelink_util::{background_spawn, spawn}; -use once_cell::sync::Lazy; use parking_lot::Mutex; use pretty_assertions::assert_eq; use rand::{thread_rng, Rng}; @@ -803,7 +802,8 @@ async fn eviction_on_insert_calls_unref_once() -> Result<(), Error> { let small_digest = DigestInfo::try_new(HASH1, SMALL_VALUE.len())?; let big_digest = DigestInfo::try_new(HASH1, BIG_VALUE.len())?; - static UNREFED_DIGESTS: Lazy>> = Lazy::new(|| Mutex::new(Vec::new())); + static UNREFED_DIGESTS: LazyLock>> = + LazyLock::new(|| Mutex::new(Vec::new())); struct LocalHooks {} impl FileEntryHooks for LocalHooks { fn on_unref(file_entry: &Fe) { @@ -863,7 +863,8 @@ async fn rename_on_insert_fails_due_to_filesystem_error_proper_cleanup_happens() let content_path = make_temp_path("content_path"); let temp_path = make_temp_path("temp_path"); - static FILE_DELETED_BARRIER: Lazy> = Lazy::new(|| Arc::new(Barrier::new(2))); + static FILE_DELETED_BARRIER: LazyLock> = + LazyLock::new(|| Arc::new(Barrier::new(2))); struct LocalHooks {} impl FileEntryHooks for LocalHooks { diff --git a/nativelink-store/tests/s3_store_test.rs b/nativelink-store/tests/s3_store_test.rs index e91f6900e..e25ce5154 100644 --- a/nativelink-store/tests/s3_store_test.rs +++ b/nativelink-store/tests/s3_store_test.rs @@ -25,7 +25,7 @@ use futures::task::Poll; use http::header; use http::status::StatusCode; use hyper::Body; -use mock_instant::MockClock; +use mock_instant::thread_local::MockClock; use nativelink_error::{make_input_err, Error, ResultExt}; use nativelink_macro::nativelink_test; use nativelink_store::s3_store::S3Store; diff --git a/nativelink-util/Cargo.toml b/nativelink-util/Cargo.toml index 6652cae50..fb635af60 100644 --- a/nativelink-util/Cargo.toml +++ b/nativelink-util/Cargo.toml @@ -41,7 +41,7 @@ tonic = { version = "0.12.3", features = ["transport", "tls"], default-features tracing = { version = "0.1.40", default-features = false } tracing-subscriber = { version = "0.3.18", features = ["ansi", "env-filter", "json"], default-features = false } uuid = { version = "1.10.0", default-features = false, features = ["v4", "serde"] } -mock_instant = "0.3.2" +mock_instant = "0.5.1" [dev-dependencies] nativelink-macro = { path = "../nativelink-macro" } diff --git a/nativelink-util/src/instant_wrapper.rs b/nativelink-util/src/instant_wrapper.rs index d61cba327..658352487 100644 --- a/nativelink-util/src/instant_wrapper.rs +++ b/nativelink-util/src/instant_wrapper.rs @@ -15,7 +15,7 @@ use std::future::Future; use std::time::{Duration, SystemTime, UNIX_EPOCH}; -use mock_instant::{Instant as MockInstant, MockClock}; +use mock_instant::thread_local::{Instant as MockInstant, MockClock}; /// Wrapper used to abstract away which underlying Instant impl we are using. /// This is needed for testing. diff --git a/nativelink-util/tests/evicting_map_test.rs b/nativelink-util/tests/evicting_map_test.rs index f02f8a21d..abf89dcf8 100644 --- a/nativelink-util/tests/evicting_map_test.rs +++ b/nativelink-util/tests/evicting_map_test.rs @@ -17,7 +17,7 @@ use std::sync::Arc; use std::time::Duration; use bytes::Bytes; -use mock_instant::MockClock; +use mock_instant::thread_local::MockClock; use nativelink_config::stores::EvictionPolicy; use nativelink_error::Error; use nativelink_macro::nativelink_test; diff --git a/nativelink-worker/BUILD.bazel b/nativelink-worker/BUILD.bazel index 112330606..e7fbd4afc 100644 --- a/nativelink-worker/BUILD.bazel +++ b/nativelink-worker/BUILD.bazel @@ -71,7 +71,6 @@ rust_test_suite( "@crates//:bytes", "@crates//:futures", "@crates//:hyper-1.4.1", - "@crates//:once_cell", "@crates//:pin-project-lite", "@crates//:pretty_assertions", "@crates//:prost", diff --git a/nativelink-worker/Cargo.toml b/nativelink-worker/Cargo.toml index 8b3bf87f2..e49ca65ed 100644 --- a/nativelink-worker/Cargo.toml +++ b/nativelink-worker/Cargo.toml @@ -36,7 +36,6 @@ nativelink-macro = { path = "../nativelink-macro" } hyper = "1.4.1" hyper-util = "0.1.9" -once_cell = { version = "1.20.1", default-features = false } pretty_assertions = { version = "1.4.1", features = ["std"] } prost-types = { version = "0.13.3", default-features = false } rand = { version = "0.8.5", default-features = false } diff --git a/nativelink-worker/tests/running_actions_manager_test.rs b/nativelink-worker/tests/running_actions_manager_test.rs index 14759c524..4e7b23331 100644 --- a/nativelink-worker/tests/running_actions_manager_test.rs +++ b/nativelink-worker/tests/running_actions_manager_test.rs @@ -22,7 +22,7 @@ use std::io::{Cursor, Write}; use std::os::unix::fs::{MetadataExt, PermissionsExt}; use std::str::from_utf8; use std::sync::atomic::{AtomicBool, AtomicI64, AtomicU64, Ordering}; -use std::sync::{Arc, Mutex}; +use std::sync::{Arc, LazyLock, Mutex}; use std::time::{Duration, SystemTime, UNIX_EPOCH}; use futures::{FutureExt, StreamExt, TryFutureExt, TryStreamExt}; @@ -54,7 +54,6 @@ use nativelink_worker::running_actions_manager::{ download_to_directory, Callbacks, ExecutionConfiguration, RunningAction, RunningActionImpl, RunningActionsManager, RunningActionsManagerArgs, RunningActionsManagerImpl, }; -use once_cell::sync::Lazy; use pretty_assertions::assert_eq; use prost::Message; use rand::{thread_rng, Rng}; @@ -2568,7 +2567,7 @@ async fn worker_times_out() -> Result<(), Box> { } type StaticOneshotTuple = Mutex<(Option>, Option>)>; - static TIMEOUT_ONESHOT: Lazy = Lazy::new(|| { + static TIMEOUT_ONESHOT: LazyLock = LazyLock::new(|| { let (tx, rx) = oneshot::channel(); Mutex::new((Some(tx), Some(rx))) });