diff --git a/Cargo.lock b/Cargo.lock index 13f2ad2d..5b35fefc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -416,8 +416,8 @@ dependencies = [ "bytes", "futures-util", "http 0.2.11", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "itoa", "matchit", "memchr", @@ -442,7 +442,7 @@ dependencies = [ "bytes", "futures-util", "http 0.2.11", - "http-body", + "http-body 0.4.6", "mime", "rustversion", "tower-layer", @@ -491,6 +491,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64ct" version = "1.6.0" @@ -2434,6 +2440,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", + "indexmap 2.2.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "2.3.1" @@ -2685,7 +2710,7 @@ dependencies = [ "http 0.2.11", "http-serde", "humantime", - "hyper", + "hyper 0.14.28", "indexmap 2.2.3", "inquire", "ipfs-api", @@ -2697,9 +2722,9 @@ dependencies = [ "libp2p", "libsqlite3-sys", "maplit", - "metrics", + "metrics 0.21.1", "metrics-exporter-prometheus", - "metrics-util", + "metrics-util 0.15.0", "miette", "moka", "names", @@ -2855,7 +2880,7 @@ dependencies = [ "generic-array 0.14.7", "gimli", "hashbrown 0.14.3", - "hyper", + "hyper 0.14.28", "iana-time-zone", "indexmap 1.9.3", "indexmap 2.2.3", @@ -2887,6 +2912,7 @@ dependencies = [ "serde_json", "sha2 0.10.8", "signature", + "smallvec", "spin 0.9.8", "subtle", "syn 1.0.109", @@ -2954,6 +2980,29 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.0.0", + "http-body 1.0.0", + "pin-project-lite", +] + [[package]] name = "http-range-header" version = "0.3.1" @@ -2998,9 +3047,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.24", "http 0.2.11", - "http-body", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -3012,6 +3061,27 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.3", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-multipart-rfc7578" version = "0.8.0" @@ -3022,7 +3092,7 @@ dependencies = [ "common-multipart-rfc7578", "futures-core", "http 0.2.11", - "hyper", + "hyper 0.14.28", ] [[package]] @@ -3033,7 +3103,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.11", - "hyper", + "hyper 0.14.28", "log", "rustls 0.21.10", "rustls-native-certs 0.6.3", @@ -3047,12 +3117,32 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.28", "pin-project-lite", "tokio", "tokio-io-timeout", ] +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.2.0", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -3148,7 +3238,7 @@ dependencies = [ "bytes", "futures", "http 0.2.11", - "hyper", + "hyper 0.14.28", "log", "rand", "tokio", @@ -3284,7 +3374,7 @@ dependencies = [ "bytes", "futures", "http 0.2.11", - "hyper", + "hyper 0.14.28", "hyper-multipart-rfc7578", "ipfs-api-prelude", "thiserror", @@ -3465,7 +3555,7 @@ dependencies = [ "beef", "futures-timer", "futures-util", - "hyper", + "hyper 0.14.28", "jsonrpsee-types", "parking_lot", "pin-project", @@ -3487,7 +3577,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b7de9f3219d95985eb77fd03194d7c1b56c19bce1abfcc9d07462574b15572" dependencies = [ "async-trait", - "hyper", + "hyper 0.14.28", "hyper-rustls", "jsonrpsee-core", "jsonrpsee-types", @@ -3508,7 +3598,7 @@ checksum = "5cc7c6d1a2c58f6135810284a390d9f823d0f508db74cd914d8237802de80f98" dependencies = [ "futures-util", "http 0.2.11", - "hyper", + "hyper 0.14.28", "jsonrpsee-core", "jsonrpsee-types", "pin-project", @@ -4361,21 +4451,34 @@ dependencies = [ "portable-atomic", ] +[[package]] +name = "metrics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2be3cbd384d4e955b231c895ce10685e3d8260c5ccffae898c96c723b0772835" +dependencies = [ + "ahash", + "portable-atomic", +] + [[package]] name = "metrics-exporter-prometheus" -version = "0.12.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d4fa7ce7c4862db464a37b0b31d89bca874562f034bd7993895572783d02950" +checksum = "5d58e362dc7206e9456ddbcdbd53c71ba441020e62104703075a69151e38d85f" dependencies = [ - "base64 0.21.7", - "hyper", - "indexmap 1.9.3", + "base64 0.22.0", + "http-body-util", + "hyper 1.2.0", + "hyper-util", + "indexmap 2.2.3", "ipnet", - "metrics", - "metrics-util", - "quanta", + "metrics 0.22.3", + "metrics-util 0.16.3", + "quanta 0.12.2", "thiserror", "tokio", + "tracing", ] [[package]] @@ -4400,14 +4503,29 @@ dependencies = [ "crossbeam-utils", "hashbrown 0.13.2", "indexmap 1.9.3", - "metrics", + "metrics 0.21.1", "num_cpus", "ordered-float", - "quanta", + "quanta 0.11.1", "radix_trie", "sketches-ddsketch", ] +[[package]] +name = "metrics-util" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b07a5eb561b8cbc16be2d216faf7757f9baf3bfb94dbb0fae3df8387a5bb47f" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", + "hashbrown 0.14.3", + "metrics 0.22.3", + "num_cpus", + "quanta 0.12.2", + "sketches-ddsketch", +] + [[package]] name = "miette" version = "5.10.0" @@ -5437,7 +5555,22 @@ dependencies = [ "libc", "mach2", "once_cell", - "raw-cpuid", + "raw-cpuid 10.7.0", + "wasi", + "web-sys", + "winapi", +] + +[[package]] +name = "quanta" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca0b7bac0b97248c40bb77288fc52029cf1459c0461ea1b05ee32ccf011de2c" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid 11.0.1", "wasi", "web-sys", "winapi", @@ -5610,6 +5743,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "raw-cpuid" +version = "11.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" +dependencies = [ + "bitflags 2.4.2", +] + [[package]] name = "rayon" version = "1.8.1" @@ -5730,10 +5872,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.24", "http 0.2.11", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "ipnet", "js-sys", "log", @@ -7205,10 +7347,10 @@ dependencies = [ "axum", "base64 0.21.7", "bytes", - "h2", + "h2 0.3.24", "http 0.2.11", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-timeout", "percent-encoding", "pin-project", @@ -7252,7 +7394,7 @@ dependencies = [ "futures-core", "futures-util", "http 0.2.11", - "http-body", + "http-body 0.4.6", "http-range-header", "pin-project-lite", "tower-layer", diff --git a/homestar-runtime/Cargo.toml b/homestar-runtime/Cargo.toml index 1884eeeb..fc8a7d3e 100644 --- a/homestar-runtime/Cargo.toml +++ b/homestar-runtime/Cargo.toml @@ -120,7 +120,7 @@ libp2p = { version = "0.53", default-features = false, features = [ libsqlite3-sys = { workspace = true } maplit = "1.0" metrics = { version = "0.21", default-features = false } -metrics-exporter-prometheus = { version = "0.12.1", default-features = false, features = [ +metrics-exporter-prometheus = { version = "0.14.0", default-features = false, features = [ "http-listener", ] } metrics-util = "0.15" diff --git a/homestar-workspace-hack/Cargo.toml b/homestar-workspace-hack/Cargo.toml index 8bd36619..e9858ac6 100644 --- a/homestar-workspace-hack/Cargo.toml +++ b/homestar-workspace-hack/Cargo.toml @@ -68,6 +68,7 @@ serde = { version = "1.0.197", features = ["alloc", "derive", "rc"] } serde_json = { version = "1.0.114", features = ["alloc", "float_roundtrip", "raw_value", "unbounded_depth"] } sha2 = { version = "0.10.8" } signature = { version = "2.2.0", default-features = false, features = ["std"] } +smallvec = { version = "1.13.1", default-features = false, features = ["const_new", "union"] } time = { version = "0.3.34", features = ["formatting", "local-offset", "macros", "parsing"] } tokio = { version = "1.36.0", features = ["fs", "io-std", "io-util", "macros", "net", "rt-multi-thread", "signal", "test-util", "tracing"] } tokio-stream = { version = "0.1.14", features = ["net", "sync"] } @@ -141,6 +142,7 @@ serde = { version = "1.0.197", features = ["alloc", "derive", "rc"] } serde_json = { version = "1.0.114", features = ["alloc", "float_roundtrip", "raw_value", "unbounded_depth"] } sha2 = { version = "0.10.8" } signature = { version = "2.2.0", default-features = false, features = ["std"] } +smallvec = { version = "1.13.1", default-features = false, features = ["const_new", "union"] } syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.109", features = ["extra-traits", "full", "visit"] } syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.50", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } time = { version = "0.3.34", features = ["formatting", "local-offset", "macros", "parsing"] }