diff --git a/Cargo.lock b/Cargo.lock index 17ddd55..7d094a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -28,6 +28,18 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy 0.7.35", +] + [[package]] name = "aho-corasick" version = "1.1.3" @@ -102,15 +114,21 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" + +[[package]] +name = "arraydeque" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" [[package]] name = "asn1-rs" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" +checksum = "607495ec7113b178fbba7a6166a27f99e774359ef4823adbefd756b5b81d7970" dependencies = [ "asn1-rs-derive", "asn1-rs-impl", @@ -118,19 +136,19 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror", + "thiserror 2.0.11", "time", ] [[package]] name = "asn1-rs-derive" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" +checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", "synstructure", ] @@ -142,7 +160,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -165,8 +183,8 @@ checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.1", - "futures-lite 2.3.0", + "fastrand 2.3.0", + "futures-lite 2.6.0", "slab", ] @@ -178,10 +196,10 @@ checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ "async-channel", "async-executor", - "async-io 2.3.4", + "async-io 2.4.0", "async-lock 3.4.0", "blocking", - "futures-lite 2.3.0", + "futures-lite 2.6.0", "once_cell", ] @@ -210,7 +228,7 @@ dependencies = [ "log", "parking", "polling 2.8.0", - "rustix 0.37.27", + "rustix 0.37.28", "slab", "socket2 0.4.10", "waker-fn", @@ -218,18 +236,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.4" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" dependencies = [ "async-lock 3.4.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.3.0", + "futures-lite 2.6.0", "parking", - "polling 3.7.3", - "rustix 0.38.37", + "polling 3.7.4", + "rustix 0.38.44", "slab", "tracing", "windows-sys 0.59.0", @@ -250,7 +268,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.4.0", "event-listener-strategy", "pin-project-lite", ] @@ -275,7 +293,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -297,7 +315,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -308,13 +326,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.83" +version = "0.1.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -340,47 +358,103 @@ 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", + "axum-core 0.4.5", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "itoa", + "matchit 0.7.3", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower 0.5.2", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8" +dependencies = [ + "axum-core 0.5.0", "bytes", + "form_urlencoded", "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.31", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", "itoa", - "matchit", + "matchit 0.8.4", "memchr", "mime", "percent-encoding", "pin-project-lite", "rustversion", "serde", - "sync_wrapper 0.1.2", - "tower", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower 0.5.2", "tower-layer", "tower-service", + "tracing", ] [[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 0.2.12", - "http-body 0.4.6", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1362f362fd16024ae199c1970ce98f9661bf5ef94b9808fee734bc3698b733" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -431,25 +505,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bincode" -version = "2.0.0-rc.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11ea1a0346b94ef188834a65c068a03aec181c94896d481d7a0a40d85b0ce95" -dependencies = [ - "bincode_derive", - "serde", -] - -[[package]] -name = "bincode_derive" -version = "2.0.0-rc.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e30759b3b99a1b802a7a3aa21c85c3ded5c28e1c83170d82d70f08bbf7f3e4c" -dependencies = [ - "virtue", -] - [[package]] name = "bitflags" version = "1.3.2" @@ -458,9 +513,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" dependencies = [ "serde", ] @@ -492,50 +547,67 @@ dependencies = [ "async-channel", "async-task", "futures-io", - "futures-lite 2.3.0", + "futures-lite 2.6.0", "piper", ] [[package]] name = "bstr" -version = "1.10.0" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0" dependencies = [ "memchr", "serde", ] [[package]] -name = "build-env" -version = "0.3.1" +name = "bumpalo" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1522ac6ee801a11bf9ef3f80403f4ede6eb41291fac3dde3de09989679305f25" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] -name = "bumpalo" -version = "3.16.0" +name = "bytecheck" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c8f430744b23b54ad15161fcbc22d82a29b73eacbe425fea23ec822600bc6f" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "rancor", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "523363cbe1df49b68215efdf500b103ac3b0fb4836aed6d15689a076eadb8fff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] [[package]] name = "bytemuck" -version = "1.19.0" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" +checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" +checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -546,15 +618,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cacache" -version = "13.0.0" +version = "13.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a61ff12b19d89c752c213316b87fdb4a587f073d219b893cc56974b8c9f39bf7" +checksum = "5c5063741c7b2e260bbede781cf4679632dd90e2718e99f7715e46824b65670b" dependencies = [ "digest", "either", @@ -571,7 +643,7 @@ dependencies = [ "sha2", "ssri", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "walkdir", @@ -588,9 +660,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.30" +version = "1.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" +checksum = "e4730490333d58093109dc02c23174c3f4d490998c3fed3cc8e82d57afedb9cf" dependencies = [ "shlex", ] @@ -615,9 +687,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -661,34 +733,33 @@ dependencies = [ [[package]] name = "config" -version = "0.14.0" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" +checksum = "e26695492a475c4a091cfda61446d5ba01aac2e1dfbcd27a12fdd11aa2e32596" dependencies = [ "async-trait", "convert_case", "json5", - "lazy_static", - "nom", "pathdiff", "ron 0.8.1", "rust-ini", "serde", "serde_json", "toml", - "yaml-rust", + "winnow", + "yaml-rust2", ] [[package]] name = "console" -version = "0.15.8" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b" dependencies = [ "encode_unicode", - "lazy_static", "libc", - "windows-sys 0.52.0", + "once_cell", + "windows-sys 0.59.0", ] [[package]] @@ -712,7 +783,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ - "getrandom", + "getrandom 0.2.15", "once_cell", "tiny-keccak", ] @@ -759,9 +830,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] @@ -777,9 +848,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.13" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" dependencies = [ "crossbeam-utils", ] @@ -795,24 +866,24 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" [[package]] name = "crypto-common" @@ -824,16 +895,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "cstr-argument" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bd9c8e659a473bce955ae5c35b116af38af11a7acb0b480e01f3ed348aeb40" -dependencies = [ - "cfg-if", - "memchr", -] - [[package]] name = "darling" version = "0.20.10" @@ -855,7 +916,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -866,27 +927,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.79", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", + "syn 2.0.96", ] [[package]] name = "data-encoding" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" +checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f" [[package]] name = "dbus" @@ -914,9 +962,9 @@ dependencies = [ [[package]] name = "der-parser" -version = "9.0.0" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +checksum = "07da5016415d5a3c4dd39b11ed26f915f52fc4e0dc197d87908bc916e51bc1a6" dependencies = [ "asn1-rs", "displaydoc", @@ -934,7 +982,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -975,7 +1023,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -985,7 +1033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -1016,7 +1064,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -1063,15 +1111,15 @@ dependencies = [ [[package]] name = "encode_unicode" -version = "0.3.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -1084,12 +1132,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1100,9 +1148,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" dependencies = [ "concurrent-queue", "parking", @@ -1111,11 +1159,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.4.0", "pin-project-lite", ] @@ -1139,15 +1187,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" - -[[package]] -name = "fixedbitset" -version = "0.4.2" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fixedbitset" @@ -1163,9 +1205,9 @@ checksum = "b3ea1ec5f8307826a5b71094dd91fc04d4ae75d5709b20ad351c7fb4815c86ec" [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -1173,9 +1215,9 @@ dependencies = [ [[package]] name = "flume" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" dependencies = [ "futures-core", "futures-sink", @@ -1194,28 +1236,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", + "foreign-types-shared", ] [[package]] @@ -1224,12 +1245,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1304,11 +1319,11 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.3.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532" dependencies = [ - "fastrand 2.1.1", + "fastrand 2.3.0", "futures-core", "futures-io", "parking", @@ -1323,7 +1338,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -1356,6 +1371,19 @@ dependencies = [ "slab", ] +[[package]] +name = "generator" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd" +dependencies = [ + "cfg-if", + "libc", + "log", + "rustversion", + "windows 0.58.0", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -1374,19 +1402,31 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets 0.52.6", ] [[package]] name = "getset" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f636605b743120a8d32ed92fc27b6cde1a769f8f936c065151eb66f88ded513c" +checksum = "eded738faa0e88d3abc9d1a13cb11adc2073c400969eeb8793cf7132589959fc" dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -1395,6 +1435,12 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +[[package]] +name = "glob" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" + [[package]] name = "globset" version = "0.4.15" @@ -1404,42 +1450,23 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.6.0", - "slab", - "tokio", - "tokio-util", - "tracing", + "regex-automata 0.4.9", + "regex-syntax 0.8.5", ] [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "http 1.1.0", - "indexmap 2.6.0", + "http", + "indexmap 2.7.1", "slab", "tokio", "tokio-util", @@ -1452,29 +1479,29 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" - [[package]] name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", +] [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] -name = "heck" -version = "0.4.1" +name = "hashlink" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] [[package]] name = "heck" @@ -1509,48 +1536,17 @@ dependencies = [ "digest", ] -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", "itoa", ] -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - [[package]] name = "http-body" version = "1.0.1" @@ -1558,7 +1554,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http", ] [[package]] @@ -1569,21 +1565,21 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", - "http-body 1.0.1", + "http", + "http-body", "pin-project-lite", ] [[package]] name = "http-cache" -version = "0.19.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ffb12b95bb2a369fe47ca8924016c72c2fa0e6059ba98bd1516f558696c5a8" +checksum = "7e883defacf53960c7717d9e928dc8667be9501d9f54e6a8b7703d7a30320e9c" dependencies = [ "async-trait", - "bincode 1.3.3", + "bincode", "cacache", - "http 1.1.0", + "http", "http-cache-semantics", "httpdate", "moka", @@ -1593,13 +1589,13 @@ dependencies = [ [[package]] name = "http-cache-reqwest" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be3e27c4e2e510571cbcc601407b639667146aa9a4e818d5cc1d97c8b4b27d61" +checksum = "e076afd9d376f09073b515ce95071b29393687d98ed521948edb899195595ddf" dependencies = [ "anyhow", "async-trait", - "http 1.1.0", + "http", "http-cache", "http-cache-semantics", "reqwest", @@ -1614,7 +1610,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92baf25cf0b8c9246baecf3a444546360a97b569168fdf92563ee6a47829920c" dependencies = [ - "http 1.1.0", + "http", "http-serde", "serde", "time", @@ -1626,15 +1622,15 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f056c8559e3757392c8d091e796416e4649d8e49e88b8d76df6c002f05027fd" dependencies = [ - "http 1.1.0", + "http", "serde", ] [[package]] name = "httparse" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" +checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a" [[package]] name = "httpdate" @@ -1644,57 +1640,34 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.31" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" +checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", + "h2", + "http", + "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] -name = "hyper" -version = "1.5.0" +name = "hyper-rustls" +version = "0.27.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ - "bytes", - "futures-channel", "futures-util", - "h2 0.4.6", - "http 1.1.0", - "http-body 1.0.1", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" -dependencies = [ - "futures-util", - "http 1.1.0", - "hyper 1.5.0", + "http", + "hyper", "hyper-util", "rustls", "rustls-pki-types", @@ -1705,14 +1678,15 @@ dependencies = [ [[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 0.14.31", + "hyper", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", ] [[package]] @@ -1723,7 +1697,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.5.0", + "hyper", "hyper-util", "native-tls", "tokio", @@ -1733,18 +1707,18 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "hyper 1.5.0", + "http", + "http-body", + "hyper", "pin-project-lite", - "socket2 0.5.7", + "socket2 0.5.8", "tokio", "tower-service", "tracing", @@ -1773,6 +1747,124 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -1781,12 +1873,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] @@ -1801,12 +1904,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", - "hashbrown 0.15.0", + "hashbrown 0.15.2", "serde", ] @@ -1822,16 +1925,17 @@ dependencies = [ [[package]] name = "insta" -version = "1.40.0" +version = "1.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" +checksum = "71c1b125e30d93896b365e156c33dadfffab45ee8400afcbba4752f59de08a86" dependencies = [ "console", "globset", - "lazy_static", "linked-hash-map", + "once_cell", "pest", "pest_derive", + "pin-project", "ron 0.7.1", "serde", "similar", @@ -1860,31 +1964,32 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "itertools" -version = "0.10.5" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -1929,22 +2034,22 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.161" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libcgroups" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef6c844cd81f0e078bb07896a14fddcec9f9582833ce18f99c2d4c9b69081d53" +checksum = "a2c44a1aff9c0ae6809dab6a76ec99532d144951031ed07234d086a182e1091d" dependencies = [ - "fixedbitset 0.5.7", + "fixedbitset", "nix 0.28.0", "oci-spec", "procfs", "serde", - "thiserror", + "thiserror 2.0.11", "tracing", ] @@ -1967,17 +2072,6 @@ dependencies = [ "copy_dir", ] -[[package]] -name = "libsystemd-sys" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed080163caa59cc29b34bce2209b737149a4bac148cd9a8b04e4c12822798119" -dependencies = [ - "build-env", - "libc", - "pkg-config", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -1992,9 +2086,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "litemap" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "lock_api" @@ -2008,9 +2108,22 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" + +[[package]] +name = "loom" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "tracing", + "tracing-subscriber", +] [[package]] name = "map-macro" @@ -2018,12 +2131,27 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb950a42259642e5a3483115aca87eebed2a64886993463af9c9739c205b8d3a" +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "matchit" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + [[package]] name = "memchr" version = "2.7.4" @@ -2056,19 +2184,19 @@ checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" dependencies = [ "miette-derive 5.10.0", "once_cell", - "thiserror", + "thiserror 1.0.69", "unicode-width", ] [[package]] name = "miette" -version = "7.2.0" +version = "7.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" +checksum = "1a955165f87b37fd1862df2a59547ac542c77ef6d17c666f619d1ad22dd89484" dependencies = [ "cfg-if", - "miette-derive 7.2.0", - "thiserror", + "miette-derive 7.5.0", + "thiserror 1.0.69", "unicode-width", ] @@ -2080,18 +2208,18 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] name = "miette-derive" -version = "7.2.0" +version = "7.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" +checksum = "bf45bf44ab49be92fd1227a3be6fc6f617f1a337c06af54981048574d8783147" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -2118,54 +2246,65 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ "adler2", ] [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi 0.3.9", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] [[package]] name = "moka" -version = "0.12.8" +version = "0.12.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cf62eb4dd975d2dde76432fb1075c49e3ee2331cf36f1f8fd4b66550d32b6f" +checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926" dependencies = [ "async-lock 3.4.0", - "async-trait", "crossbeam-channel", "crossbeam-epoch", "crossbeam-utils", - "event-listener 5.3.1", + "event-listener 5.4.0", "futures-util", - "once_cell", + "loom", "parking_lot", - "quanta", + "portable-atomic", "rustc_version", "smallvec", "tagptr", - "thiserror", - "triomphe", + "thiserror 1.0.69", "uuid", ] [[package]] -name = "multimap" -version = "0.8.3" +name = "munge" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64142d38c84badf60abf06ff9bd80ad2174306a5b11bd4706535090a30a419df" +dependencies = [ + "munge_macro", +] + +[[package]] +name = "munge_macro" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +checksum = "1bb5c1d8184f13f7d0ccbeeca0def2f9a181bce2624302793005f5ca8aa62e5e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] [[package]] name = "nano-id" @@ -2173,14 +2312,14 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2adbe5f0f3dd71ed00a8c8a6ac7d7d2d4f65977661efc830b0e1f8cf5a08dfca" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] name = "native-tls" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c" dependencies = [ "libc", "log", @@ -2199,7 +2338,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "cfg-if", "cfg_aliases 0.1.1", "libc", @@ -2212,7 +2351,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "cfg-if", "cfg_aliases 0.2.1", "libc", @@ -2284,54 +2423,53 @@ dependencies = [ [[package]] name = "object" -version = "0.36.5" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "memchr", ] [[package]] name = "oci-spec" -version = "0.6.8" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f5a3fe998d50101ae009351fec56d88a69f4ed182e11000e711068c2f5abf72" +checksum = "da406e58efe2eb5986a6139626d611ce426e5324a824133d76367c765cf0b882" dependencies = [ "derive_builder", "getset", - "once_cell", "regex", "serde", "serde_json", "strum", "strum_macros", - "thiserror", + "thiserror 2.0.11", ] [[package]] name = "oid-registry" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9" +checksum = "264c56d1492c13e769662197fb6b94e0a52abe52d27efac374615799a4bf453d" dependencies = [ "asn1-rs", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl" -version = "0.10.68" +version = "0.10.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +checksum = "f5e534d133a060a3c19daec1eb3e98ec6f4685978834f2dbadfe2ec215bab64e" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "cfg-if", - "foreign-types 0.3.2", + "foreign-types", "libc", "once_cell", "openssl-macros", @@ -2346,14 +2484,14 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] name = "openssl-probe" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" @@ -2369,92 +2507,78 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.18.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" +checksum = "ab70038c28ed37b97d8ed414b6429d343a8bbf44c9f79ec854f3a643029ba6d7" dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk", + "futures-core", + "futures-sink", + "js-sys", + "pin-project-lite", + "thiserror 1.0.69", + "tracing", ] [[package]] name = "opentelemetry-otlp" -version = "0.11.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" +checksum = "91cf61a1868dacc576bf2b2a1c3e9ab150af7272909e80085c3173384fe11f76" dependencies = [ "async-trait", - "futures", - "futures-util", - "http 0.2.12", + "futures-core", + "http", "opentelemetry", "opentelemetry-proto", + "opentelemetry_sdk", "prost", - "thiserror", + "thiserror 1.0.69", "tokio", "tonic", + "tracing", ] [[package]] name = "opentelemetry-proto" -version = "0.1.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" +checksum = "a6e05acbfada5ec79023c85368af14abd0b307c015e9064d249b2a950ef459a6" dependencies = [ - "futures", - "futures-util", "opentelemetry", + "opentelemetry_sdk", "prost", "tonic", - "tonic-build", -] - -[[package]] -name = "opentelemetry_api" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" -dependencies = [ - "fnv", - "futures-channel", - "futures-util", - "indexmap 1.9.3", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", ] [[package]] name = "opentelemetry_sdk" -version = "0.18.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +checksum = "231e9d6ceef9b0b2546ddf52335785ce41252bc7474ee8ba05bfad277be13ab8" dependencies = [ "async-trait", - "crossbeam-channel", - "dashmap", - "fnv", "futures-channel", "futures-executor", "futures-util", - "once_cell", - "opentelemetry_api", + "glob", + "opentelemetry", "percent-encoding", - "rand", - "thiserror", + "rand 0.8.5", + "serde_json", + "thiserror 1.0.69", "tokio", "tokio-stream", + "tracing", ] [[package]] name = "ordered-multimap" -version = "0.6.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" dependencies = [ "dlv-list", - "hashbrown 0.13.2", + "hashbrown 0.14.5", ] [[package]] @@ -2475,9 +2599,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "p12-keystore" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7b60d0b2dcace322e6e8c4499c4c8bdf331c1bae046a54be5e4191c3610286" +checksum = "a09eaa3a6d8884c204c2ab17e313f563b524362e62567f09ba27857a6e31257f" dependencies = [ "cbc", "cms", @@ -2487,11 +2611,11 @@ dependencies = [ "hmac", "pkcs12", "pkcs5", - "rand", + "rand 0.9.0", "rc2", "sha1", "sha2", - "thiserror", + "thiserror 2.0.11", "x509-parser", ] @@ -2526,9 +2650,9 @@ dependencies = [ [[package]] name = "pathdiff" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" [[package]] name = "pbkdf2" @@ -2557,20 +2681,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" +checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" dependencies = [ "memchr", - "thiserror", + "thiserror 2.0.11", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" +checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e" dependencies = [ "pest", "pest_generator", @@ -2578,63 +2702,53 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" +checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] name = "pest_meta" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" +checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea" dependencies = [ "once_cell", "pest", "sha2", ] -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset 0.4.2", - "indexmap 2.6.0", -] - [[package]] name = "pin-project" -version = "1.1.6" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" +checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.6" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" +checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -2661,7 +2775,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.1", + "fastrand 2.3.0", "futures-io", ] @@ -2719,19 +2833,25 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.3" +version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.37", + "rustix 0.38.44", "tracing", "windows-sys 0.59.0", ] +[[package]] +name = "portable-atomic" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" + [[package]] name = "powerfmt" version = "0.2.0" @@ -2744,17 +2864,7 @@ version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "zerocopy", -] - -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", + "zerocopy 0.7.35", ] [[package]] @@ -2776,111 +2886,84 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] name = "proc-macro2" -version = "1.0.88" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] [[package]] name = "procfs" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" +checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "chrono", "flate2", "hex", - "lazy_static", "procfs-core", - "rustix 0.38.37", + "rustix 0.38.44", ] [[package]] name = "procfs-core" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" +checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "chrono", "hex", ] [[package]] name = "prost" -version = "0.11.9" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec" dependencies = [ "bytes", "prost-derive", ] -[[package]] -name = "prost-build" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" -dependencies = [ - "bytes", - "heck 0.4.1", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 1.0.109", - "tempfile", - "which", -] - [[package]] name = "prost-derive" -version = "0.11.9" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3" dependencies = [ "anyhow", "itertools", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.96", ] [[package]] -name = "prost-types" -version = "0.11.9" +name = "ptr_meta" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "fe9e76f66d3f9606f44e45598d155cb13ecf09f4a28199e48daf8c8fc937ea90" dependencies = [ - "prost", + "ptr_meta_derive", ] [[package]] -name = "quanta" -version = "0.12.3" +name = "ptr_meta_derive" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" +checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1" dependencies = [ - "crossbeam-utils", - "libc", - "once_cell", - "raw-cpuid", - "wasi", - "web-sys", - "winapi", + "proc-macro2", + "quote", + "syn 2.0.96", ] [[package]] @@ -2895,13 +2978,22 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] +[[package]] +name = "rancor" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caf5f7161924b9d1cea0e4cabc97c372cea92b5f927fc13c6bca67157a0ad947" +dependencies = [ + "ptr_meta", +] + [[package]] name = "rand" version = "0.8.5" @@ -2909,8 +3001,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.9.0" +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", ] [[package]] @@ -2920,7 +3023,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.0", ] [[package]] @@ -2929,16 +3042,17 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] -name = "raw-cpuid" -version = "11.2.0" +name = "rand_core" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" +checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff" dependencies = [ - "bitflags 2.6.0", + "getrandom 0.3.1", + "zerocopy 0.8.14", ] [[package]] @@ -2963,69 +3077,94 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", ] [[package]] name = "reflink-copy" -version = "0.1.19" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31414597d1cd7fdd2422798b7652a6329dda0fe0219e6335a13d5bcaa9aeb6" +checksum = "fbd3533fd4222b8337470456ea84d80436b4c91c53db51c372461d5f7e6eb0b4" dependencies = [ "cfg-if", - "rustix 0.38.37", - "windows", + "libc", + "rustix 0.38.44", + "windows 0.59.0", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax", + "regex-automata 0.4.9", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", ] [[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", - "regex-syntax", + "regex-syntax 0.8.5", ] +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + [[package]] name = "regex-syntax" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +[[package]] +name = "rend" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a35e8a6bf28cd121053a66aa2e6a2e3eaffad4a60012179f0e864aa5ffeff215" +dependencies = [ + "bytecheck", +] + [[package]] name = "reqwest" -version = "0.12.8" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" +checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" dependencies = [ "base64 0.22.1", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.4.6", - "http 1.1.0", - "http-body 1.0.1", + "h2", + "http", + "http-body", "http-body-util", - "hyper 1.5.0", + "hyper", "hyper-rustls", "hyper-tls", "hyper-util", @@ -3042,11 +3181,12 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", "tokio-util", + "tower 0.5.2", "tower-service", "url", "wasm-bindgen", @@ -3058,16 +3198,16 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04" +checksum = "d1ccd3b55e711f91a9885a2fa6fbbb2e39db1776420b062efc058c6410f7e5e3" dependencies = [ "anyhow", "async-trait", - "http 1.1.0", + "http", "reqwest", "serde", - "thiserror", + "thiserror 1.0.69", "tower-service", ] @@ -3079,7 +3219,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libc", "spin", "untrusted", @@ -3100,6 +3240,36 @@ dependencies = [ "spin", ] +[[package]] +name = "rkyv" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e147371c75553e1e2fcdb483944a8540b8438c31426279553b9a8182a9b7b65" +dependencies = [ + "bytecheck", + "bytes", + "hashbrown 0.15.2", + "indexmap 2.7.1", + "munge", + "ptr_meta", + "rancor", + "rend", + "rkyv_derive", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246b40ac189af6c675d124b802e8ef6d5246c53e17367ce9501f8f66a81abb7a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "ron" version = "0.7.1" @@ -3118,19 +3288,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.6.0", + "bitflags 2.8.0", "serde", "serde_derive", ] [[package]] name = "rust-ini" -version = "0.19.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" +checksum = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f" dependencies = [ "cfg-if", "ordered-multimap", + "trim-in-place", ] [[package]] @@ -3159,9 +3330,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" +version = "0.37.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "519165d378b97752ca44bbe15047d5d3409e875f39327546b42ac81d7e18c1b6" dependencies = [ "bitflags 1.3.2", "errno", @@ -3173,22 +3344,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "errno", "libc", - "linux-raw-sys 0.4.14", - "windows-sys 0.52.0", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", ] [[package]] name = "rustls" -version = "0.23.15" +version = "0.23.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993" +checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7" dependencies = [ "once_cell", "ring", @@ -3235,9 +3406,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" [[package]] name = "rustls-webpki" @@ -3252,15 +3423,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" [[package]] name = "salsa20" @@ -3282,13 +3453,19 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + [[package]] name = "scopeguard" version = "1.2.0" @@ -3312,7 +3489,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "core-foundation", "core-foundation-sys", "libc", @@ -3321,9 +3498,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -3331,100 +3508,211 @@ dependencies = [ [[package]] name = "seele" -version = "0.2.0" +version = "0.6.0" +dependencies = [ + "anyhow", + "axum 0.8.1", + "num_cpus", + "opentelemetry", + "opentelemetry-otlp", + "opentelemetry_sdk", + "seele_cgroup", + "seele_composer", + "seele_config", + "seele_exchange", + "seele_shared", + "seele_worker", + "tokio", + "tokio-graceful-shutdown", + "tracing", + "tracing-opentelemetry", + "tracing-subscriber", +] + +[[package]] +name = "seele_cgroup" +version = "0.6.0" +dependencies = [ + "anyhow", + "dbus", + "libcgroups", + "seele_config", + "seele_shared", + "tracing", +] + +[[package]] +name = "seele_composer" +version = "0.6.0" dependencies = [ "anyhow", "async-recursion", - "async-trait", - "base64 0.22.1", - "bincode 2.0.0-rc.3", - "bytes", "chrono", - "config", - "dbus", - "duct", "either", "ellipse", "futures-util", - "http 1.1.0", - "http-cache", - "http-cache-reqwest", - "hyper 0.14.31", - "indexmap 2.6.0", "insta", - "lapin", - "libcgroups", "map-macro", - "moka", + "opentelemetry", + "quick-js", + "rand 0.9.0", + "reqwest", + "ring-channel", + "seele_config", + "seele_shared", + "seele_worker", + "serde", + "serde_json", + "serde_yaml", + "tokio", + "tokio-graceful-shutdown", + "tracing", +] + +[[package]] +name = "seele_config" +version = "0.6.0" +dependencies = [ + "anyhow", + "config", + "http-cache", + "indexmap 2.7.1", + "lapin", "nano-id", "nix 0.29.0", "num_cpus", - "once_cell", + "serde", + "tokio", + "tracing", + "tracing-subscriber", + "url", + "uzers", +] + +[[package]] +name = "seele_exchange" +version = "0.6.0" +dependencies = [ + "anyhow", + "axum 0.8.1", + "futures-util", + "lapin", + "nano-id", + "ring-channel", + "seele_composer", + "seele_config", + "seele_shared", + "serde_json", + "tokio", + "tokio-graceful-shutdown", + "tracing", + "triggered", +] + +[[package]] +name = "seele_shared" +version = "0.6.0" +dependencies = [ + "anyhow", + "chrono", + "either", + "ellipse", + "futures-util", + "indexmap 2.7.1", + "nano-id", "opentelemetry", - "opentelemetry-otlp", - "quick-js", - "rand", - "regex", + "opentelemetry_sdk", + "rand 0.9.0", + "reqwest", + "seele_config", + "serde", + "serde_yaml", + "shell-words", + "tokio", + "triggered", + "url", +] + +[[package]] +name = "seele_worker" +version = "0.6.0" +dependencies = [ + "anyhow", + "base64 0.22.1", + "bytes", + "chrono", + "duct", + "futures-util", + "http-cache", + "http-cache-reqwest", + "moka", + "nano-id", + "nix 0.29.0", "reqwest", "reqwest-middleware", - "ring-channel", + "rkyv", + "seele_cgroup", + "seele_config", + "seele_shared", "serde", "serde_json", - "serde_yaml", "sha2", - "shell-words", - "systemd", "thread_local", "tokio", "tokio-graceful-shutdown", - "tokio-util", "tracing", - "tracing-opentelemetry", - "tracing-subscriber", "triggered", - "url", - "uzers", ] [[package]] name = "semver" -version = "1.0.23" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] name = "serde_json" -version = "1.0.129" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbcf9b78a125ee667ae19388837dd12294b858d101fdd393cb9d5501ef09eb2" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.1", "itoa", "memchr", "ryu", "serde", ] +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + [[package]] name = "serde_spanned" version = "0.6.8" @@ -3452,7 +3740,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.1", "itoa", "ryu", "serde", @@ -3532,11 +3820,17 @@ dependencies = [ "libc", ] +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + [[package]] name = "similar" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" +checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa" [[package]] name = "slab" @@ -3574,9 +3868,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3614,10 +3908,16 @@ dependencies = [ "serde", "sha-1", "sha2", - "thiserror", + "thiserror 1.0.69", "xxhash-rust", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "strsim" version = "0.11.1" @@ -3636,11 +3936,11 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -3662,9 +3962,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -3673,15 +3973,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] @@ -3694,7 +3988,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -3703,7 +3997,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "core-foundation", "system-configuration-sys", ] @@ -3718,21 +4012,6 @@ dependencies = [ "libc", ] -[[package]] -name = "systemd" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afec0101d9ae8ab26aedf0840109df689938ea7e538aa03df4369f1854f11562" -dependencies = [ - "cstr-argument", - "foreign-types 0.5.0", - "libc", - "libsystemd-sys", - "log", - "memchr", - "utf8-cstr", -] - [[package]] name = "tagptr" version = "0.2.0" @@ -3753,35 +4032,56 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.13.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" dependencies = [ "cfg-if", - "fastrand 2.1.1", + "fastrand 2.3.0", + "getrandom 0.3.1", "once_cell", - "rustix 0.38.37", + "rustix 0.38.44", "windows-sys 0.59.0", ] [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +dependencies = [ + "thiserror-impl 2.0.11", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "thiserror-impl", + "proc-macro2", + "quote", + "syn 2.0.96", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -3796,9 +4096,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -3817,9 +4117,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -3834,11 +4134,21 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" dependencies = [ "tinyvec_macros", ] @@ -3851,9 +4161,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -3862,47 +4172,37 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.7", + "socket2 0.5.8", "tokio-macros", "windows-sys 0.52.0", ] [[package]] name = "tokio-graceful-shutdown" -version = "0.15.1" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fafa3ccdad018530a5eb1c2c87772384fb94273675022240bc5729044f7696e5" +checksum = "7d7def1c9cc8a5ecd76d0b24e29aceda2d7bdeb6cd678f9076fc96b2a88f6bfc" dependencies = [ "async-trait", "atomic", "bytemuck", - "miette 7.2.0", + "miette 7.5.0", "pin-project-lite", - "thiserror", + "thiserror 2.0.11", "tokio", "tokio-util", "tracing", ] -[[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.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] @@ -3917,20 +4217,19 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ "rustls", - "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -3939,9 +4238,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", @@ -3973,11 +4272,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.1", "serde", "serde_spanned", "toml_datetime", @@ -3986,47 +4285,32 @@ dependencies = [ [[package]] name = "tonic" -version = "0.8.3" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", - "axum", - "base64 0.13.1", + "axum 0.7.9", + "base64 0.22.1", "bytes", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.31", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", "hyper-timeout", + "hyper-util", "percent-encoding", "pin-project", "prost", - "prost-derive", + "socket2 0.5.8", "tokio", "tokio-stream", - "tokio-util", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" -dependencies = [ - "prettyplease", - "proc-macro2", - "prost-build", - "quote", - "syn 1.0.109", ] [[package]] @@ -4040,7 +4324,7 @@ dependencies = [ "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand", + "rand 0.8.5", "slab", "tokio", "tokio-util", @@ -4049,6 +4333,22 @@ 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", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -4063,10 +4363,11 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4074,46 +4375,25 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -4127,30 +4407,38 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.18.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" +checksum = "97a971f6058498b5c0f1affa23e7ea202057a7301dbff68e968b2d578bcbd053" dependencies = [ + "js-sys", "once_cell", "opentelemetry", + "opentelemetry_sdk", + "smallvec", "tracing", "tracing-core", - "tracing-log 0.1.4", + "tracing-log", "tracing-subscriber", + "web-time", ] [[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", + "once_cell", + "regex", "sharded-slab", "smallvec", "thread_local", + "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", ] [[package]] @@ -4160,10 +4448,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce148eae0d1a376c1b94ae651fc3261d9cb8294788b962b7382066376503a2d1" [[package]] -name = "triomphe" -version = "0.1.11" +name = "trim-in-place" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" +checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" [[package]] name = "try-lock" @@ -4185,33 +4473,15 @@ checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" +checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - -[[package]] -name = "unicode-normalization" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" -dependencies = [ - "tinyvec", -] +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "unicode-segmentation" @@ -4239,9 +4509,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -4250,18 +4520,24 @@ dependencies = [ ] [[package]] -name = "utf8-cstr" -version = "0.1.6" +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55bcbb425141152b10d5693095950b51c3745d019363fc2929ffd8f61449b628" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] @@ -4276,9 +4552,9 @@ dependencies = [ [[package]] name = "valuable" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "vcpkg" @@ -4292,12 +4568,6 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" -[[package]] -name = "virtue" -version = "0.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcc60c0624df774c82a0ef104151231d37da4962957d691c011c852b2473314" - [[package]] name = "waker-fn" version = "1.2.0" @@ -4329,49 +4599,59 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.13.3+wasi-0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4379,28 +4659,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "wasm-streams" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" dependencies = [ "futures-util", "js-sys", @@ -4411,24 +4694,22 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "which" -version = "4.4.2" +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.37", + "js-sys", + "wasm-bindgen", ] [[package]] @@ -4472,6 +4753,16 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1" +dependencies = [ + "windows-core 0.59.0", + "windows-targets 0.53.0", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -4487,13 +4778,26 @@ version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-strings", + "windows-implement 0.58.0", + "windows-interface 0.58.0", + "windows-result 0.2.0", + "windows-strings 0.1.0", "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce" +dependencies = [ + "windows-implement 0.59.0", + "windows-interface 0.59.0", + "windows-result 0.3.0", + "windows-strings 0.3.0", + "windows-targets 0.53.0", +] + [[package]] name = "windows-implement" version = "0.58.0" @@ -4502,7 +4806,18 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", +] + +[[package]] +name = "windows-implement" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", ] [[package]] @@ -4513,7 +4828,18 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", +] + +[[package]] +name = "windows-interface" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb26fd936d991781ea39e87c3a27285081e3c0da5ca0fcbc02d368cc6f52ff01" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", ] [[package]] @@ -4522,8 +4848,8 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ - "windows-result", - "windows-strings", + "windows-result 0.2.0", + "windows-strings 0.1.0", "windows-targets 0.52.6", ] @@ -4536,16 +4862,34 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d08106ce80268c4067c0571ca55a9b4e9516518eaa1a1fe9b37ca403ae1d1a34" +dependencies = [ + "windows-targets 0.53.0", +] + [[package]] name = "windows-strings" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-result", + "windows-result 0.2.0", "windows-targets 0.52.6", ] +[[package]] +name = "windows-strings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b888f919960b42ea4e11c2f408fadb55f78a9f236d5eef084103c8ce52893491" +dependencies = [ + "windows-targets 0.53.0", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -4597,13 +4941,29 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", + "windows_i686_gnullvm 0.52.6", "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]] +name = "windows-targets" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -4616,6 +4976,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -4628,6 +4994,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -4640,12 +5012,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[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_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -4658,6 +5042,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -4670,6 +5060,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -4682,6 +5078,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -4694,15 +5096,42 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + [[package]] name = "winnow" -version = "0.6.20" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +checksum = "7e49d2d35d3fad69b39b94139037ecfb4f359f08958b9c11e7315ce770462419" dependencies = [ "memchr", ] +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags 2.8.0", +] + +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "x509-cert" version = "0.2.5" @@ -4716,9 +5145,9 @@ dependencies = [ [[package]] name = "x509-parser" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" +checksum = "4569f339c0c402346d4a75a9e39cf8dad310e287eef1ff56d4c68e5067f53460" dependencies = [ "asn1-rs", "data-encoding", @@ -4727,23 +5156,49 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "thiserror", + "thiserror 2.0.11", "time", ] [[package]] name = "xxhash-rust" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" +checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3" [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "yaml-rust2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "2a1a1c0bc9823338a3bdf8c61f994f23ac004c6fa32c08cd152984499b445e8d" dependencies = [ - "linked-hash-map", + "arraydeque", + "encoding_rs", + "hashlink", +] + +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", + "synstructure", ] [[package]] @@ -4753,7 +5208,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "byteorder", - "zerocopy-derive", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a367f292d93d4eab890745e75a778da40909cab4d6ff8173693812f79c4a2468" +dependencies = [ + "zerocopy-derive 0.8.14", ] [[package]] @@ -4764,7 +5228,39 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.96", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3931cb58c62c13adec22e38686b559c86a30565e16ad6e8510a337cedc611e1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", + "synstructure", ] [[package]] @@ -4772,3 +5268,25 @@ name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] diff --git a/Cargo.toml b/Cargo.toml index f9d2360..1f300e0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,66 +1,76 @@ -[package] -name = "seele" -version = "0.2.0" +[workspace] +members = [ "crates/*" ] +resolver = "2" + +[workspace.package] edition = "2021" +version = "0.6.0" [profile.release] +lto = "thin" opt-level = 3 strip = true -lto = true -[dependencies] +[workspace.dependencies] anyhow = "1.0" async-recursion = "1.1" async-trait = "0.1" +axum = "0.8" base64 = "0.22" -bincode = "2.0.0-rc.3" -bytes = "1.7" -chrono = { version = "0.4", features = ["serde"] } -config = "0.14" +bytes = "1.9" +chrono = { version = "0.4", features = [ "serde" ] } +config = "0.15" dbus = "0.9" duct = "0.13" either = "1.12" ellipse = "0.2" futures-util = "0.3" -http = "1.1" -http-cache = { version = "0.19", default-features = false, features = ["manager-moka"] } -http-cache-reqwest = "0.14" -indexmap = { version = "2.6", features = ["serde"] } +http = "1.2" +http-cache = { version = "0.20", default-features = false, features = [ + "manager-moka" +] } +http-cache-reqwest = "0.15" +indexmap = { version = "2.7", features = [ "serde" ] } +insta = { version = "1.42", features = [ "glob", "redactions", "ron" ] } lapin = "2.5" -libcgroups = "0.4" -moka = { version = "0.12", features = ["future", "sync"] } -nano-id = { version = "0.4", features = ["base62"] } -nix = { version = "0.29", features = ["mount", "hostname", "signal"] } +libcgroups = "0.5" +map-macro = "0.3" +moka = { version = "0.12", features = [ "future", "sync" ] } +nano-id = { version = "0.4", features = [ "base62" ] } +nix = { version = "0.29", features = [ "hostname", "mount", "signal" ] } num_cpus = "1" -once_cell = "1" +opentelemetry = "0.27" +opentelemetry-otlp = "0.27" +opentelemetry_sdk = { version = "0.27", features = [ "rt-tokio" ] } +quick-js = { version = "0.4", features = [ "patched" ] } +rand = { version = "0.9" } regex = "1" -quick-js = { version = "0.4", features = ["patched"] } -reqwest = { version = "0.12", features = ["stream", "multipart"] } -reqwest-middleware = "0.3" +reqwest = { version = "0.12", features = [ "multipart", "stream" ] } +reqwest-middleware = "0.4" ring-channel = "0.12" -serde = { version = "1.0", features = ["derive", "rc"] } -serde_json = { version = "1.0", features = ["preserve_order"] } +rkyv = "0.8" +serde = { version = "1.0", features = [ "derive", "rc" ] } +serde_json = { version = "1.0", features = [ "preserve_order" ] } serde_yaml = "0.9" sha2 = "0.10" shell-words = "1.1" systemd = "0.10" thread_local = "1.1" -tokio = { version = "1", features = ["full"] } +tokio = { version = "1", features = [ "full" ] } tokio-graceful-shutdown = "0.15" -tokio-util = { version = "0.7", features = ["io"] } +tokio-util = { version = "0.7", features = [ "io" ] } tracing = "0.1" +tracing-opentelemetry = "0.28" tracing-subscriber = "0.3" triggered = "0.1" -url = { version = "2.5", features = ["serde"] } +url = { version = "2.5", features = [ "serde" ] } uzers = "0.12" -# locked dependencies because of the api changes in the newer versions -tracing-opentelemetry = "=0.18.0" -opentelemetry = { version = "=0.18.0", features = ["rt-tokio", "metrics", "trace"] } -opentelemetry-otlp = { version = "=0.11.0", features = ["metrics"] } -hyper = { version = "0", features = ["server", "stream"] } +# local dependencies -[dev-dependencies] -insta = { version = "1.40", features = ["glob", "redactions", "ron"] } -map-macro = "0.3" -rand = { version = "0.8" } +seele_cgroup = { path = "crates/seele-cgroup" } +seele_composer = { path = "crates/seele-composer" } +seele_config = { path = "crates/seele-config" } +seele_exchange = { path = "crates/seele-exchange" } +seele_shared = { path = "crates/seele-shared" } +seele_worker = { path = "crates/seele-worker" } diff --git a/Dockerfile b/Dockerfile index 7f13ae6..ccb0ad2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,14 +8,14 @@ RUN go mod download && go mod verify COPY runj/ ./ RUN make build -FROM rust:1.82-slim-bookworm AS builder +FROM rust:1.84-slim-bookworm AS builder RUN apt update -qq && \ DEBIAN_FRONTEND=noninteractive apt install -qqy --no-install-recommends pkg-config libdbus-1-dev libsystemd-dev protobuf-compiler libssl-dev patch ENV COMMIT_TAG=$GIT_NAME ENV COMMIT_SHA=$GIT_SHA WORKDIR /usr/src/seele COPY . . -RUN cargo install --path . +RUN cargo install --path crates/seele FROM bitnami/minideb:bookworm AS runtime WORKDIR /etc/seele diff --git a/Dockerfile.dev b/Dockerfile.dev index 478cbc6..3041c8f 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -5,7 +5,7 @@ RUN go mod download && go mod verify COPY runj/ ./ RUN make build -FROM lukemathwalker/cargo-chef:latest-rust-1.82-slim-bookworm AS chef +FROM lukemathwalker/cargo-chef:latest-rust-1.84-slim-bookworm AS chef RUN apt update -qq && \ DEBIAN_FRONTEND=noninteractive apt install -qqy --no-install-recommends pkg-config libdbus-1-dev libsystemd-dev protobuf-compiler libssl-dev patch WORKDIR /app diff --git a/crates/seele-cgroup/Cargo.toml b/crates/seele-cgroup/Cargo.toml new file mode 100644 index 0000000..dc3e113 --- /dev/null +++ b/crates/seele-cgroup/Cargo.toml @@ -0,0 +1,15 @@ +[package] +edition.workspace = true +name = "seele_cgroup" +version.workspace = true + +[dependencies] +anyhow = { workspace = true } +dbus = { workspace = true } +libcgroups = { workspace = true } +tracing = { workspace = true } + +# local dependencies + +seele_config = { workspace = true } +seele_shared = { workspace = true } diff --git a/src/cgroup/mod.rs b/crates/seele-cgroup/src/lib.rs similarity index 81% rename from src/cgroup/mod.rs rename to crates/seele-cgroup/src/lib.rs index fba8065..74963b5 100644 --- a/src/cgroup/mod.rs +++ b/crates/seele-cgroup/src/lib.rs @@ -3,18 +3,16 @@ use std::{ io::{BufRead, BufReader}, path::PathBuf, process, + sync::LazyLock, }; -use anyhow::{bail, Context, Result}; -use libcgroups::common::{get_cgroup_setup, read_cgroup_file, write_cgroup_file_str, CgroupSetup}; -use once_cell::sync::Lazy; +use anyhow::{Context, Result, bail}; +use libcgroups::common::{CgroupSetup, get_cgroup_setup, read_cgroup_file, write_cgroup_file_str}; +use seele_config as conf; +use seele_shared as shared; use tracing::debug; pub use self::utils::*; -use crate::{ - conf::{self, SeeleWorkMode}, - shared, -}; #[rustfmt::skip] #[allow(clippy::all)] @@ -26,17 +24,18 @@ mod utils; const MANDATORY_CONTROLLERS: &str = "+cpu +cpuset +memory +io +pids"; -pub static CGROUP_PATH: Lazy = Lazy::new(|| match &conf::CONFIG.work_mode { - SeeleWorkMode::Bare => { +pub static CGROUP_PATH: LazyLock = LazyLock::new(|| match &conf::CONFIG.work_mode { + conf::SeeleWorkMode::Bare => { systemd::create_and_enter_cgroup().expect("Error entering cgroup scope cgroup") } _ => utils::check_and_get_self_cgroup().expect("Error getting process' cgroup path"), }); -pub static CGROUP_MAIN_SCOPE_PATH: Lazy = Lazy::new(|| CGROUP_PATH.join("main.scope")); +pub static CGROUP_MAIN_SCOPE_PATH: LazyLock = + LazyLock::new(|| CGROUP_PATH.join("main.scope")); -pub static CGROUP_CONTAINER_SLICE_PATH: Lazy = - Lazy::new(|| CGROUP_PATH.join("container.slice")); +pub static CGROUP_CONTAINER_SLICE_PATH: LazyLock = + LazyLock::new(|| CGROUP_PATH.join("container.slice")); #[inline] pub fn check_cgroup_setup() -> Result<()> { @@ -97,16 +96,16 @@ pub fn bind_application_threads() -> Result<()> { let pids = { let content = read_cgroup_file(CGROUP_MAIN_SCOPE_PATH.join("cgroup.threads"))?; - let pids = BufReader::new(content.as_bytes()) + let pids: Vec = BufReader::new(content.as_bytes()) .lines() - .flatten() + .map_while(Result::ok) .filter_map(|line| { let line = line.trim(); if *shared::TINI_PRESENTS && line == "1" { - return None; + None + } else { + Some(line.parse::().with_context(|| format!("Error parsing line: {line}"))) } - - Some(line.parse::().with_context(|| format!("Error parsing line: {line}"))) }) .collect::>>()?; diff --git a/src/cgroup/systemd.rs b/crates/seele-cgroup/src/systemd.rs similarity index 98% rename from src/cgroup/systemd.rs rename to crates/seele-cgroup/src/systemd.rs index 8ca716c..42cafd3 100644 --- a/src/cgroup/systemd.rs +++ b/crates/seele-cgroup/src/systemd.rs @@ -1,6 +1,6 @@ use std::{path::PathBuf, process, time::Duration}; -use anyhow::{bail, Context, Result}; +use anyhow::{Context, Result, bail}; use dbus::{ arg::{RefArg, Variant}, blocking::{Connection, Proxy}, diff --git a/src/cgroup/systemd_api.rs b/crates/seele-cgroup/src/systemd_api.rs similarity index 100% rename from src/cgroup/systemd_api.rs rename to crates/seele-cgroup/src/systemd_api.rs diff --git a/src/cgroup/utils.rs b/crates/seele-cgroup/src/utils.rs similarity index 76% rename from src/cgroup/utils.rs rename to crates/seele-cgroup/src/utils.rs index ce2526f..2fca007 100644 --- a/src/cgroup/utils.rs +++ b/crates/seele-cgroup/src/utils.rs @@ -1,7 +1,7 @@ use std::{fs, path::PathBuf}; -use anyhow::{bail, Context, Result}; -use libcgroups::common::{read_cgroup_file, DEFAULT_CGROUP_ROOT}; +use anyhow::{Result, bail}; +use libcgroups::common::{DEFAULT_CGROUP_ROOT, read_cgroup_file}; pub fn check_and_get_self_cgroup() -> Result { let content = fs::read_to_string("/proc/thread-self/cgroup")?; @@ -31,5 +31,9 @@ pub fn check_and_get_self_cgroup() -> Result { pub fn get_self_cpuset_cpu() -> Result { let path = check_and_get_self_cgroup()?; let content = read_cgroup_file(path.join("cpuset.cpus"))?; - content.trim().parse().with_context(|| format!("Unexpected cpuset.cpus content: {}", content)) + tracing::debug!("cpuset.cpus path: {:?}", path.join("cpuset.cpus")); + match content.trim().parse() { + Ok(cpu) => Ok(cpu), + Err(_err) => bail!("Error parsing cpuset.cpus content: {:?}", content), + } } diff --git a/crates/seele-composer/Cargo.toml b/crates/seele-composer/Cargo.toml new file mode 100644 index 0000000..1d9750d --- /dev/null +++ b/crates/seele-composer/Cargo.toml @@ -0,0 +1,33 @@ +[package] +edition.workspace = true +name = "seele_composer" +version.workspace = true + +[dependencies] +anyhow = { workspace = true } +async-recursion = { workspace = true } +chrono = { workspace = true } +either = { workspace = true } +ellipse = { workspace = true } +futures-util = { workspace = true } +opentelemetry = { workspace = true } +quick-js = { workspace = true } +reqwest = { workspace = true } +ring-channel = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +serde_yaml = { workspace = true } +tokio = { workspace = true } +tokio-graceful-shutdown = { workspace = true } +tracing = { workspace = true } + +# local dependencies + +seele_config = { workspace = true } +seele_shared = { workspace = true } +seele_worker = { workspace = true } + +[dev-dependencies] +insta = { workspace = true } +map-macro = { workspace = true } +rand = { workspace = true } diff --git a/src/composer/execute.rs b/crates/seele-composer/src/execute.rs similarity index 96% rename from src/composer/execute.rs rename to crates/seele-composer/src/execute.rs index b01a391..496bcf9 100644 --- a/src/composer/execute.rs +++ b/crates/seele-composer/src/execute.rs @@ -1,20 +1,20 @@ use std::{iter, path::PathBuf, sync::Arc}; -use anyhow::{bail, Context, Result}; +use anyhow::{Context, Result, bail}; use async_recursion::async_recursion; use either::Either; use futures_util::future; use ring_channel::RingSender; use tokio::{ - sync::{oneshot, Mutex}, + sync::{Mutex, oneshot}, time::Instant, }; -use tracing::{debug, instrument, Span}; +use tracing::{Span, debug, instrument}; use super::predicate; use crate::{ - composer::report::apply_embeds_config, - entities::{ + report::apply_embeds_config, + shared::entities::{ ActionTaskConfig, ParallelFailedReport, ParallelSuccessReport, ParallelTaskConfig, SequenceFailedReport, SequenceSuccessReport, Submission, SubmissionReportUploadConfig, TaskConfig, TaskConfigExt, TaskEmbeds, TaskFailedReport, TaskNode, TaskNodeExt, @@ -293,9 +293,9 @@ mod tests { use tokio::{runtime::Builder, sync::mpsc}; use crate::{ - composer::resolve::resolve_submission, entities::{ActionReport, ActionSuccessReport, ActionSuccessReportExt}, - worker::{action, WorkerQueueItem}, + resolve::resolve_submission, + worker::WorkerQueueItem, }; #[test] @@ -325,9 +325,9 @@ mod tests { .send(Ok(ActionReport::Success(ActionSuccessReport { run_at: Utc::now(), time_elapsed_ms: 0, - ext: ActionSuccessReportExt::Noop(action::noop::ExecutionReport { - test: 0, - }), + ext: ActionSuccessReportExt::Noop( + crate::shared::entities::noop::ExecutionReport { test: 0 }, + ), }))) .unwrap(); } diff --git a/src/composer/mod.rs b/crates/seele-composer/src/lib.rs similarity index 95% rename from src/composer/mod.rs rename to crates/seele-composer/src/lib.rs index 871f14c..df97203 100644 --- a/src/composer/mod.rs +++ b/crates/seele-composer/src/lib.rs @@ -1,24 +1,28 @@ use std::{num::NonZeroUsize, sync::Arc}; -use anyhow::{bail, Context, Result}; +use anyhow::{Context, Result, bail}; use chrono::Utc; use ellipse::Ellipse; use futures_util::StreamExt; -use opentelemetry::{Context as OpenTelemetryCtx, KeyValue}; +use opentelemetry::KeyValue; use ring_channel::{RingReceiver, RingSender}; +use seele_config as conf; +use seele_shared as shared; +use seele_shared::entities; +use seele_worker as worker; use tokio::{ fs, sync::mpsc::{self, error::TryRecvError}, time::Instant, }; use tokio_graceful_shutdown::{FutureExt, SubsystemHandle}; -use tracing::{debug, error, field, instrument, Span}; +use tracing::{Span, debug, error, field, instrument}; pub use self::signal::*; use crate::{ - composer::{report::apply_uploads_config, reporter::execute_reporter}, - conf, entities::{Submission, SubmissionConfig}, + report::apply_uploads_config, + reporter::execute_reporter, shared::metrics, worker::WorkerQueueTx, }; @@ -88,11 +92,9 @@ async fn handle_submission( let end = Instant::now(); end.duration_since(begin).as_secs_f64() }; - metrics::SUBMISSION_HANDLING_HISTOGRAM.record( - &OpenTelemetryCtx::current(), - duration, - &[KeyValue::new(SUBMISSION_STATUS, signal_type)], - ); + + metrics::SUBMISSION_HANDLING_HISTOGRAM + .record(duration, &[KeyValue::new(SUBMISSION_STATUS, signal_type)]); } async fn do_handle_submission( diff --git a/src/composer/predicate.rs b/crates/seele-composer/src/predicate.rs similarity index 100% rename from src/composer/predicate.rs rename to crates/seele-composer/src/predicate.rs diff --git a/src/composer/report.rs b/crates/seele-composer/src/report.rs similarity index 91% rename from src/composer/report.rs rename to crates/seele-composer/src/report.rs index e810e0f..04603fb 100644 --- a/src/composer/report.rs +++ b/crates/seele-composer/src/report.rs @@ -1,11 +1,10 @@ -use std::{collections::HashMap, path::Path}; +use std::{collections::HashMap, path::Path, sync::LazyLock}; -use anyhow::{bail, Context, Result}; +use anyhow::{Context, Result, bail}; use futures_util::future; -use once_cell::sync::Lazy; use reqwest::{ - multipart::{Form, Part}, Client, + multipart::{Form, Part}, }; use tokio::{ fs::{self, File}, @@ -13,11 +12,8 @@ use tokio::{ }; use tracing::{info, instrument}; -use crate::{ - entities::{ - SubmissionReportEmbedConfig, SubmissionReportUploadConfig, SubmissionReportUploadMethod, - }, - shared, +use crate::entities::{ + SubmissionReportEmbedConfig, SubmissionReportUploadConfig, SubmissionReportUploadMethod, }; pub async fn apply_embeds_config( @@ -64,7 +60,7 @@ pub async fn apply_embeds_config( })) } -static HTTP_CLIENT: Lazy = Lazy::new(shared::http::build_http_client); +static HTTP_CLIENT: LazyLock = LazyLock::new(crate::shared::http::build_http_client); #[instrument(skip_all)] pub async fn apply_uploads_config( diff --git a/src/composer/reporter/javascript.rs b/crates/seele-composer/src/reporter/javascript.rs similarity index 97% rename from src/composer/reporter/javascript.rs rename to crates/seele-composer/src/reporter/javascript.rs index 40c61a1..c6b77d3 100644 --- a/src/composer/reporter/javascript.rs +++ b/crates/seele-composer/src/reporter/javascript.rs @@ -1,15 +1,12 @@ use std::collections::HashMap; -use anyhow::{anyhow, bail, Context, Result}; +use anyhow::{Context, Result, anyhow, bail}; use quick_js::JsValue; use serde_json::Value; use tokio::task::spawn_blocking; use tracing::instrument; -use crate::{ - composer::reporter::utils::get_oj_status, entities::SubmissionReportConfig, - worker::run_container, -}; +use crate::{entities::SubmissionReportConfig, reporter::utils::get_oj_status}; #[instrument(skip_all)] pub async fn execute_javascript_reporter( @@ -50,7 +47,7 @@ fn get_oj_status_wrapper( run_report: HashMap, compare_report: HashMap, ) -> Result<&'static str> { - use run_container::ExecutionReport; + use crate::entities::run_container::ExecutionReport; let run_report: ExecutionReport = serde_json::from_value(QuickJsObject(run_report).try_into()?)?; diff --git a/src/composer/reporter/mod.rs b/crates/seele-composer/src/reporter/mod.rs similarity index 100% rename from src/composer/reporter/mod.rs rename to crates/seele-composer/src/reporter/mod.rs diff --git a/src/composer/reporter/utils.rs b/crates/seele-composer/src/reporter/utils.rs similarity index 95% rename from src/composer/reporter/utils.rs rename to crates/seele-composer/src/reporter/utils.rs index 93ea82d..5d42304 100644 --- a/src/composer/reporter/utils.rs +++ b/crates/seele-composer/src/reporter/utils.rs @@ -1,4 +1,4 @@ -use crate::worker::run_container::{ExecutionReport, ExecutionStatus}; +use crate::entities::run_container::{ExecutionReport, ExecutionStatus}; pub enum OjStatus { Accepted, diff --git a/src/composer/resolve.rs b/crates/seele-composer/src/resolve.rs similarity index 99% rename from src/composer/resolve.rs rename to crates/seele-composer/src/resolve.rs index b788de4..0739c6b 100644 --- a/src/composer/resolve.rs +++ b/crates/seele-composer/src/resolve.rs @@ -1,6 +1,6 @@ use std::{collections::HashMap, path::PathBuf, sync::Arc}; -use anyhow::{bail, Context, Result}; +use anyhow::{Context, Result, bail}; use tracing::instrument; use crate::entities::{ diff --git a/src/composer/signal.rs b/crates/seele-composer/src/signal.rs similarity index 100% rename from src/composer/signal.rs rename to crates/seele-composer/src/signal.rs diff --git a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_complex_1.yaml.snap b/crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_complex_1.yaml.snap similarity index 76% rename from src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_complex_1.yaml.snap rename to crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_complex_1.yaml.snap index a417fa4..f592751 100644 --- a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_complex_1.yaml.snap +++ b/crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_complex_1.yaml.snap @@ -1,7 +1,7 @@ --- -source: src/composer/execute.rs +source: crates/seele-composer/src/execute.rs expression: results -input_file: src/composer/tests/submission_complex_1.yaml +input_file: crates/seele-composer/src/tests/submission_complex_1.yaml --- [ Config( diff --git a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_needs_1.yaml.snap b/crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_needs_1.yaml.snap similarity index 63% rename from src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_needs_1.yaml.snap rename to crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_needs_1.yaml.snap index b23651e..e9fc247 100644 --- a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_needs_1.yaml.snap +++ b/crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_needs_1.yaml.snap @@ -1,7 +1,7 @@ --- -source: src/composer/execute.rs +source: crates/seele-composer/src/execute.rs expression: results -input_file: src/composer/tests/submission_needs_1.yaml +input_file: crates/seele-composer/src/tests/submission_needs_1.yaml --- [ Config( diff --git a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_needs_2.yaml.snap b/crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_needs_2.yaml.snap similarity index 73% rename from src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_needs_2.yaml.snap rename to crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_needs_2.yaml.snap index 1d736a6..47dc424 100644 --- a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_needs_2.yaml.snap +++ b/crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_needs_2.yaml.snap @@ -1,7 +1,7 @@ --- -source: src/composer/execute.rs +source: crates/seele-composer/src/execute.rs expression: results -input_file: src/composer/tests/submission_needs_2.yaml +input_file: crates/seele-composer/src/tests/submission_needs_2.yaml --- [ Config( diff --git a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_needs_complex.yaml.snap b/crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_needs_complex.yaml.snap similarity index 78% rename from src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_needs_complex.yaml.snap rename to crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_needs_complex.yaml.snap index e896c87..27b8ada 100644 --- a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_needs_complex.yaml.snap +++ b/crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_needs_complex.yaml.snap @@ -1,7 +1,7 @@ --- -source: src/composer/execute.rs +source: crates/seele-composer/src/execute.rs expression: results -input_file: src/composer/tests/submission_needs_complex.yaml +input_file: crates/seele-composer/src/tests/submission_needs_complex.yaml --- [ Config( diff --git a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_nested_sequence_1.yaml.snap b/crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_nested_sequence_1.yaml.snap similarity index 67% rename from src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_nested_sequence_1.yaml.snap rename to crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_nested_sequence_1.yaml.snap index 5e4809f..6a9ea16 100644 --- a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_nested_sequence_1.yaml.snap +++ b/crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_nested_sequence_1.yaml.snap @@ -1,7 +1,7 @@ --- -source: src/composer/execute.rs +source: crates/seele-composer/src/execute.rs expression: results -input_file: src/composer/tests/submission_nested_sequence_1.yaml +input_file: crates/seele-composer/src/tests/submission_nested_sequence_1.yaml --- [ Config( diff --git a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_nested_sequence_2.yaml.snap b/crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_nested_sequence_2.yaml.snap similarity index 81% rename from src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_nested_sequence_2.yaml.snap rename to crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_nested_sequence_2.yaml.snap index c6a508a..afe6be0 100644 --- a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_nested_sequence_2.yaml.snap +++ b/crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_nested_sequence_2.yaml.snap @@ -1,7 +1,7 @@ --- -source: src/composer/execute.rs +source: crates/seele-composer/src/execute.rs expression: results -input_file: src/composer/tests/submission_nested_sequence_2.yaml +input_file: crates/seele-composer/src/tests/submission_nested_sequence_2.yaml --- [ Config( diff --git a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_nested_sequence_3.yaml.snap b/crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_nested_sequence_3.yaml.snap similarity index 81% rename from src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_nested_sequence_3.yaml.snap rename to crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_nested_sequence_3.yaml.snap index baf55af..9af27c9 100644 --- a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_nested_sequence_3.yaml.snap +++ b/crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_nested_sequence_3.yaml.snap @@ -1,7 +1,7 @@ --- -source: src/composer/execute.rs +source: crates/seele-composer/src/execute.rs expression: results -input_file: src/composer/tests/submission_nested_sequence_3.yaml +input_file: crates/seele-composer/src/tests/submission_nested_sequence_3.yaml --- [ Config( diff --git a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_needs.yaml.snap b/crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_simple.yaml.snap similarity index 64% rename from src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_needs.yaml.snap rename to crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_simple.yaml.snap index 2d3d8c8..22cf2ed 100644 --- a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_needs.yaml.snap +++ b/crates/seele-composer/src/tests/snapshots/seele_composer__execute__tests__execute_submission@submission_simple.yaml.snap @@ -1,7 +1,7 @@ --- -source: src/composer/execute.rs +source: crates/seele-composer/src/execute.rs expression: results -input_file: src/composer/tests/submission_needs.yaml +input_file: crates/seele-composer/src/tests/submission_simple.yaml --- [ Config( diff --git a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_complex_1.yaml.snap b/crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_complex_1.yaml.snap similarity index 96% rename from src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_complex_1.yaml.snap rename to crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_complex_1.yaml.snap index be71546..5f4b357 100644 --- a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_complex_1.yaml.snap +++ b/crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_complex_1.yaml.snap @@ -1,7 +1,7 @@ --- -source: src/composer/resolve.rs +source: crates/seele-composer/src/resolve.rs expression: submission -input_file: src/composer/tests/submission_complex_1.yaml +input_file: crates/seele-composer/src/tests/submission_complex_1.yaml --- Submission( id: "complex_1", diff --git a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_needs_1.yaml.snap b/crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_needs_1.yaml.snap similarity index 89% rename from src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_needs_1.yaml.snap rename to crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_needs_1.yaml.snap index c293264..fe5a5f4 100644 --- a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_needs_1.yaml.snap +++ b/crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_needs_1.yaml.snap @@ -1,7 +1,7 @@ --- -source: src/composer/resolve.rs +source: crates/seele-composer/src/resolve.rs expression: submission -input_file: src/composer/tests/submission_needs_1.yaml +input_file: crates/seele-composer/src/tests/submission_needs_1.yaml --- Submission( id: "needs_1", diff --git a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_needs_2.yaml.snap b/crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_needs_2.yaml.snap similarity index 93% rename from src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_needs_2.yaml.snap rename to crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_needs_2.yaml.snap index 74067df..4f5033f 100644 --- a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_needs_2.yaml.snap +++ b/crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_needs_2.yaml.snap @@ -1,7 +1,7 @@ --- -source: src/composer/resolve.rs +source: crates/seele-composer/src/resolve.rs expression: submission -input_file: src/composer/tests/submission_needs_2.yaml +input_file: crates/seele-composer/src/tests/submission_needs_2.yaml --- Submission( id: "needs_2", diff --git a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_needs_complex.yaml.snap b/crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_needs_complex.yaml.snap similarity index 97% rename from src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_needs_complex.yaml.snap rename to crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_needs_complex.yaml.snap index f1b97d2..b3f5538 100644 --- a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_needs_complex.yaml.snap +++ b/crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_needs_complex.yaml.snap @@ -1,7 +1,7 @@ --- -source: src/composer/resolve.rs +source: crates/seele-composer/src/resolve.rs expression: submission -input_file: src/composer/tests/submission_needs_complex.yaml +input_file: crates/seele-composer/src/tests/submission_needs_complex.yaml --- Submission( id: "needs_complex", diff --git a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_nested_sequence_1.yaml.snap b/crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_nested_sequence_1.yaml.snap similarity index 93% rename from src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_nested_sequence_1.yaml.snap rename to crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_nested_sequence_1.yaml.snap index 7a5b08a..0b6e112 100644 --- a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_nested_sequence_1.yaml.snap +++ b/crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_nested_sequence_1.yaml.snap @@ -1,7 +1,7 @@ --- -source: src/composer/resolve.rs +source: crates/seele-composer/src/resolve.rs expression: submission -input_file: src/composer/tests/submission_nested_sequence_1.yaml +input_file: crates/seele-composer/src/tests/submission_nested_sequence_1.yaml --- Submission( id: "nested_sequence_1", diff --git a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_nested_sequence_2.yaml.snap b/crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_nested_sequence_2.yaml.snap similarity index 97% rename from src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_nested_sequence_2.yaml.snap rename to crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_nested_sequence_2.yaml.snap index fd73784..69a5e8e 100644 --- a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_nested_sequence_2.yaml.snap +++ b/crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_nested_sequence_2.yaml.snap @@ -1,7 +1,7 @@ --- -source: src/composer/resolve.rs +source: crates/seele-composer/src/resolve.rs expression: submission -input_file: src/composer/tests/submission_nested_sequence_2.yaml +input_file: crates/seele-composer/src/tests/submission_nested_sequence_2.yaml --- Submission( id: "nested_sequence_2", diff --git a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_nested_sequence_3.yaml.snap b/crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_nested_sequence_3.yaml.snap similarity index 98% rename from src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_nested_sequence_3.yaml.snap rename to crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_nested_sequence_3.yaml.snap index 54ac6a2..8435be4 100644 --- a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_nested_sequence_3.yaml.snap +++ b/crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_nested_sequence_3.yaml.snap @@ -1,7 +1,7 @@ --- -source: src/composer/resolve.rs +source: crates/seele-composer/src/resolve.rs expression: submission -input_file: src/composer/tests/submission_nested_sequence_3.yaml +input_file: crates/seele-composer/src/tests/submission_nested_sequence_3.yaml --- Submission( id: "nested_sequence_3", diff --git a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_simple.yaml.snap b/crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_simple.yaml.snap similarity index 90% rename from src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_simple.yaml.snap rename to crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_simple.yaml.snap index b5ee053..f0cf905 100644 --- a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_simple.yaml.snap +++ b/crates/seele-composer/src/tests/snapshots/seele_composer__resolve__tests__resolve_submission@submission_simple.yaml.snap @@ -1,7 +1,7 @@ --- -source: src/composer/resolve.rs +source: crates/seele-composer/src/resolve.rs expression: submission -input_file: src/composer/tests/submission_simple.yaml +input_file: crates/seele-composer/src/tests/submission_simple.yaml --- Submission( id: "simple", diff --git a/src/composer/tests/submission_complex_1.yaml b/crates/seele-composer/src/tests/submission_complex_1.yaml similarity index 100% rename from src/composer/tests/submission_complex_1.yaml rename to crates/seele-composer/src/tests/submission_complex_1.yaml diff --git a/src/composer/tests/submission_needs_1.yaml b/crates/seele-composer/src/tests/submission_needs_1.yaml similarity index 100% rename from src/composer/tests/submission_needs_1.yaml rename to crates/seele-composer/src/tests/submission_needs_1.yaml diff --git a/src/composer/tests/submission_needs_2.yaml b/crates/seele-composer/src/tests/submission_needs_2.yaml similarity index 100% rename from src/composer/tests/submission_needs_2.yaml rename to crates/seele-composer/src/tests/submission_needs_2.yaml diff --git a/src/composer/tests/submission_needs_complex.yaml b/crates/seele-composer/src/tests/submission_needs_complex.yaml similarity index 100% rename from src/composer/tests/submission_needs_complex.yaml rename to crates/seele-composer/src/tests/submission_needs_complex.yaml diff --git a/src/composer/tests/submission_nested_sequence_1.yaml b/crates/seele-composer/src/tests/submission_nested_sequence_1.yaml similarity index 100% rename from src/composer/tests/submission_nested_sequence_1.yaml rename to crates/seele-composer/src/tests/submission_nested_sequence_1.yaml diff --git a/src/composer/tests/submission_nested_sequence_2.yaml b/crates/seele-composer/src/tests/submission_nested_sequence_2.yaml similarity index 100% rename from src/composer/tests/submission_nested_sequence_2.yaml rename to crates/seele-composer/src/tests/submission_nested_sequence_2.yaml diff --git a/src/composer/tests/submission_nested_sequence_3.yaml b/crates/seele-composer/src/tests/submission_nested_sequence_3.yaml similarity index 100% rename from src/composer/tests/submission_nested_sequence_3.yaml rename to crates/seele-composer/src/tests/submission_nested_sequence_3.yaml diff --git a/src/composer/tests/submission_simple.yaml b/crates/seele-composer/src/tests/submission_simple.yaml similarity index 100% rename from src/composer/tests/submission_simple.yaml rename to crates/seele-composer/src/tests/submission_simple.yaml diff --git a/crates/seele-config/Cargo.toml b/crates/seele-config/Cargo.toml new file mode 100644 index 0000000..a667e73 --- /dev/null +++ b/crates/seele-config/Cargo.toml @@ -0,0 +1,20 @@ +[package] +edition.workspace = true +name = "seele_config" +version.workspace = true + +[dependencies] +anyhow = { workspace = true } +config = { workspace = true } +http-cache = { workspace = true } +indexmap = { workspace = true } +lapin = { workspace = true } +nano-id = { workspace = true } +nix = { workspace = true } +num_cpus = { workspace = true } +serde = { workspace = true } +tokio = { workspace = true } +tracing = { workspace = true } +tracing-subscriber = { workspace = true } +url = { workspace = true } +uzers = { workspace = true } diff --git a/src/conf/action.rs b/crates/seele-config/src/action.rs similarity index 92% rename from src/conf/action.rs rename to crates/seele-config/src/action.rs index 0962691..a2c24f9 100644 --- a/src/conf/action.rs +++ b/crates/seele-config/src/action.rs @@ -1,7 +1,7 @@ use http_cache::CacheMode; use serde::Deserialize; -use crate::shared::image::OciImage; +use crate::image::OciImage; #[derive(Debug, Default, Deserialize)] pub struct ActionConfig { @@ -59,17 +59,17 @@ impl Default for ActionAddFileConfig { } #[inline] -fn default_cache_strategy() -> HttpCacheStrategy { +const fn default_cache_strategy() -> HttpCacheStrategy { HttpCacheStrategy::Default } #[inline] -fn default_cache_size_mib() -> u64 { +const fn default_cache_size_mib() -> u64 { 512 } #[inline] -fn default_cache_ttl_hour() -> u64 { +const fn default_cache_ttl_hour() -> u64 { 24 * 3 } @@ -116,12 +116,12 @@ impl Default for ActionRunContainerConfig { } #[inline] -fn default_pull_image_timeout_seconds() -> u64 { +const fn default_pull_image_timeout_seconds() -> u64 { 600 } #[inline] -fn default_unpack_image_timeout_seconds() -> u64 { +const fn default_unpack_image_timeout_seconds() -> u64 { 600 } diff --git a/src/conf/composer.rs b/crates/seele-config/src/composer.rs similarity index 68% rename from src/conf/composer.rs rename to crates/seele-config/src/composer.rs index e0a5354..6b4101a 100644 --- a/src/conf/composer.rs +++ b/crates/seele-config/src/composer.rs @@ -1,4 +1,4 @@ use serde::Deserialize; #[derive(Debug, Deserialize, Default)] -pub struct ComposerConfig {} +pub struct ComposerConfig; diff --git a/crates/seele-config/src/env.rs b/crates/seele-config/src/env.rs new file mode 100644 index 0000000..6495ba2 --- /dev/null +++ b/crates/seele-config/src/env.rs @@ -0,0 +1,19 @@ +use std::{env, sync::LazyLock}; + +pub static HOSTNAME: LazyLock = + LazyLock::new(|| env::var("HOSTNAME").unwrap_or(get_hostname())); +pub static CONTAINER_NAME: LazyLock> = + LazyLock::new(|| env::var("CONTAINER_NAME").ok()); +pub static CONTAINER_IMAGE_NAME: LazyLock> = + LazyLock::new(|| env::var("CONTAINER_IMAGE_NAME").ok()); + +pub static COMMIT_TAG: LazyLock> = LazyLock::new(|| option_env!("COMMIT_TAG")); +pub static COMMIT_SHA: LazyLock> = LazyLock::new(|| option_env!("COMMIT_SHA")); + +#[inline] +fn get_hostname() -> String { + nix::unistd::gethostname() + .expect("Failed to get hostname") + .into_string() + .expect("Error converting hostname from OsString") +} diff --git a/src/conf/exchange.rs b/crates/seele-config/src/exchange.rs similarity index 94% rename from src/conf/exchange.rs rename to crates/seele-config/src/exchange.rs index 68af1b2..e76252b 100644 --- a/src/conf/exchange.rs +++ b/crates/seele-config/src/exchange.rs @@ -63,11 +63,11 @@ pub struct LapinExchangeConfig { } #[inline] -fn default_http_address() -> IpAddr { +const fn default_http_address() -> IpAddr { IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)) } #[inline] -fn default_max_body_size() -> u64 { +const fn default_max_body_size() -> u64 { 8 * 1024 * 1024 } diff --git a/src/conf/healthz.rs b/crates/seele-config/src/healthz.rs similarity index 84% rename from src/conf/healthz.rs rename to crates/seele-config/src/healthz.rs index 69f79cc..2d2ddfb 100644 --- a/src/conf/healthz.rs +++ b/crates/seele-config/src/healthz.rs @@ -16,11 +16,11 @@ impl Default for HealthzConfig { } #[inline] -fn default_enabled() -> bool { +const fn default_enabled() -> bool { true } #[inline] -fn default_port() -> u16 { +const fn default_port() -> u16 { 50000 } diff --git a/src/conf/http.rs b/crates/seele-config/src/http.rs similarity index 84% rename from src/conf/http.rs rename to crates/seele-config/src/http.rs index 4677c5e..751c9b2 100644 --- a/src/conf/http.rs +++ b/crates/seele-config/src/http.rs @@ -1,6 +1,6 @@ use serde::Deserialize; -use crate::conf::env; +use crate::env; #[derive(Debug, Deserialize)] pub struct HttpConfig { @@ -39,21 +39,21 @@ fn default_user_agent() -> String { } #[inline] -fn default_connect_timeout_seconds() -> u64 { +const fn default_connect_timeout_seconds() -> u64 { 8 } #[inline] -fn default_timeout_seconds() -> u64 { +const fn default_timeout_seconds() -> u64 { 60 } #[inline] -fn default_pool_idle_timeout_seconds() -> u64 { +const fn default_pool_idle_timeout_seconds() -> u64 { 600 } #[inline] -fn default_pool_max_idle_per_host() -> usize { +const fn default_pool_max_idle_per_host() -> usize { 8 } diff --git a/src/shared/image.rs b/crates/seele-config/src/image.rs similarity index 100% rename from src/shared/image.rs rename to crates/seele-config/src/image.rs diff --git a/src/conf/mod.rs b/crates/seele-config/src/lib.rs similarity index 94% rename from src/conf/mod.rs rename to crates/seele-config/src/lib.rs index e6b2ff3..27f7361 100644 --- a/src/conf/mod.rs +++ b/crates/seele-config/src/lib.rs @@ -1,11 +1,10 @@ -use std::path::PathBuf; +use std::{path::PathBuf, sync::LazyLock}; use indexmap::IndexMap; -use once_cell::sync::Lazy; use serde::Deserialize; use tracing_subscriber::filter::LevelFilter; -pub use self::{action::*, env::*, exchange::*, path::*}; +pub use self::{action::*, env::*, exchange::*, image::*, path::*}; use self::{ composer::ComposerConfig, healthz::HealthzConfig, http::HttpConfig, telemetry::TelemetryConfig, worker::WorkerConfig, @@ -17,11 +16,12 @@ pub mod env; mod exchange; mod healthz; mod http; +mod image; mod path; mod telemetry; mod worker; -pub static CONFIG: Lazy = Lazy::new(|| { +pub static CONFIG: LazyLock = LazyLock::new(|| { match config::Config::builder() .add_source(config::File::with_name("config")) .add_source(config::Environment::with_prefix("SEELE")) @@ -122,7 +122,7 @@ impl Default for ThreadCounts { } #[inline] -fn default_worker_thread_count() -> usize { +const fn default_worker_thread_count() -> usize { 1 } diff --git a/src/conf/path.rs b/crates/seele-config/src/path.rs similarity index 86% rename from src/conf/path.rs rename to crates/seele-config/src/path.rs index da5570c..edd3e5f 100644 --- a/src/conf/path.rs +++ b/crates/seele-config/src/path.rs @@ -1,7 +1,6 @@ -use std::path::PathBuf; +use std::{path::PathBuf, sync::LazyLock}; use anyhow::{Context, Result}; -use once_cell::sync::Lazy; use tokio::fs; use super::CONFIG; @@ -24,7 +23,7 @@ impl SeelePaths { } } -pub static PATHS: Lazy = Lazy::new(|| SeelePaths { +pub static PATHS: LazyLock = LazyLock::new(|| SeelePaths { root: CONFIG.paths.root.clone(), images: CONFIG.paths.root.join("images"), temp: CONFIG.paths.root.join("temp"), diff --git a/src/conf/telemetry.rs b/crates/seele-config/src/telemetry.rs similarity index 100% rename from src/conf/telemetry.rs rename to crates/seele-config/src/telemetry.rs diff --git a/src/conf/worker.rs b/crates/seele-config/src/worker.rs similarity index 100% rename from src/conf/worker.rs rename to crates/seele-config/src/worker.rs diff --git a/crates/seele-exchange/Cargo.toml b/crates/seele-exchange/Cargo.toml new file mode 100644 index 0000000..a84bd81 --- /dev/null +++ b/crates/seele-exchange/Cargo.toml @@ -0,0 +1,23 @@ +[package] +edition.workspace = true +name = "seele_exchange" +version.workspace = true + +[dependencies] +anyhow = { workspace = true } +axum = { workspace = true } +futures-util = { workspace = true } +lapin = { workspace = true } +nano-id = { workspace = true } +ring-channel = { workspace = true } +serde_json = { workspace = true } +tokio = { workspace = true } +tokio-graceful-shutdown = { workspace = true } +tracing = { workspace = true } +triggered = { workspace = true } + +# local dependencies + +seele_composer = { workspace = true } +seele_config = { workspace = true } +seele_shared = { workspace = true } diff --git a/src/exchange/amqp.rs b/crates/seele-exchange/src/amqp.rs similarity index 95% rename from src/exchange/amqp.rs rename to crates/seele-exchange/src/amqp.rs index 593bd0a..eaaf7ca 100644 --- a/src/exchange/amqp.rs +++ b/crates/seele-exchange/src/amqp.rs @@ -1,12 +1,16 @@ -use std::{collections::HashMap, num::NonZeroUsize, sync::Arc, time::Duration}; +use std::{ + collections::HashMap, + num::NonZeroUsize, + sync::{Arc, LazyLock}, + time::Duration, +}; -use anyhow::{bail, Context, Result}; +use anyhow::{Context, Result, bail}; use futures_util::StreamExt; -use lapin::{message::Delivery, Channel, ChannelState, Connection}; -use once_cell::sync::Lazy; +use lapin::{Channel, ChannelState, Connection, message::Delivery}; use ring_channel::ring_channel; use tokio::{ - sync::{mpsc, Mutex}, + sync::{Mutex, mpsc}, time::sleep, }; use tokio_graceful_shutdown::SubsystemHandle; @@ -18,7 +22,7 @@ use crate::{ conf::{self, AmqpExchangeConfig, AmqpExchangeReportConfig}, }; -static STATUS_MAP: Lazy>> = Lazy::new(Default::default); +static STATUS_MAP: LazyLock>> = LazyLock::new(Default::default); pub async fn is_amqp_healthy() -> bool { let map = STATUS_MAP.lock().await; diff --git a/crates/seele-exchange/src/http.rs b/crates/seele-exchange/src/http.rs new file mode 100644 index 0000000..55fec51 --- /dev/null +++ b/crates/seele-exchange/src/http.rs @@ -0,0 +1,111 @@ +use std::{convert::Infallible, net::SocketAddr, num::NonZeroUsize, time::Duration}; + +use anyhow::{Result, bail}; +use axum::{ + Router, + body::{Body, HttpBody, to_bytes}, + extract::Request, + http::StatusCode, + response::{IntoResponse, Response}, + routing::any, +}; +use futures_util::StreamExt; +use ring_channel::ring_channel; +use tokio::{net::TcpListener, time::sleep}; +use tokio_graceful_shutdown::SubsystemHandle; +use tracing::{error, info}; + +use crate::{ + composer::{ComposerQueueItem, ComposerQueueTx, SubmissionSignal, SubmissionSignalExt}, + conf::HttpExchangeConfig, +}; + +pub async fn run( + name: &str, + handle: SubsystemHandle, + tx: ComposerQueueTx, + config: &HttpExchangeConfig, +) -> Result<()> { + let app = Router::new().route( + "/", + any({ + let tx = tx.clone(); + let max_body_size_bytes = config.max_body_size_bytes; + move |request: Request| handle_submission_request(request, tx, max_body_size_bytes) + }), + ); + + let addr = SocketAddr::from((config.address, config.port)); + let listener = TcpListener::bind(addr).await?; + + info!("Starting http exchange {} on {}:{}", name, config.address, config.port); + + axum::serve(listener, app) + .with_graceful_shutdown(async move { + handle.on_shutdown_requested().await; + + info!("Http exchange is shutting down, waiting for unfinished submissions"); + sleep(Duration::from_secs(5)).await; + }) + .await?; + + Ok(()) +} + +fn serialize(debug: bool, signal: &SubmissionSignal) -> String { + let result = + if debug { serde_json::to_string_pretty(signal) } else { serde_json::to_string(signal) }; + match result { + Err(err) => { + error!("Error serializing the value: {:#}", err); + "".to_string() + } + Ok(json) => format!("{}\n", json), + } +} + +async fn handle_submission_request( + request: Request, + tx: ComposerQueueTx, + max_body_size_bytes: u64, +) -> impl IntoResponse { + match handle_submission_request_inner(request, tx, max_body_size_bytes).await { + Ok(response) => (StatusCode::OK, response), + Err(err) => { + error!("Error handling the submission request: {:#}", err); + (StatusCode::INTERNAL_SERVER_ERROR, Response::new(Body::from(err.to_string()))) + } + } +} + +async fn handle_submission_request_inner( + request: Request, + tx: ComposerQueueTx, + max_body_size_bytes: u64, +) -> Result { + { + let body_size = request.body().size_hint().upper().unwrap_or(max_body_size_bytes + 1); + if body_size > max_body_size_bytes { + bail!("The size of the request body exceeds the limit: {}", body_size); + } + } + + let show_progress = matches!(request.uri().query(), Some(query) if query.contains("progress")); + let debug = matches!(request.uri().query(), Some(query) if query.contains("debug")); + let config_yaml = + { String::from_utf8(to_bytes(request.into_body(), usize::MAX).await?.to_vec())? }; + let (status_tx, status_rx) = ring_channel(NonZeroUsize::try_from(1).unwrap()); + tx.send(ComposerQueueItem { config_yaml, status_tx }).await?; + + let stream = status_rx.map(move |signal| { + type CallbackResult = Result; + + if !show_progress && matches!(signal.ext, SubmissionSignalExt::Progress { .. }) { + return CallbackResult::Ok("".to_string()); + } + + CallbackResult::Ok(serialize(debug, &signal)) + }); + + Ok(Response::new(Body::from_stream(stream))) +} diff --git a/src/exchange/mod.rs b/crates/seele-exchange/src/lib.rs similarity index 90% rename from src/exchange/mod.rs rename to crates/seele-exchange/src/lib.rs index 6caf53f..b77e547 100644 --- a/src/exchange/mod.rs +++ b/crates/seele-exchange/src/lib.rs @@ -1,10 +1,11 @@ use anyhow::Result; +use seele_composer::{self as composer, ComposerQueueItem}; +use seele_config::{self as conf, ExchangeConfig}; use tokio::sync::mpsc; use tokio_graceful_shutdown::{SubsystemBuilder, SubsystemHandle}; use tracing::info; pub use self::amqp::is_amqp_healthy; -use crate::{composer::ComposerQueueItem, conf, conf::ExchangeConfig}; mod amqp; mod http; diff --git a/crates/seele-shared/Cargo.toml b/crates/seele-shared/Cargo.toml new file mode 100644 index 0000000..ac90f1c --- /dev/null +++ b/crates/seele-shared/Cargo.toml @@ -0,0 +1,27 @@ +[package] +edition.workspace = true +name = "seele_shared" +version.workspace = true + +[dependencies] +anyhow = { workspace = true } +chrono = { workspace = true } +either = { workspace = true } +ellipse = { workspace = true } +futures-util = { workspace = true } +indexmap = { workspace = true } +nano-id = { workspace = true } +opentelemetry = { workspace = true } +opentelemetry_sdk = { workspace = true } +rand = { workspace = true } +reqwest = { workspace = true } +serde = { workspace = true } +serde_yaml = { workspace = true } +shell-words = { workspace = true } +tokio = { workspace = true } +triggered = { workspace = true } +url = { workspace = true } + +# local dependencies + +seele_config = { workspace = true } diff --git a/src/shared/cond.rs b/crates/seele-shared/src/cond.rs similarity index 95% rename from src/shared/cond.rs rename to crates/seele-shared/src/cond.rs index 32ea325..1b812f6 100644 --- a/src/shared/cond.rs +++ b/crates/seele-shared/src/cond.rs @@ -1,8 +1,8 @@ use std::{collections::HashMap, hash::Hash}; use futures_util::{ - future::{BoxFuture, Shared}, FutureExt, + future::{BoxFuture, Shared}, }; use tokio::sync::Mutex; use triggered::Listener; @@ -87,7 +87,7 @@ mod tests { let group: CondGroup = CondGroup::new(|num: &i32| { let num = *num; tokio::time::sleep(Duration::from_millis(100)) - .map(move |_| (num, rand::thread_rng().gen_range(0..1000))) + .map(move |_| (num, rand::rng().random_range(0..1000))) .boxed() }); @@ -103,7 +103,7 @@ mod tests { let group: CondGroup = CondGroup::new(|num: &i32| { let num = *num; tokio::time::sleep(Duration::from_millis(100)) - .map(move |_| (num, rand::thread_rng().gen_range(0..1000))) + .map(move |_| (num, rand::rng().random_range(0..1000))) .boxed() }); diff --git a/src/worker/action/add_file/entities.rs b/crates/seele-shared/src/entities/action/add_file.rs similarity index 59% rename from src/worker/action/add_file/entities.rs rename to crates/seele-shared/src/entities/action/add_file.rs index 643f3a8..6012d20 100644 --- a/src/worker/action/add_file/entities.rs +++ b/crates/seele-shared/src/entities/action/add_file.rs @@ -28,19 +28,14 @@ impl Display for FileItem { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { use ellipse::Ellipse; - write!( - f, - "{}({})", - self.path.display(), - match &self.ext { - FileItemExt::Http { url } => url.to_string(), - FileItemExt::PlainText { plain } => - format!("{}...", plain.as_str().truncate_ellipse(30)), - FileItemExt::Base64 { base64 } => - format!("{}...", base64.as_str().truncate_ellipse(30)), - FileItemExt::LocalPath { local } => format!("{}", local.display()), - } - ) + write!(f, "{}({})", self.path.display(), match &self.ext { + FileItemExt::Http { url } => url.to_string(), + FileItemExt::PlainText { plain } => + format!("{}...", plain.as_str().truncate_ellipse(30)), + FileItemExt::Base64 { base64 } => + format!("{}...", base64.as_str().truncate_ellipse(30)), + FileItemExt::LocalPath { local } => format!("{}", local.display()), + }) } } diff --git a/src/entities/action.rs b/crates/seele-shared/src/entities/action/mod.rs similarity index 56% rename from src/entities/action.rs rename to crates/seele-shared/src/entities/action/mod.rs index 8945d35..742bfde 100644 --- a/src/entities/action.rs +++ b/crates/seele-shared/src/entities/action/mod.rs @@ -1,24 +1,26 @@ use serde::{Deserialize, Serialize}; -use crate::worker::action; +pub mod add_file; +pub mod noop; +pub mod run_container; #[derive(Debug, Clone, Deserialize, Serialize)] #[serde(tag = "action")] pub enum ActionTaskConfig { #[serde(rename = "seele/noop@1")] - Noop(action::noop::Config), + Noop(noop::Config), #[serde(rename = "seele/add-file@1")] - AddFile(action::add_file::Config), + AddFile(add_file::Config), #[serde(rename = "seele/run-container@1")] - RunContainer(action::run_container::Config), + RunContainer(run_container::Config), #[serde(rename = "seele/run-judge/compile@1")] - RunJudgeCompile(action::run_container::run_judge::compile::Config), + RunJudgeCompile(run_container::run_judge::compile::Config), #[serde(rename = "seele/run-judge/run@1")] - RunJudgeRun(action::run_container::run_judge::run::Config), + RunJudgeRun(run_container::run_judge::run::Config), } #[derive(Debug, Clone)] @@ -30,16 +32,16 @@ pub enum ActionReportExt { #[derive(Debug, Clone, Deserialize, Serialize)] #[serde(tag = "type", rename_all = "snake_case")] pub enum ActionSuccessReportExt { - Noop(action::noop::ExecutionReport), + Noop(noop::ExecutionReport), AddFile, - RunCompile(action::run_container::run_judge::compile::ExecutionReport), - RunContainer(action::run_container::ExecutionReport), + RunCompile(run_container::run_judge::compile::ExecutionReport), + RunContainer(run_container::ExecutionReport), } #[derive(Debug, Clone, Deserialize, Serialize)] #[serde(tag = "type", rename_all = "snake_case")] pub enum ActionFailureReportExt { - Noop(action::noop::ExecutionReport), - AddFile(action::add_file::FailedReport), - RunContainer(action::run_container::ExecutionReport), + Noop(noop::ExecutionReport), + AddFile(add_file::FailedReport), + RunContainer(run_container::ExecutionReport), } diff --git a/crates/seele-shared/src/entities/action/noop.rs b/crates/seele-shared/src/entities/action/noop.rs new file mode 100644 index 0000000..5c971a0 --- /dev/null +++ b/crates/seele-shared/src/entities/action/noop.rs @@ -0,0 +1,12 @@ +use serde::{Deserialize, Serialize}; + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Config { + #[serde(default)] + pub test: u64, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct ExecutionReport { + pub test: u64, +} diff --git a/src/worker/action/run_container/entities.rs b/crates/seele-shared/src/entities/action/run_container/mod.rs similarity index 97% rename from src/worker/action/run_container/entities.rs rename to crates/seele-shared/src/entities/action/run_container/mod.rs index 304f060..f785371 100644 --- a/src/worker/action/run_container/entities.rs +++ b/crates/seele-shared/src/entities/action/run_container/mod.rs @@ -3,11 +3,14 @@ use std::{ path::{Path, PathBuf}, }; -use anyhow::{bail, Result}; +use anyhow::{Result, bail}; use serde::{Deserialize, Serialize}; -use super::runj::{self, RlimitItem}; -use crate::shared::image::OciImage; +pub mod run_judge; +pub mod runj; + +use runj::RlimitItem; +use seele_config::OciImage; pub type ExecutionReport = runj::ContainerExecutionReport; pub type ExecutionStatus = runj::ContainerExecutionStatus; diff --git a/crates/seele-shared/src/entities/action/run_container/run_judge/compile.rs b/crates/seele-shared/src/entities/action/run_container/run_judge/compile.rs new file mode 100644 index 0000000..24dbff9 --- /dev/null +++ b/crates/seele-shared/src/entities/action/run_container/run_judge/compile.rs @@ -0,0 +1,52 @@ +use serde::{Deserialize, Serialize}; + +use super::MountFile; +use crate::entities::run_container; + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Config { + #[serde(flatten)] + pub run_container_config: run_container::Config, + + #[serde(default)] + pub sources: Vec, + + #[serde(default)] + pub saves: Vec, + + #[serde(default)] + pub cache: CacheConfig, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct CacheConfig { + pub enabled: bool, + + #[serde(default = "default_max_allowed_size_mib")] + pub max_allowed_size_mib: u64, + + #[serde(default)] + pub extra: Vec, +} + +impl Default for CacheConfig { + fn default() -> Self { + Self { + enabled: false, + max_allowed_size_mib: default_max_allowed_size_mib(), + extra: Default::default(), + } + } +} + +#[inline] +fn default_max_allowed_size_mib() -> u64 { + seele_config::CONFIG.worker.action.run_container.cache_size_mib / 16 +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +#[serde(untagged)] +pub enum ExecutionReport { + CacheHit { cache_hit: bool }, + CacheMiss(run_container::ExecutionReport), +} diff --git a/crates/seele-shared/src/entities/action/run_container/run_judge/mod.rs b/crates/seele-shared/src/entities/action/run_container/run_judge/mod.rs new file mode 100644 index 0000000..d144d48 --- /dev/null +++ b/crates/seele-shared/src/entities/action/run_container/run_judge/mod.rs @@ -0,0 +1,61 @@ +use std::fmt::Display; + +use anyhow::bail; +use serde::{Deserialize, Serialize, de}; + +pub mod compile; +pub mod run; + +#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)] +pub struct MountFile { + pub from_path: String, + pub to_path: String, + pub exec: bool, +} + +impl<'de> Deserialize<'de> for MountFile { + fn deserialize(deserializer: D) -> Result + where + D: serde::Deserializer<'de>, + { + let str = String::deserialize(deserializer)?; + str.as_str().try_into().map_err(|err| de::Error::custom(format!("{err:#}"))) + } +} + +impl Serialize for MountFile { + fn serialize(&self, serializer: S) -> Result + where + S: serde::Serializer, + { + serializer.serialize_str(&format!("{self}")) + } +} + +impl TryFrom<&str> for MountFile { + type Error = anyhow::Error; + + fn try_from(value: &str) -> Result { + Ok(match value.split(':').collect::>()[..] { + [from_path] => { + Self { from_path: from_path.into(), to_path: from_path.into(), exec: false } + } + [from_path, "exec"] => { + Self { from_path: from_path.into(), to_path: from_path.into(), exec: true } + } + [from_path, to_path] => { + Self { from_path: from_path.into(), to_path: to_path.into(), exec: false } + } + [from_path, to_path, "exec"] => { + Self { from_path: from_path.into(), to_path: to_path.into(), exec: true } + } + _ => bail!("Unexpected file item: {value}"), + }) + } +} + +impl Display for MountFile { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "{}:{}{}", self.from_path, self.to_path, if self.exec { ":exec" } else { "" }) + } +} diff --git a/crates/seele-shared/src/entities/action/run_container/run_judge/run.rs b/crates/seele-shared/src/entities/action/run_container/run_judge/run.rs new file mode 100644 index 0000000..a2054dd --- /dev/null +++ b/crates/seele-shared/src/entities/action/run_container/run_judge/run.rs @@ -0,0 +1,13 @@ +use serde::{Deserialize, Serialize}; + +use super::MountFile; +use crate::entities::run_container; + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Config { + #[serde(flatten)] + pub run_container_config: run_container::Config, + + #[serde(default)] + pub files: Vec, +} diff --git a/src/worker/action/run_container/runj.rs b/crates/seele-shared/src/entities/action/run_container/runj.rs similarity index 86% rename from src/worker/action/run_container/runj.rs rename to crates/seele-shared/src/entities/action/run_container/runj.rs index 836d09b..0da1e81 100644 --- a/src/worker/action/run_container/runj.rs +++ b/crates/seele-shared/src/entities/action/run_container/runj.rs @@ -150,19 +150,15 @@ pub enum ContainerExecutionStatus { impl Display for ContainerExecutionStatus { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!( - f, - "{}", - match self { - Self::Normal => "NORMAL", - Self::RuntimeError => "RUNTIME_ERROR", - Self::SignalTerminate => "SIGNAL_TERMINATE", - Self::UserTimeLimitExceeded => "USER_TIME_LIMIT_EXCEEDED", - Self::WallTimeLimitExceeded => "WALL_TIME_LIMIT_EXCEEDED", - Self::MemoryLimitExceeded => "MEMORY_LIMIT_EXCEEDED", - Self::OutputLimitExceeded => "OUTPUT_LIMIT_EXCEEDED", - Self::Unknown => "UNKNOWN", - } - ) + write!(f, "{}", match self { + Self::Normal => "NORMAL", + Self::RuntimeError => "RUNTIME_ERROR", + Self::SignalTerminate => "SIGNAL_TERMINATE", + Self::UserTimeLimitExceeded => "USER_TIME_LIMIT_EXCEEDED", + Self::WallTimeLimitExceeded => "WALL_TIME_LIMIT_EXCEEDED", + Self::MemoryLimitExceeded => "MEMORY_LIMIT_EXCEEDED", + Self::OutputLimitExceeded => "OUTPUT_LIMIT_EXCEEDED", + Self::Unknown => "UNKNOWN", + }) } } diff --git a/src/entities/mod.rs b/crates/seele-shared/src/entities/mod.rs similarity index 100% rename from src/entities/mod.rs rename to crates/seele-shared/src/entities/mod.rs diff --git a/src/entities/report.rs b/crates/seele-shared/src/entities/report.rs similarity index 100% rename from src/entities/report.rs rename to crates/seele-shared/src/entities/report.rs diff --git a/src/entities/submission.rs b/crates/seele-shared/src/entities/submission.rs similarity index 91% rename from src/entities/submission.rs rename to crates/seele-shared/src/entities/submission.rs index 0f1c84e..279f5d7 100644 --- a/src/entities/submission.rs +++ b/crates/seele-shared/src/entities/submission.rs @@ -9,10 +9,7 @@ use either::Either; use indexmap::IndexMap; use serde::{Deserialize, Serialize}; -use super::{ - ActionFailureReportExt, ActionSuccessReportExt, ActionTaskConfig, SubmissionReportEmbedConfig, - SubmissionReportUploadConfig, SubmissionReporter, -}; +use super::*; pub type UtcTimestamp = DateTime; @@ -42,8 +39,7 @@ impl<'a> ParallelTasks { #[derive(Debug, Deserialize, Serialize)] #[serde(deny_unknown_fields)] pub struct SubmissionConfig { - #[cfg_attr(test, serde(skip_serializing))] - #[serde(skip_deserializing, default = "make_submitted_at")] + #[serde(skip_serializing, skip_deserializing, default = "make_submitted_at")] pub submitted_at: UtcTimestamp, #[serde(default = "random_submission_id")] @@ -69,8 +65,7 @@ fn random_submission_id() -> String { nano_id::base62::<16>() } -#[derive(Debug, Clone)] -#[cfg_attr(test, derive(Serialize))] +#[derive(Debug, Clone, Serialize)] pub struct Submission { pub id: String, pub root_directory: PathBuf, @@ -279,24 +274,22 @@ pub struct ActionFailedReport { pub ext: ActionFailureReportExt, } -#[derive(Debug, Clone)] -#[cfg_attr(test, derive(Serialize))] +#[derive(Debug, Clone, Serialize)] pub struct RootTaskNode { pub tasks: Vec>, } -#[derive(Debug, Clone)] -#[cfg_attr(test, derive(Serialize))] +#[derive(Debug, Clone, Serialize)] pub struct TaskNode { pub name: String, - #[cfg_attr(test, serde(skip_serializing))] + #[serde(skip_serializing)] pub config: Arc, pub children: Vec>, pub ext: TaskNodeExt, } -#[derive(Debug, Clone)] -#[cfg_attr(test, derive(Serialize), serde(untagged))] +#[derive(Debug, Clone, Serialize)] +#[serde(untagged)] pub enum TaskNodeExt { Schedule(Vec>), Action(Arc), diff --git a/src/shared/file.rs b/crates/seele-shared/src/file.rs similarity index 100% rename from src/shared/file.rs rename to crates/seele-shared/src/file.rs diff --git a/src/shared/http.rs b/crates/seele-shared/src/http.rs similarity index 100% rename from src/shared/http.rs rename to crates/seele-shared/src/http.rs diff --git a/src/shared/mod.rs b/crates/seele-shared/src/lib.rs similarity index 75% rename from src/shared/mod.rs rename to crates/seele-shared/src/lib.rs index 288d977..79b83e7 100644 --- a/src/shared/mod.rs +++ b/crates/seele-shared/src/lib.rs @@ -1,20 +1,20 @@ -use std::{env, io::SeekFrom}; +use std::{env, io::SeekFrom, sync::LazyLock}; use anyhow::Result; -use once_cell::sync::Lazy; +use seele_config as conf; use tokio::{ fs::File, io::{AsyncReadExt, AsyncSeekExt, BufReader}, }; pub mod cond; +pub mod entities; pub mod file; pub mod http; -pub mod image; pub mod metrics; pub mod runner; -pub static TINI_PRESENTS: Lazy = Lazy::new(|| env::var_os("TINI_VERSION").is_some()); +pub static TINI_PRESENTS: LazyLock = LazyLock::new(|| env::var_os("TINI_VERSION").is_some()); pub static ABORTED_MESSAGE: &str = "Aborted due to shutting down"; diff --git a/crates/seele-shared/src/metrics.rs b/crates/seele-shared/src/metrics.rs new file mode 100644 index 0000000..8e956e0 --- /dev/null +++ b/crates/seele-shared/src/metrics.rs @@ -0,0 +1,83 @@ +use std::{ + borrow::Cow, + sync::{LazyLock, OnceLock, atomic::Ordering}, +}; + +use opentelemetry::{ + InstrumentationScope, KeyValue, global, + metrics::{Histogram, Meter, ObservableGauge}, +}; +use opentelemetry_sdk::{Resource, metrics::SdkMeterProvider}; + +use super::runner; +use crate::conf; + +pub static METRICS_RESOURCE: LazyLock = LazyLock::new(|| { + let mut pairs = vec![ + KeyValue::new("service.name", "seele"), + KeyValue::new( + "service.version", + conf::env::COMMIT_TAG.or(*conf::env::COMMIT_SHA).unwrap_or("unknown"), + ), + KeyValue::new( + "service.instance.id", + format!("{}-{}", *conf::HOSTNAME, nano_id::base62::<8>()), + ), + KeyValue::new("host.name", conf::HOSTNAME.clone()), + ]; + + if let Some(container_name) = conf::CONTAINER_NAME.as_ref() { + pairs.push(KeyValue::new("container.name", container_name.clone())); + } + + if let Some(container_image_name) = conf::CONTAINER_IMAGE_NAME.as_ref() { + pairs.push(KeyValue::new("container.image.name", container_image_name.clone())); + } + + if let Some(tag) = conf::COMMIT_TAG.as_ref() { + pairs.push(KeyValue::new("commit.tag", *tag)); + } + + if let Some(sha) = conf::COMMIT_SHA.as_ref() { + pairs.push(KeyValue::new("commit.sha", *sha)); + } + + Resource::new(pairs) +}); + +pub static METRICS_PROVIDER: OnceLock = OnceLock::new(); + +pub static METER: LazyLock = LazyLock::new(|| { + let scope = InstrumentationScope::builder("seele") + .with_version(Cow::Borrowed(env!("CARGO_PKG_VERSION"))) + .build(); + + global::meter_with_scope(scope) +}); + +pub static SUBMISSION_HANDLING_HISTOGRAM: LazyLock> = LazyLock::new(|| { + METER + .f64_histogram("seele.submission.duration") + .with_description("Duration of submissions handling") + .with_unit("s") + .build() +}); + +pub static RUNNER_COUNT_GAUGE: LazyLock> = LazyLock::new(|| { + METER + .u64_observable_gauge("seele.runner.count") + .with_description("Count of available runner threads") + .with_callback(|ctx| { + ctx.observe(conf::CONFIG.thread_counts.runner as u64, &[]); + }) + .build() +}); + +pub static PENDING_CONTAINER_ACTION_COUNT_GAUGE: LazyLock> = + LazyLock::new(|| { + METER + .u64_observable_gauge("seele.action.container.pending.count") + .with_description("Count of pending container actions in the worker queue") + .with_callback(|ctx| ctx.observe(runner::PENDING_TASKS.load(Ordering::SeqCst), &[])) + .build() + }); diff --git a/src/shared/runner.rs b/crates/seele-shared/src/runner.rs similarity index 60% rename from src/shared/runner.rs rename to crates/seele-shared/src/runner.rs index b8d5504..2db7fcc 100644 --- a/src/shared/runner.rs +++ b/crates/seele-shared/src/runner.rs @@ -1,6 +1,8 @@ -use std::sync::atomic::{AtomicU64, Ordering}; +use std::sync::{ + LazyLock, + atomic::{AtomicU64, Ordering}, +}; -use once_cell::sync::Lazy; use tokio::{ sync::Semaphore, task::{self, JoinError}, @@ -8,9 +10,10 @@ use tokio::{ use crate::conf; -pub static PENDING_TASKS: Lazy = Lazy::new(|| AtomicU64::new(0)); +pub static PENDING_TASKS: LazyLock = LazyLock::new(|| AtomicU64::new(0)); -static RUNNERS: Lazy = Lazy::new(|| Semaphore::new(conf::CONFIG.thread_counts.runner)); +static RUNNERS: LazyLock = + LazyLock::new(|| Semaphore::new(conf::CONFIG.thread_counts.runner)); pub async fn spawn_blocking(f: F) -> Result where diff --git a/crates/seele-worker/Cargo.toml b/crates/seele-worker/Cargo.toml new file mode 100644 index 0000000..6c40dba --- /dev/null +++ b/crates/seele-worker/Cargo.toml @@ -0,0 +1,34 @@ +[package] +edition.workspace = true +name = "seele_worker" +version.workspace = true + +[dependencies] +anyhow = { workspace = true } +base64 = { workspace = true } +bytes = { workspace = true } +chrono = { workspace = true } +duct = { workspace = true } +futures-util = { workspace = true } +http-cache = { workspace = true } +http-cache-reqwest = { workspace = true } +moka = { workspace = true } +nano-id = { workspace = true } +nix = { workspace = true } +reqwest = { workspace = true } +reqwest-middleware = { workspace = true } +rkyv = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +sha2 = { workspace = true } +thread_local = { workspace = true } +tokio = { workspace = true } +tokio-graceful-shutdown = { workspace = true } +tracing = { workspace = true } +triggered = { workspace = true } + +# local dependencies + +seele_cgroup = { workspace = true } +seele_config = { workspace = true } +seele_shared = { workspace = true } diff --git a/src/worker/action/add_file/mod.rs b/crates/seele-worker/src/action/add_file.rs similarity index 92% rename from src/worker/action/add_file/mod.rs rename to crates/seele-worker/src/action/add_file.rs index cdb8ba0..173dfc1 100644 --- a/src/worker/action/add_file/mod.rs +++ b/crates/seele-worker/src/action/add_file.rs @@ -1,13 +1,13 @@ use std::{ path::{Path, PathBuf}, - sync::Arc, + sync::{Arc, LazyLock}, }; -use anyhow::{bail, Context, Result}; +use anyhow::{Context, Result, bail}; use bytes::Bytes; -use futures_util::{future, Stream, StreamExt}; +use futures_util::{Stream, StreamExt, future}; use http_cache::HttpCacheOptions; -use once_cell::sync::Lazy; +use seele_shared::entities::add_file::*; use tokio::{ fs::File, io::{self, AsyncWriteExt}, @@ -16,7 +16,6 @@ use tokio::{ use tracing::{info, instrument}; use triggered::Listener; -pub use self::entities::*; use super::ActionContext; use crate::{ conf, @@ -24,8 +23,6 @@ use crate::{ shared, }; -mod entities; - #[instrument(skip_all, name = "action_add_file_execute")] pub async fn execute( handle: Listener, @@ -92,7 +89,7 @@ async fn handle_local_path(mut file: File, path: &Path) -> Result<()> { Ok(()) } -static HTTP_CLIENT: Lazy = Lazy::new(|| { +static HTTP_CLIENT: LazyLock = LazyLock::new(|| { use std::time::Duration; use http_cache::MokaManager; @@ -203,11 +200,13 @@ mod tests { let file = File::create(PATH).await.unwrap(); let (_trigger, listener) = triggered::trigger(); - super::handle_http_url(listener, file, &"https://reqbin.com/echo/get/json".to_string()) - .await - .unwrap(); + super::handle_http_url(listener, file, "https://httpbin.io/user-agent").await.unwrap(); - assert_eq!(fs::read_to_string(PATH).await.unwrap(), "{\"success\":\"true\"}\n"); + let ua = &super::conf::CONFIG.http.user_agent; + assert_eq!( + fs::read_to_string(PATH).await.unwrap(), + format!("{{\n \"user-agent\": \"{}\"\n}}\n", ua) + ); fs::remove_file(PATH).await.unwrap(); } diff --git a/src/worker/action/mod.rs b/crates/seele-worker/src/action/mod.rs similarity index 100% rename from src/worker/action/mod.rs rename to crates/seele-worker/src/action/mod.rs diff --git a/src/worker/action/noop/mod.rs b/crates/seele-worker/src/action/noop.rs similarity index 52% rename from src/worker/action/noop/mod.rs rename to crates/seele-worker/src/action/noop.rs index 9cc00d8..0eb6c9a 100644 --- a/src/worker/action/noop/mod.rs +++ b/crates/seele-worker/src/action/noop.rs @@ -1,5 +1,5 @@ use anyhow::Result; -use serde::{Deserialize, Serialize}; +use seele_shared::entities::noop::*; use crate::entities::{ActionReportExt, ActionSuccessReportExt}; @@ -8,14 +8,3 @@ pub async fn execute(config: &Config) -> Result { test: config.test, }))) } - -#[derive(Debug, Clone, Deserialize, Serialize)] -pub struct Config { - #[serde(default)] - pub test: u64, -} - -#[derive(Debug, Clone, Deserialize, Serialize)] -pub struct ExecutionReport { - pub test: u64, -} diff --git a/src/worker/action/run_container/cache.rs b/crates/seele-worker/src/action/run_container/cache.rs similarity index 64% rename from src/worker/action/run_container/cache.rs rename to crates/seele-worker/src/action/run_container/cache.rs index f15ad59..ebdbaab 100644 --- a/src/worker/action/run_container/cache.rs +++ b/crates/seele-worker/src/action/run_container/cache.rs @@ -1,12 +1,14 @@ -use std::{sync::Arc, time::Duration}; +use std::{ + sync::{Arc, LazyLock}, + time::Duration, +}; use moka::sync::Cache; -use once_cell::sync::Lazy; use crate::conf; #[allow(clippy::type_complexity)] -static CACHE: Lazy, Arc<[u8]>>> = Lazy::new(|| { +static CACHE: LazyLock, Arc<[u8]>>> = LazyLock::new(|| { let config = &conf::CONFIG.worker.action.run_container; Cache::builder() .name("seele-run-container") @@ -16,14 +18,14 @@ static CACHE: Lazy, Arc<[u8]>>> = Lazy::new(|| { .build() }); -pub async fn init() { - _ = *CACHE; +pub fn init() { + LazyLock::force(&CACHE); } -pub async fn get(key: &[u8]) -> Option> { +pub fn get(key: &[u8]) -> Option> { CACHE.get(key) } -pub async fn write(key: Box<[u8]>, value: Arc<[u8]>) { +pub fn write(key: Box<[u8]>, value: Arc<[u8]>) { CACHE.insert(key, value) } diff --git a/src/worker/action/run_container/idmap.rs b/crates/seele-worker/src/action/run_container/idmap.rs similarity index 86% rename from src/worker/action/run_container/idmap.rs rename to crates/seele-worker/src/action/run_container/idmap.rs index 7914c3b..5afeaba 100644 --- a/src/worker/action/run_container/idmap.rs +++ b/crates/seele-worker/src/action/run_container/idmap.rs @@ -1,10 +1,10 @@ use std::{ fs::File, io::{BufRead, BufReader}, + sync::LazyLock, }; -use anyhow::{bail, Context, Result}; -use once_cell::sync::Lazy; +use anyhow::{Context, Result, bail}; use crate::conf; @@ -16,16 +16,16 @@ pub struct SubIds { pub count: u32, } -pub static SUBUIDS: Lazy = - Lazy::new(|| get_subids(SUBUID_PATH).expect("Error getting subuids")); +pub static SUBUIDS: LazyLock = + LazyLock::new(|| get_subids(SUBUID_PATH).expect("Error getting subuids")); -pub static SUBGIDS: Lazy = - Lazy::new(|| get_subids(SUBGID_PATH).expect("Error getting subgids")); +pub static SUBGIDS: LazyLock = + LazyLock::new(|| get_subids(SUBGID_PATH).expect("Error getting subgids")); fn get_subids(path: &str) -> Result { let username = &conf::CONFIG.worker.action.run_container.userns_user; let reader = BufReader::new(File::open(path)?); - get_subids_impl(username, reader.lines().flatten()) + get_subids_impl(username, reader.lines().map_while(Result::ok)) .with_context(|| format!("Error getting subids from {path}")) } diff --git a/src/worker/action/run_container/image.rs b/crates/seele-worker/src/action/run_container/image.rs similarity index 94% rename from src/worker/action/run_container/image.rs rename to crates/seele-worker/src/action/run_container/image.rs index 26e8526..c99e6a4 100644 --- a/src/worker/action/run_container/image.rs +++ b/crates/seele-worker/src/action/run_container/image.rs @@ -1,30 +1,35 @@ use std::{ - fs::Permissions, os::unix::prelude::PermissionsExt, path::PathBuf, sync::Arc, time::Duration, + fs::Permissions, + os::unix::prelude::PermissionsExt, + path::PathBuf, + sync::{Arc, LazyLock}, + time::Duration, }; -use anyhow::{bail, Context, Result}; -use duct::{cmd, Handle}; +use anyhow::{Context, Result, bail}; +use duct::{Handle, cmd}; use futures_util::FutureExt; use nix::{ sys::signal::{self, Signal}, unistd::Pid, }; -use once_cell::sync::Lazy; +use seele_config::OciImage; use tokio::{ fs::{self, create_dir_all, metadata, remove_dir_all}, sync::oneshot, time::sleep, }; -use tracing::{debug, error, info, instrument, warn, Span}; +use tracing::{Span, debug, error, info, instrument, warn}; use triggered::Listener; use crate::{ conf, - shared::{self, cond::CondGroup, image::OciImage, runner}, + shared::{self, cond::CondGroup, runner}, }; -static PREPARATION_TASKS: Lazy>> = - Lazy::new(|| CondGroup::new(|payload: &OciImage| prepare_image_impl(payload.clone()).boxed())); +static PREPARATION_TASKS: LazyLock>> = LazyLock::new(|| { + CondGroup::new(|payload: &OciImage| prepare_image_impl(payload.clone()).boxed()) +}); pub async fn prepare_image(abort: Listener, image: OciImage) -> Result<()> { match PREPARATION_TASKS.run(image, abort).await { diff --git a/src/worker/action/run_container/mod.rs b/crates/seele-worker/src/action/run_container/mod.rs similarity index 88% rename from src/worker/action/run_container/mod.rs rename to crates/seele-worker/src/action/run_container/mod.rs index 3edaf42..27e3775 100644 --- a/src/worker/action/run_container/mod.rs +++ b/crates/seele-worker/src/action/run_container/mod.rs @@ -1,39 +1,39 @@ -use std::{io::Read, sync::Arc}; +use std::{ + io::Read, + sync::{Arc, LazyLock}, +}; -use anyhow::{bail, Context, Result}; +use anyhow::{Context, Result, bail}; use duct::cmd; use nix::{ sys::signal::{self, Signal}, unistd::Pid, }; -use once_cell::sync::Lazy; +use seele_shared::entities::run_container::{ + Config, + runj::{ContainerExecutionReport, ContainerExecutionStatus, RunjConfig}, +}; use thread_local::ThreadLocal; use tokio::sync::oneshot; -use tracing::{info, info_span, warn, Span}; +use tracing::{Span, info, info_span, warn}; use triggered::Listener; -pub use self::{entities::*, idmap::*, image::prepare_image}; -use self::{ - runj::ContainerExecutionStatus, - utils::{check_and_create_directories, cleanup_overlayfs, make_runj_config}, -}; +use self::utils::{check_and_create_directories, cleanup_overlayfs, make_runj_config}; +pub use self::{idmap::*, image::prepare_image}; use super::ActionContext; use crate::{ cgroup, conf, entities::{ActionFailureReportExt, ActionReportExt, ActionSuccessReportExt}, - shared::{runner, ABORTED_MESSAGE}, - worker::run_container::runj::{ContainerExecutionReport, RunjConfig}, + shared::runner, }; pub mod cache; -mod entities; mod idmap; mod image; pub mod run_judge; -mod runj; mod utils; -static RUNNER_THREAD_LOCAL: Lazy>> = Lazy::new(Arc::default); +static RUNNER_THREAD_LOCAL: LazyLock>> = LazyLock::new(Arc::default); pub async fn execute( abort: Listener, @@ -129,7 +129,7 @@ fn execute_runj( _ = cancel_tx.send(()); if abort.is_triggered() { - bail!(ABORTED_MESSAGE); + bail!(crate::shared::ABORTED_MESSAGE); } match result { diff --git a/src/worker/action/run_container/run_judge/compile.rs b/crates/seele-worker/src/action/run_container/run_judge/compile.rs similarity index 77% rename from src/worker/action/run_container/run_judge/compile.rs rename to crates/seele-worker/src/action/run_container/run_judge/compile.rs index f9b8463..bbcaeb8 100644 --- a/src/worker/action/run_container/run_judge/compile.rs +++ b/crates/seele-worker/src/action/run_container/run_judge/compile.rs @@ -2,8 +2,15 @@ use std::{ collections::HashMap, fs::Permissions, os::unix::prelude::PermissionsExt, path::Path, sync::Arc, }; -use anyhow::{bail, Context, Result}; -use serde::{Deserialize, Serialize}; +use anyhow::{Context, Result, bail}; +use seele_shared::entities::{ + ActionReportExt, ActionSuccessReportExt, + run_container::{ + self, + run_judge::compile::{Config, ExecutionReport}, + runj, + }, +}; use sha2::{Digest, Sha256}; use tokio::{ fs, @@ -14,67 +21,11 @@ use tokio::{ use tracing::{error, info, instrument, warn}; use triggered::Listener; -use super::{MountFile, DEFAULT_MOUNT_DIRECTORY}; -use crate::{ - conf, - entities::{ActionReportExt, ActionSuccessReportExt}, - worker::{ - action::run_container::cache, - run_container::{self, runj}, - ActionContext, - }, -}; - -#[derive(Debug, Clone, Deserialize, Serialize)] -pub struct Config { - #[serde(flatten)] - pub run_container_config: run_container::Config, - - #[serde(default)] - pub sources: Vec, - - #[serde(default)] - pub saves: Vec, - - #[serde(default)] - pub cache: CacheConfig, -} - -#[derive(Debug, Clone, Deserialize, Serialize)] -pub struct CacheConfig { - pub enabled: bool, - - #[serde(default = "default_max_allowed_size_mib")] - pub max_allowed_size_mib: u64, - - #[serde(default)] - pub extra: Vec, -} - -impl Default for CacheConfig { - fn default() -> Self { - Self { - enabled: false, - max_allowed_size_mib: default_max_allowed_size_mib(), - extra: Default::default(), - } - } -} - -#[inline] -fn default_max_allowed_size_mib() -> u64 { - conf::CONFIG.worker.action.run_container.cache_size_mib / 16 -} +use super::DEFAULT_MOUNT_DIRECTORY; +use crate::{ActionContext, run_container::cache}; type CacheData = HashMap>; -#[derive(Debug, Clone, Deserialize, Serialize)] -#[serde(untagged)] -pub enum ExecutionReport { - CacheHit { cache_hit: bool }, - CacheMiss(run_container::ExecutionReport), -} - #[instrument(skip_all, name = "action_run_judge_compile_execute")] pub async fn execute( handle: Listener, @@ -87,14 +38,13 @@ pub async fn execute( }; if let Some(hash) = &hash { - match cache::get(hash.as_ref()).await { + match cache::get(hash.as_ref()) { None => { info!("Compilation cache miss"); } Some(data) => { - let data: CacheData = spawn_blocking(move || { - bincode::decode_from_slice(&data, bincode::config::standard()) - .map(|(data, _)| data) + let data = spawn_blocking(move || { + rkyv::from_bytes::(&data) }) .await? .context("Error deserializing the data")?; @@ -114,6 +64,7 @@ pub async fn execute( let mut writer = BufWriter::new( OpenOptions::new() .create(true) + .truncate(true) .write(true) .mode(0o755) .open(&target) @@ -135,7 +86,7 @@ pub async fn execute( } } - let mount_directory = conf::PATHS.new_temp_directory().await?; + let mount_directory = crate::conf::PATHS.new_temp_directory().await?; // XXX: 0o777 is mandatory. The group bit is for rootless case and the others // bit is for rootful case. fs::set_permissions(&mount_directory, Permissions::from_mode(0o777)).await?; @@ -166,7 +117,7 @@ pub async fn execute( run_container_config }; - let report = run_container::execute(handle, ctx, &run_container_config).await?; + let report = crate::run_container::execute(handle, ctx, &run_container_config).await?; if matches!(report, ActionReportExt::Success(_)) { let mut cache_data: CacheData = Default::default(); @@ -205,11 +156,10 @@ pub async fn execute( if let Some(hash) = hash { if !cache_data.is_empty() { - let data = spawn_blocking(move || { - bincode::encode_to_vec(cache_data, bincode::config::standard()) - }) - .await??; - cache::write(hash, Arc::from(data.into_boxed_slice())).await; + let data = + spawn_blocking(move || rkyv::to_bytes::(&cache_data)) + .await??; + cache::write(hash, Arc::from(data.into_boxed_slice())); } } } @@ -232,7 +182,7 @@ async fn calculate_hash(submission_root: &Path, config: &Config) -> Result Result = Lazy::new(|| Path::new("/seele")); +static DEFAULT_MOUNT_DIRECTORY: LazyLock<&'static Path> = LazyLock::new(|| Path::new("/seele")); #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)] pub struct MountFile { diff --git a/src/worker/action/run_container/run_judge/run.rs b/crates/seele-worker/src/action/run_container/run_judge/run.rs similarity index 79% rename from src/worker/action/run_container/run_judge/run.rs rename to crates/seele-worker/src/action/run_container/run_judge/run.rs index b73d5b9..2440d1a 100644 --- a/src/worker/action/run_container/run_judge/run.rs +++ b/crates/seele-worker/src/action/run_container/run_judge/run.rs @@ -1,29 +1,16 @@ use std::{fs::Permissions, os::unix::prelude::PermissionsExt}; -use anyhow::{bail, Context, Result}; -use serde::{Deserialize, Serialize}; +use anyhow::{Context, Result, bail}; +use seele_shared::entities::{ + ActionReportExt, + run_container::{self, run_judge::run::Config, runj}, +}; use tokio::fs; use tracing::{instrument, warn}; use triggered::Listener; -use super::{MountFile, DEFAULT_MOUNT_DIRECTORY}; -use crate::{ - conf, - entities::ActionReportExt, - worker::{ - run_container::{self, runj}, - ActionContext, - }, -}; - -#[derive(Debug, Clone, Deserialize, Serialize)] -pub struct Config { - #[serde(flatten)] - pub run_container_config: run_container::Config, - - #[serde(default)] - pub files: Vec, -} +use super::DEFAULT_MOUNT_DIRECTORY; +use crate::ActionContext; #[instrument(skip_all, name = "action_run_judge_run_execute")] pub async fn execute( @@ -31,7 +18,7 @@ pub async fn execute( ctx: &ActionContext, config: &Config, ) -> Result { - let mount_directory = conf::PATHS.new_temp_directory().await?; + let mount_directory = crate::conf::PATHS.new_temp_directory().await?; // XXX: 0o777 is mandatory. The group bit is for rootless case and the others // bit is for rootful case. fs::set_permissions(&mount_directory, Permissions::from_mode(0o777)).await?; @@ -77,7 +64,7 @@ pub async fn execute( })); } - run_container::execute(handle, ctx, &run_container_config).await + crate::run_container::execute(handle, ctx, &run_container_config).await } .await; diff --git a/src/worker/action/run_container/utils.rs b/crates/seele-worker/src/action/run_container/utils.rs similarity index 95% rename from src/worker/action/run_container/utils.rs rename to crates/seele-worker/src/action/run_container/utils.rs index dd08e73..cb7e711 100644 --- a/src/worker/action/run_container/utils.rs +++ b/crates/seele-worker/src/action/run_container/utils.rs @@ -2,21 +2,18 @@ use std::{fs::Permissions, os::unix::prelude::PermissionsExt}; use anyhow::{Context, Result}; use nix::mount; +use seele_shared::entities::run_container::runj::{OverlayfsConfig, RunjConfig}; use tokio::fs; -use super::{ - idmap, image, - runj::{self, OverlayfsConfig}, - Config, -}; +use super::{idmap, image}; use crate::{ - cgroup, + ActionContext, cgroup, conf::{self, SeeleWorkMode}, + entities::run_container::*, shared, - worker::ActionContext, }; -pub async fn make_runj_config(ctx: &ActionContext, config: Config) -> Result { +pub async fn make_runj_config(ctx: &ActionContext, config: Config) -> Result { let user_namespace = { match &conf::CONFIG.work_mode { SeeleWorkMode::Bare | SeeleWorkMode::BareSystemd | SeeleWorkMode::Containerized => { diff --git a/src/worker/mod.rs b/crates/seele-worker/src/lib.rs similarity index 92% rename from src/worker/mod.rs rename to crates/seele-worker/src/lib.rs index 4c574df..d977de7 100644 --- a/src/worker/mod.rs +++ b/crates/seele-worker/src/lib.rs @@ -1,8 +1,16 @@ use std::{path::PathBuf, sync::Arc}; -use anyhow::{bail, Result}; +use anyhow::{Result, bail}; use chrono::Utc; -use futures_util::{future, TryFutureExt}; +use futures_util::{TryFutureExt, future}; +use seele_cgroup as cgroup; +use seele_config as conf; +use seele_shared::{ + self as shared, entities, + entities::{ + ActionFailedReport, ActionReport, ActionReportExt, ActionSuccessReport, ActionTaskConfig, + }, +}; use tokio::{ sync::{mpsc, oneshot}, time::Instant, @@ -12,7 +20,6 @@ use tracing::*; use triggered::Listener; pub use self::action::*; -use crate::{conf, entities::*}; pub mod action; @@ -29,7 +36,7 @@ pub type WorkerQueueTx = mpsc::Sender; pub type WorkerQueueRx = mpsc::Receiver; pub async fn worker_bootstrap(handle: SubsystemHandle, tx: oneshot::Sender) -> Result<()> { - action::run_container::cache::init().await; + action::run_container::cache::init(); let preload_images = &conf::CONFIG.worker.action.run_container.preload_images; if preload_images.is_empty() { diff --git a/crates/seele/Cargo.toml b/crates/seele/Cargo.toml new file mode 100644 index 0000000..d227efb --- /dev/null +++ b/crates/seele/Cargo.toml @@ -0,0 +1,26 @@ +[package] +edition.workspace = true +name = "seele" +version.workspace = true + +[dependencies] +anyhow = { workspace = true } +axum = { workspace = true } +num_cpus = { workspace = true } +opentelemetry = { workspace = true } +opentelemetry-otlp = { workspace = true } +opentelemetry_sdk = { workspace = true } +tokio = { workspace = true } +tokio-graceful-shutdown = { workspace = true } +tracing = { workspace = true } +tracing-opentelemetry = { workspace = true } +tracing-subscriber = { workspace = true } + +# local dependencies + +seele_cgroup = { workspace = true } +seele_composer = { workspace = true } +seele_config = { workspace = true } +seele_exchange = { workspace = true } +seele_shared = { workspace = true } +seele_worker = { workspace = true } diff --git a/crates/seele/src/cgroup.rs b/crates/seele/src/cgroup.rs new file mode 100644 index 0000000..30e0933 --- /dev/null +++ b/crates/seele/src/cgroup.rs @@ -0,0 +1,37 @@ +use std::sync::{Arc, Barrier}; + +use anyhow::{Context, Result}; +use seele_cgroup as cgroup; +use tokio::task::spawn_blocking; + +use crate::conf; + +pub async fn setup_cgroup() -> Result<()> { + spawn_blocking(|| -> Result<()> { + cgroup::check_cgroup_setup().context("Error checking cgroup setup")?; + cgroup::initialize_cgroup_subtrees().context("Error initializing cgroup subtrees") + }) + .await??; + + let count = conf::CONFIG.thread_counts.worker + conf::CONFIG.thread_counts.runner; + let begin_barrier = Arc::new(Barrier::new(count)); + let end_barrier = Arc::new(Barrier::new(count)); + + for _ in 0..(count - 1) { + let begin_barrier = begin_barrier.clone(); + let end_barrier = end_barrier.clone(); + spawn_blocking(move || { + begin_barrier.wait(); + end_barrier.wait(); + }); + } + + spawn_blocking(move || { + begin_barrier.wait(); + let result = cgroup::bind_application_threads(); + end_barrier.wait(); + result + }) + .await? + .context("Error binding application threads") +} diff --git a/crates/seele/src/healthz.rs b/crates/seele/src/healthz.rs new file mode 100644 index 0000000..dadd756 --- /dev/null +++ b/crates/seele/src/healthz.rs @@ -0,0 +1,43 @@ +use std::net::SocketAddr; + +use anyhow::Result; +use axum::{Router, http::StatusCode, response::IntoResponse, routing::any}; +use tokio::net::TcpListener; +use tokio_graceful_shutdown::SubsystemHandle; +use tracing::info; + +use crate::{conf, exchange}; + +pub async fn healthz_main(handle: SubsystemHandle) -> Result<()> { + if !conf::CONFIG.healthz.enabled { + info!("Healthz is disabled"); + return Ok(()); + } + + let app = Router::new().route("/", any(healthz_handler)); + + let addr = SocketAddr::from(([0, 0, 0, 0], conf::CONFIG.healthz.port)); + let listener = TcpListener::bind(addr).await?; + + info!("Running healthz endpoint at port: {}", conf::CONFIG.healthz.port); + + axum::serve(listener, app) + .with_graceful_shutdown(async move { + handle.on_shutdown_requested().await; + }) + .await?; + + Ok(()) +} + +async fn healthz_handler() -> impl IntoResponse { + if check_healthz().await { + (StatusCode::OK, "ok") + } else { + (StatusCode::INTERNAL_SERVER_ERROR, "error") + } +} + +async fn check_healthz() -> bool { + exchange::is_amqp_healthy().await +} diff --git a/crates/seele/src/main.rs b/crates/seele/src/main.rs new file mode 100644 index 0000000..a51a532 --- /dev/null +++ b/crates/seele/src/main.rs @@ -0,0 +1,166 @@ +#![allow(dead_code)] + +use std::{fs::create_dir_all, time::Duration}; + +use anyhow::{Context, Result, bail}; +use opentelemetry::global; +use seele_composer as composer; +use seele_config as conf; +use seele_exchange as exchange; +use seele_shared as shared; +use seele_worker as worker; +use tokio::{ + runtime, + sync::{mpsc, oneshot}, + task::spawn_blocking, + time::sleep, +}; +use tokio_graceful_shutdown::{ + SubsystemBuilder, SubsystemHandle, Toplevel, errors::SubsystemError, +}; +use tracing::*; + +use crate::{conf::SeeleWorkMode, worker::action}; + +mod cgroup; +mod healthz; +mod telemetry; + +fn main() { + let runtime = runtime::Builder::new_current_thread() + .max_blocking_threads(conf::CONFIG.thread_counts.worker + conf::CONFIG.thread_counts.runner) + .thread_keep_alive(Duration::from_secs(u64::MAX)) + .enable_all() + .build() + .expect("Error building tokio runtime"); + + runtime + .block_on(async move { + telemetry::setup_telemetry().await?; + + cgroup::setup_cgroup().await?; + + spawn_blocking(check_env).await??; + + let result = Toplevel::new(move |s| async move { + s.start(SubsystemBuilder::new("seele", seele)); + }) + .catch_signals() + .handle_shutdown_requests(Duration::from_secs(10)) + .await; + + if let Err(err) = result { + error!("Seele encountered fatal issue(s):"); + for error in err.get_subsystem_errors() { + match error { + SubsystemError::Failed(name, err) => { + error!("Subsystem '{}' failed: {:?}", name, err); + } + SubsystemError::Panicked(name) => { + error!("Subsystem '{}' panicked", name); + } + } + } + } + + if conf::CONFIG.telemetry.is_some() { + spawn_blocking(|| { + global::shutdown_tracer_provider(); + shared::metrics::METRICS_PROVIDER.get().unwrap().shutdown().ok(); + }) + .await + .ok(); + } + + sleep(Duration::from_secs(3)).await; + + anyhow::Ok(()) + }) + .unwrap(); +} + +async fn seele(handle: SubsystemHandle) -> Result<()> { + let (tx, rx) = oneshot::channel(); + + info!("Worker started bootstrap"); + + handle.start(SubsystemBuilder::new("bootstrap", |handle| worker::worker_bootstrap(handle, tx))); + + if !rx.await? { + handle.on_shutdown_requested().await; + return anyhow::Ok(()); + } + + info!("Initializing seele components"); + + let (composer_queue_tx, composer_queue_rx) = mpsc::channel(conf::CONFIG.thread_counts.runner); + let (worker_queue_tx, worker_queue_rx) = mpsc::channel(conf::CONFIG.thread_counts.runner * 4); + + handle.start(SubsystemBuilder::new("healthz", healthz::healthz_main)); + + handle.start(SubsystemBuilder::new("exchange", |handle| { + exchange::exchange_main(handle, composer_queue_tx) + })); + + handle.start(SubsystemBuilder::new("composer", |handle| { + composer::composer_main(handle, composer_queue_rx, worker_queue_tx) + })); + + handle.start(SubsystemBuilder::new("worker", |handle| { + worker::worker_main(handle, worker_queue_rx) + })); + + handle.on_shutdown_requested().await; + anyhow::Ok(()) +} + +fn check_env() -> Result<()> { + debug!("Checking cpu counts"); + let logical_cpu_count = num_cpus::get(); + let physical_cpu_count = num_cpus::get_physical(); + + info!("CPU counts: {}/{} (logical/physical)", logical_cpu_count, physical_cpu_count); + + if physical_cpu_count < logical_cpu_count { + // TODO: Add link to document + warn!( + "Seele does not recommend enabling the cpu's SMT technology, current logical cpu \ + count: {}, physical cpu count: {}", + logical_cpu_count, physical_cpu_count + ) + } + + if !matches!(&conf::CONFIG.work_mode, SeeleWorkMode::RootlessContainerized) { + debug!("Checking id maps"); + if action::run_container::SUBUIDS.count < 65536 { + bail!( + "The user specified in the run_container namespace config has not enough subuid \ + mapping range" + ); + } + if action::run_container::SUBGIDS.count < 65536 { + bail!( + "The group specified in the run_container namespace config has not enough subgid \ + mapping range" + ); + } + + info!( + "User namespace subuid mapping range: {}-{}, subgid mapping range: {}-{}", + action::run_container::SUBUIDS.begin, + action::run_container::SUBUIDS.begin + action::run_container::SUBUIDS.count, + action::run_container::SUBGIDS.begin, + action::run_container::SUBGIDS.begin + action::run_container::SUBGIDS.count + ); + } + + info!("Creating necessary directories in {}", conf::PATHS.root.display()); + for path in [&conf::PATHS.images, &conf::PATHS.submissions, &conf::PATHS.temp] { + create_dir_all(path) + .with_context(|| format!("Error creating the directory: {}", path.display()))?; + } + + info!("Registering metrics"); + + Ok(()) +} diff --git a/crates/seele/src/telemetry.rs b/crates/seele/src/telemetry.rs new file mode 100644 index 0000000..de3615f --- /dev/null +++ b/crates/seele/src/telemetry.rs @@ -0,0 +1,83 @@ +use std::time::Duration; + +use anyhow::{Context, Result}; +use opentelemetry::trace::TracerProvider as _; +use opentelemetry_otlp::{ExportConfig, MetricExporter, Protocol, SpanExporter, WithExportConfig}; +use opentelemetry_sdk::{ + metrics::{PeriodicReader, SdkMeterProvider, Temporality}, + trace::TracerProvider, +}; +use tracing::*; +use tracing_subscriber::{Layer, filter::LevelFilter, prelude::*}; + +use crate::{conf, shared}; + +pub async fn setup_telemetry() -> Result<()> { + if conf::CONFIG.telemetry.is_none() { + tracing::subscriber::set_global_default( + tracing_subscriber::fmt() + .compact() + .with_line_number(true) + .with_max_level(conf::CONFIG.log_level) + .finish(), + ) + .context("Failed to initialize the tracing subscriber")?; + } + + let telemetry = conf::CONFIG.telemetry.as_ref().unwrap(); + + info!("Initializing telemetry"); + + let span_exporter = SpanExporter::builder() + .with_tonic() + .with_export_config(ExportConfig { + endpoint: Some(telemetry.collector_url.clone()), + timeout: Duration::from_secs(5), + protocol: Protocol::Grpc, + }) + .build() + .context("Failed to initialize the tracer")?; + + let tracer_provider = TracerProvider::builder() + .with_batch_exporter(span_exporter, opentelemetry_sdk::runtime::Tokio) + .with_resource(shared::metrics::METRICS_RESOURCE.clone()) + .build(); + + let tracer = tracer_provider.tracer("seele"); + + let metric_exporter = MetricExporter::builder() + .with_temporality(Temporality::Cumulative) + .with_tonic() + .with_export_config(ExportConfig { + endpoint: Some(telemetry.collector_url.clone()), + timeout: Duration::from_secs(5), + protocol: Protocol::Grpc, + }) + .build() + .context("Failed to initialize the metrics")?; + + let metrics = SdkMeterProvider::builder() + .with_reader( + PeriodicReader::builder(metric_exporter, opentelemetry_sdk::runtime::Tokio) + .with_interval(Duration::from_secs(3)) + .build(), + ) + .with_resource(shared::metrics::METRICS_RESOURCE.clone()) + .build(); + + shared::metrics::METRICS_PROVIDER.set(metrics).ok(); + + tracing::subscriber::set_global_default( + tracing_subscriber::registry() + .with( + tracing_subscriber::fmt::layer() + .compact() + .with_line_number(true) + .with_filter::(conf::CONFIG.log_level.into()), + ) + .with( + tracing_opentelemetry::layer().with_tracer(tracer).with_filter(LevelFilter::INFO), + ), + ) + .context("Failed to initialize the tracing subscriber") +} diff --git a/runj/go.mod b/runj/go.mod index 67a9cf8..0357465 100644 --- a/runj/go.mod +++ b/runj/go.mod @@ -1,29 +1,31 @@ module github.com/darkyzhou/seele/runj -go 1.23.2 +go 1.23.4 require ( github.com/coreos/go-systemd/v22 v22.5.0 - github.com/cyphar/filepath-securejoin v0.3.4 - github.com/go-playground/validator/v10 v10.22.1 + github.com/cyphar/filepath-securejoin v0.4.1 + github.com/go-playground/validator/v10 v10.24.0 github.com/godbus/dbus/v5 v5.1.0 github.com/matoous/go-nanoid/v2 v2.1.0 github.com/mitchellh/mapstructure v1.5.0 + + // can not upgrade to runc v1.2+ as LinuxFactory is removed + // https://github.com/opencontainers/runc/commit/6a3fe1618f5166e5c44f21714736049bac9c02cb github.com/opencontainers/runc v1.1.15 github.com/opencontainers/runtime-spec v1.2.0 - github.com/samber/lo v1.47.0 + github.com/samber/lo v1.49.1 github.com/sirupsen/logrus v1.9.3 - golang.org/x/sys v0.26.0 + golang.org/x/sys v0.29.0 ) require ( github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect github.com/cilium/ebpf v0.12.3 // indirect github.com/containerd/console v1.0.4 // indirect - github.com/gabriel-vasile/mimetype v1.4.6 // indirect + github.com/gabriel-vasile/mimetype v1.4.8 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/google/go-cmp v0.6.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/moby/sys/mountinfo v0.7.2 // indirect github.com/mrunalp/fileutils v0.5.1 // indirect @@ -31,10 +33,10 @@ require ( github.com/seccomp/libseccomp-golang v0.10.0 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect github.com/vishvananda/netlink v1.3.0 // indirect - github.com/vishvananda/netns v0.0.4 // indirect - golang.org/x/crypto v0.28.0 // indirect + github.com/vishvananda/netns v0.0.5 // indirect + golang.org/x/crypto v0.32.0 // indirect golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect - golang.org/x/net v0.30.0 // indirect - golang.org/x/text v0.19.0 // indirect - google.golang.org/protobuf v1.35.1 // indirect + golang.org/x/net v0.34.0 // indirect + golang.org/x/text v0.21.0 // indirect + google.golang.org/protobuf v1.36.4 // indirect ) diff --git a/runj/go.sum b/runj/go.sum index 7d2c42b..b1bdb83 100644 --- a/runj/go.sum +++ b/runj/go.sum @@ -6,30 +6,30 @@ github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cyphar/filepath-securejoin v0.3.4 h1:VBWugsJh2ZxJmLFSM06/0qzQyiQX2Qs0ViKrUAcqdZ8= -github.com/cyphar/filepath-securejoin v0.3.4/go.mod h1:8s/MCNJREmFK0H02MF6Ihv1nakJe4L/w3WZLHNkvlYM= +github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s= +github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA= github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= -github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc= -github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc= +github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= +github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= -github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-playground/validator/v10 v10.24.0 h1:KHQckvo8G6hlWnrPX4NJJ+aBfWNAE/HH+qdL2cBpCmg= +github.com/go-playground/validator/v10 v10.24.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -54,42 +54,43 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc= -github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= +github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew= +github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o= github.com/seccomp/libseccomp-golang v0.10.0 h1:aA4bp+/Zzi0BnWZ2F1wgNBs5gTpm+na2rWM6M9YjLpY= github.com/seccomp/libseccomp-golang v0.10.0/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk= github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs= -github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8= github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= -golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= -golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= +github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY= +github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= +golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= +golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 h1:Jvc7gsqn21cJHCmAWx0LiimpP18LZmUxkT5Mp7EZ1mI= golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= -golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= -google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/runj/tests/go.mod b/runj/tests/go.mod new file mode 100644 index 0000000..463a6e0 --- /dev/null +++ b/runj/tests/go.mod @@ -0,0 +1 @@ + diff --git a/rustfmt.toml b/rustfmt.toml index 3668d06..e4c4747 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,6 +1,6 @@ # Format with "cargo +nightly fmt --all" -version = "Two" +style_edition = "2024" unstable_features = true newline_style = "Unix" diff --git a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_simple.yaml.snap b/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_simple.yaml.snap deleted file mode 100644 index 4dca58b..0000000 --- a/src/composer/tests/snapshots/seele__composer__execute__tests__execute_submission@submission_simple.yaml.snap +++ /dev/null @@ -1,19 +0,0 @@ ---- -source: src/composer/execute.rs -expression: results -input_file: src/composer/tests/submission_simple.yaml ---- -[ - Config( - action: "seele/noop@1", - test: 1, - ), - Config( - action: "seele/noop@1", - test: 2, - ), - Config( - action: "seele/noop@1", - test: 3, - ), -] diff --git a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_needs.yaml.snap b/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_needs.yaml.snap deleted file mode 100644 index 7f036ae..0000000 --- a/src/composer/tests/snapshots/seele__composer__resolve__tests__resolve_submission@submission_needs.yaml.snap +++ /dev/null @@ -1,55 +0,0 @@ ---- -source: src/composer/resolve.rs -expression: submission -input_file: src/composer/tests/submission_needs.yaml ---- -Submission( - id: "needs", - root_directory: "test", - config: SubmissionConfig( - id: "needs", - steps: { - "one": { - "tags": None, - "status": "PENDING", - }, - "two": { - "tags": None, - "status": "PENDING", - }, - "three": { - "tags": None, - "status": "PENDING", - }, - }, - ), - root_node: RootTaskNode( - tasks: [ - TaskNode( - name: ".one", - children: [ - TaskNode( - name: ".two", - children: [], - ext: Config( - action: "seele/noop@1", - test: 2, - ), - ), - TaskNode( - name: ".three", - children: [], - ext: Config( - action: "seele/noop@1", - test: 3, - ), - ), - ], - ext: Config( - action: "seele/noop@1", - test: 1, - ), - ), - ], - ), -) diff --git a/src/conf/env.rs b/src/conf/env.rs deleted file mode 100644 index 0a0c1dd..0000000 --- a/src/conf/env.rs +++ /dev/null @@ -1,19 +0,0 @@ -use std::env; - -use once_cell::sync::Lazy; - -pub static HOSTNAME: Lazy = Lazy::new(|| env::var("HOSTNAME").unwrap_or(get_hostname())); -pub static CONTAINER_NAME: Lazy> = Lazy::new(|| env::var("CONTAINER_NAME").ok()); -pub static CONTAINER_IMAGE_NAME: Lazy> = - Lazy::new(|| env::var("CONTAINER_IMAGE_NAME").ok()); - -pub static COMMIT_TAG: Lazy> = Lazy::new(|| option_env!("COMMIT_TAG")); -pub static COMMIT_SHA: Lazy> = Lazy::new(|| option_env!("COMMIT_SHA")); - -#[inline] -fn get_hostname() -> String { - nix::unistd::gethostname() - .expect("Failed to get hostname") - .into_string() - .expect("Error converting hostname from OsString") -} diff --git a/src/exchange/http.rs b/src/exchange/http.rs deleted file mode 100644 index c140db2..0000000 --- a/src/exchange/http.rs +++ /dev/null @@ -1,107 +0,0 @@ -use std::{convert::Infallible, net::SocketAddr, num::NonZeroUsize, time::Duration}; - -use anyhow::{bail, Result}; -use futures_util::StreamExt; -use hyper::{ - body::{self, HttpBody}, - service::{make_service_fn, service_fn}, - *, -}; -use ring_channel::ring_channel; -use tokio::time::sleep; -use tokio_graceful_shutdown::SubsystemHandle; -use tracing::{error, info}; - -use crate::{ - composer::{ComposerQueueItem, ComposerQueueTx, SubmissionSignal, SubmissionSignalExt}, - conf::HttpExchangeConfig, -}; - -pub async fn run( - name: &str, - handle: SubsystemHandle, - tx: ComposerQueueTx, - config: &HttpExchangeConfig, -) -> Result<()> { - info!("Starting http exchange {} on {}:{}", name, config.address, config.port); - - let service = make_service_fn(move |_| { - let tx = tx.clone(); - let body_size_limit_bytes = config.max_body_size_bytes; - async move { - Ok::<_, Infallible>(service_fn(move |request| { - let tx = tx.clone(); - async move { - Ok::<_, Infallible>( - match handle_submission_request(request, tx, body_size_limit_bytes).await { - Ok(response) => response, - Err(err) => Response::builder() - .status(StatusCode::INTERNAL_SERVER_ERROR) - .body(Body::from(format!("Internal error: {err:#}"))) - .unwrap(), - }, - ) - } - })) - } - }); - - Server::bind(&SocketAddr::from((config.address, config.port))) - .serve(service) - .with_graceful_shutdown(async move { - handle.on_shutdown_requested().await; - - info!("Http exchange is shutting down, waiting for unfinished submissions"); - sleep(Duration::from_secs(5)).await; - }) - .await?; - - Ok(()) -} - -async fn handle_submission_request( - request: Request, - tx: ComposerQueueTx, - body_size_limit_bytes: u64, -) -> Result> { - { - let body_size = request.body().size_hint().upper().unwrap_or(body_size_limit_bytes + 1); - if body_size > body_size_limit_bytes { - bail!("The size of the request body exceeds the limit: {}", body_size); - } - } - - let show_progress = matches!(request.uri().query(), Some(query) if query.contains("progress")); - let debug = matches!(request.uri().query(), Some(query) if query.contains("debug")); - let config_yaml = { - let body = body::to_bytes(request.into_body()).await?; - String::from_utf8(body.into())? - }; - let (status_tx, status_rx) = ring_channel(NonZeroUsize::try_from(1).unwrap()); - tx.send(ComposerQueueItem { config_yaml, status_tx }).await?; - - Ok(Response::new(Body::wrap_stream(status_rx.map(move |signal| { - type CallbackResult = Result; - - if !show_progress && matches!(signal.ext, SubmissionSignalExt::Progress { .. }) { - return CallbackResult::Ok("".to_string()); - } - - fn serialize(debug: bool, signal: &SubmissionSignal) -> String { - let result = if debug { - serde_json::to_string_pretty(signal) - } else { - serde_json::to_string(signal) - }; - match result { - Err(err) => { - error!("Error serializing the value: {:#}", err); - "".to_string() - } - Ok(json) => format!("{}\n", json), - } - } - - CallbackResult::Ok(serialize(debug, &signal)) - })))) -} diff --git a/src/healthz/mod.rs b/src/healthz/mod.rs deleted file mode 100644 index 8e55324..0000000 --- a/src/healthz/mod.rs +++ /dev/null @@ -1,41 +0,0 @@ -use std::{convert::Infallible, net::SocketAddr}; - -use anyhow::{Context, Result}; -use hyper::{ - service::{make_service_fn, service_fn}, - *, -}; -use tokio_graceful_shutdown::SubsystemHandle; -use tracing::info; - -use crate::{conf, exchange}; - -pub async fn healthz_main(handle: SubsystemHandle) -> Result<()> { - if !conf::CONFIG.healthz.enabled { - info!("Healthz is disabled"); - return Ok(()); - } - - let service = make_service_fn(move |_| async move { - Ok::<_, Infallible>(service_fn(move |_request| async move { - if check_healthz().await { - Response::builder().status(200).body("ok".to_string()) - } else { - Response::builder().status(500).body("error".to_string()) - } - })) - }); - - info!("Running healthz endpoint at port: {}", conf::CONFIG.healthz.port); - Server::bind(&SocketAddr::from(([0, 0, 0, 0], conf::CONFIG.healthz.port))) - .serve(service) - .with_graceful_shutdown(async move { - handle.on_shutdown_requested().await; - }) - .await - .context("Error in http server") -} - -async fn check_healthz() -> bool { - exchange::is_amqp_healthy().await -} diff --git a/src/main.rs b/src/main.rs deleted file mode 100644 index af98ce7..0000000 --- a/src/main.rs +++ /dev/null @@ -1,266 +0,0 @@ -#![allow(dead_code)] - -use std::{ - fs::create_dir_all, - sync::{Arc, Barrier}, - time::Duration, -}; - -use anyhow::{bail, Context, Result}; -use opentelemetry::{ - global, - sdk::{ - export::metrics::aggregation::cumulative_temporality_selector, metrics::selectors, trace, - }, - Context as OpenTelemetryCtx, -}; -use opentelemetry_otlp::{ExportConfig, Protocol, WithExportConfig}; -use tokio::{ - runtime, - sync::{mpsc, oneshot}, - task::spawn_blocking, - time::sleep, -}; -use tokio_graceful_shutdown::{ - errors::SubsystemError, SubsystemBuilder, SubsystemHandle, Toplevel, -}; -use tracing::{error, info, warn}; -use tracing_subscriber::{filter::LevelFilter, prelude::*, Layer}; - -use crate::{conf::SeeleWorkMode, shared::metrics::METRICS_RESOURCE, worker::action}; - -mod cgroup; -mod composer; -mod conf; -mod entities; -mod exchange; -mod healthz; -mod shared; -mod worker; - -fn main() { - let runtime = runtime::Builder::new_current_thread() - .max_blocking_threads(conf::CONFIG.thread_counts.worker + conf::CONFIG.thread_counts.runner) - .thread_keep_alive(Duration::from_secs(u64::MAX)) - .enable_all() - .build() - .expect("Error building tokio runtime"); - - runtime - .block_on(async move { - setup_cgroup().await?; - - setup_telemetry().await?; - - spawn_blocking(check_env).await??; - - let result = Toplevel::new(move |s| async move { - s.start(SubsystemBuilder::new("seele", seele)); - }) - .catch_signals() - .handle_shutdown_requests(Duration::from_secs(10)) - .await; - - if let Err(err) = result { - error!("Seele encountered fatal issue(s):"); - for error in err.get_subsystem_errors() { - match error { - SubsystemError::Failed(name, err) => { - error!("Subsystem '{}' failed: {:?}", name, err); - } - SubsystemError::Panicked(name) => { - error!("Subsystem '{}' panicked", name); - } - } - } - } - - if conf::CONFIG.telemetry.is_some() { - spawn_blocking(|| { - global::shutdown_tracer_provider(); - shared::metrics::METRICS_CONTROLLER - .get() - .unwrap() - .stop(&OpenTelemetryCtx::current()) - .ok(); - }) - .await - .ok(); - } - - sleep(Duration::from_secs(3)).await; - - anyhow::Ok(()) - }) - .unwrap(); -} - -async fn seele(handle: SubsystemHandle) -> Result<()> { - let (tx, rx) = oneshot::channel(); - - info!("Worker started bootstrap"); - - handle.start(SubsystemBuilder::new("bootstrap", |handle| worker::worker_bootstrap(handle, tx))); - - if !rx.await? { - handle.on_shutdown_requested().await; - return anyhow::Ok(()); - } - - info!("Initializing seele components"); - - let (composer_queue_tx, composer_queue_rx) = mpsc::channel(conf::CONFIG.thread_counts.runner); - let (worker_queue_tx, worker_queue_rx) = mpsc::channel(conf::CONFIG.thread_counts.runner * 4); - - handle.start(SubsystemBuilder::new("healthz", healthz::healthz_main)); - - handle.start(SubsystemBuilder::new("exchange", |handle| { - exchange::exchange_main(handle, composer_queue_tx) - })); - - handle.start(SubsystemBuilder::new("composer", |handle| { - composer::composer_main(handle, composer_queue_rx, worker_queue_tx) - })); - - handle.start(SubsystemBuilder::new("worker", |handle| { - worker::worker_main(handle, worker_queue_rx) - })); - - handle.on_shutdown_requested().await; - anyhow::Ok(()) -} - -async fn setup_cgroup() -> Result<()> { - spawn_blocking(|| -> Result<()> { - cgroup::check_cgroup_setup().context("Error checking cgroup setup")?; - cgroup::initialize_cgroup_subtrees().context("Error initializing cgroup subtrees") - }) - .await??; - - let count = conf::CONFIG.thread_counts.worker + conf::CONFIG.thread_counts.runner; - let begin_barrier = Arc::new(Barrier::new(count)); - let end_barrier = Arc::new(Barrier::new(count)); - - for _ in 0..(count - 1) { - let begin_barrier = begin_barrier.clone(); - let end_barrier = end_barrier.clone(); - spawn_blocking(move || { - begin_barrier.wait(); - end_barrier.wait(); - }); - } - - spawn_blocking(move || { - begin_barrier.wait(); - let result = cgroup::bind_application_threads(); - end_barrier.wait(); - result - }) - .await? - .context("Error binding application threads") -} - -async fn setup_telemetry() -> Result<()> { - if conf::CONFIG.telemetry.is_none() { - tracing::subscriber::set_global_default( - tracing_subscriber::fmt() - .compact() - .with_line_number(true) - .with_max_level(conf::CONFIG.log_level) - .finish(), - ) - .context("Failed to initialize the tracing subscriber")?; - } - - let telemetry = conf::CONFIG.telemetry.as_ref().unwrap(); - - info!("Initializing telemetry"); - - let tracer = opentelemetry_otlp::new_pipeline() - .tracing() - .with_exporter(opentelemetry_otlp::new_exporter().tonic().with_export_config( - ExportConfig { - endpoint: telemetry.collector_url.clone(), - timeout: Duration::from_secs(5), - protocol: Protocol::Grpc, - }, - )) - .with_trace_config(trace::config().with_resource(METRICS_RESOURCE.clone())) - .install_batch(opentelemetry::runtime::Tokio) - .context("Failed to initialize the tracer")?; - - let metrics = opentelemetry_otlp::new_pipeline() - .metrics( - selectors::simple::histogram(telemetry.histogram_boundaries.clone()), - cumulative_temporality_selector(), - opentelemetry::runtime::Tokio, - ) - .with_exporter(opentelemetry_otlp::new_exporter().tonic().with_export_config( - ExportConfig { - endpoint: telemetry.collector_url.clone(), - timeout: Duration::from_secs(5), - protocol: Protocol::Grpc, - }, - )) - .with_resource(METRICS_RESOURCE.clone()) - .with_period(Duration::from_secs(3)) - .build() - .context("Failed to initialize the metrics")?; - - shared::metrics::METRICS_CONTROLLER.set(metrics).ok(); - - tracing::subscriber::set_global_default( - tracing_subscriber::registry() - .with( - tracing_subscriber::fmt::layer() - .compact() - .with_line_number(true) - .with_filter::(conf::CONFIG.log_level.into()), - ) - .with( - tracing_opentelemetry::layer().with_tracer(tracer).with_filter(LevelFilter::INFO), - ), - ) - .context("Failed to initialize the tracing subscriber") -} - -fn check_env() -> Result<()> { - info!("Checking cpu counts"); - let logical_cpu_count = num_cpus::get(); - let physical_cpu_count = num_cpus::get_physical(); - if physical_cpu_count < logical_cpu_count { - // TODO: Add link to document - warn!( - "Seele does not recommend enabling the cpu's SMT technology, current logical cpu \ - count: {}, physical cpu count: {}", - logical_cpu_count, physical_cpu_count - ) - } - - if !matches!(&conf::CONFIG.work_mode, SeeleWorkMode::RootlessContainerized) { - info!("Checking id maps"); - if action::run_container::SUBUIDS.count < 65536 { - bail!( - "The user specified in the run_container namespace config has not enough subuid \ - mapping range" - ); - } - if action::run_container::SUBGIDS.count < 65536 { - bail!( - "The group specified in the run_container namespace config has not enough subgid \ - mapping range" - ); - } - } - - info!("Creating necessary directories in {}", conf::PATHS.root.display()); - for path in [&conf::PATHS.images, &conf::PATHS.submissions, &conf::PATHS.temp] { - create_dir_all(path) - .with_context(|| format!("Error creating the directory: {}", path.display()))?; - } - - info!("Registering metrics"); - shared::metrics::register_gauge_metrics().context("Error registering gauge metrics")?; - - Ok(()) -} diff --git a/src/shared/metrics.rs b/src/shared/metrics.rs deleted file mode 100644 index 61b416f..0000000 --- a/src/shared/metrics.rs +++ /dev/null @@ -1,89 +0,0 @@ -use std::sync::atomic::Ordering; - -use anyhow::Result; -use once_cell::sync::{Lazy, OnceCell}; -use opentelemetry::{ - global, - metrics::{Histogram, Meter, ObservableGauge, Unit}, - sdk::{metrics::controllers::BasicController, Resource}, - KeyValue, -}; - -use super::runner; -use crate::conf; - -pub static METRICS_RESOURCE: Lazy = Lazy::new(|| { - let mut pairs = vec![ - KeyValue::new("service.name", "seele"), - KeyValue::new( - "service.version", - conf::env::COMMIT_TAG.or(*conf::env::COMMIT_SHA).unwrap_or("unknown"), - ), - KeyValue::new( - "service.instance.id", - format!("{}-{}", *conf::HOSTNAME, nano_id::base62::<8>()), - ), - KeyValue::new("host.name", conf::HOSTNAME.clone()), - ]; - - if let Some(container_name) = conf::CONTAINER_NAME.as_ref() { - pairs.push(KeyValue::new("container.name", container_name.clone())); - } - - if let Some(container_image_name) = conf::CONTAINER_IMAGE_NAME.as_ref() { - pairs.push(KeyValue::new("container.image.name", container_image_name.clone())); - } - - if let Some(tag) = conf::COMMIT_TAG.as_ref() { - pairs.push(KeyValue::new("commit.tag", *tag)); - } - - if let Some(sha) = conf::COMMIT_SHA.as_ref() { - pairs.push(KeyValue::new("commit.sha", *sha)); - } - - Resource::new(pairs) -}); - -pub static METRICS_CONTROLLER: OnceCell = OnceCell::new(); - -pub static METER: Lazy = - Lazy::new(|| global::meter_with_version("seele", Some("0.1"), None)); - -pub static SUBMISSION_HANDLING_HISTOGRAM: Lazy> = Lazy::new(|| { - METER - .f64_histogram("seele.submission.duration") - .with_description("Duration of submissions handling") - .with_unit(Unit::new("s")) - .init() -}); - -pub static RUNNER_COUNT_GAUGE: Lazy> = Lazy::new(|| { - METER - .u64_observable_gauge("seele.runner.count") - .with_description("Count of available runner threads") - .init() -}); - -pub static PENDING_CONTAINER_ACTION_COUNT_GAUGE: Lazy> = Lazy::new(|| { - METER - .u64_observable_gauge("seele.action.container.pending.count") - .with_description("Count of pending container actions in the worker queue") - .init() -}); - -pub fn register_gauge_metrics() -> Result<()> { - METER.register_callback(|ctx| { - RUNNER_COUNT_GAUGE.observe(ctx, conf::CONFIG.thread_counts.runner as u64, &[]) - })?; - - METER.register_callback(move |ctx| { - PENDING_CONTAINER_ACTION_COUNT_GAUGE.observe( - ctx, - runner::PENDING_TASKS.load(Ordering::SeqCst), - &[], - ) - })?; - - Ok(()) -}