From af689b485a291859a4cfe80e595b425dc0f5590e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 22:52:57 +0000
Subject: [PATCH 1/2] [chore(cargo)](deps): Bump metrics-exporter-prometheus

Bumps [metrics-exporter-prometheus](https://github.com/metrics-rs/metrics) from 0.12.2 to 0.15.1.
- [Changelog](https://github.com/metrics-rs/metrics/blob/main/release.toml)
- [Commits](https://github.com/metrics-rs/metrics/compare/metrics-exporter-prometheus-v0.12.2...metrics-exporter-prometheus-v0.15.1)

---
updated-dependencies:
- dependency-name: metrics-exporter-prometheus
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock                  | 217 ++++++++++++++++++++++++++++++------
 homestar-runtime/Cargo.toml |   2 +-
 2 files changed, 183 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c77a0b18..0bd59032 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -381,6 +381,12 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
 [[package]]
 name = "atomic_refcell"
 version = "0.1.13"
@@ -416,8 +422,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 +448,7 @@ dependencies = [
  "bytes",
  "futures-util",
  "http 0.2.11",
- "http-body",
+ "http-body 0.4.6",
  "mime",
  "rustversion",
  "tower-layer",
@@ -491,6 +497,12 @@ version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
 [[package]]
 name = "base64ct"
 version = "1.6.0"
@@ -2434,6 +2446,25 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "h2"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http 1.0.0",
+ "indexmap 2.2.3",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "half"
 version = "2.3.1"
@@ -2685,7 +2716,7 @@ dependencies = [
  "http 0.2.11",
  "http-serde",
  "humantime",
- "hyper",
+ "hyper 0.14.28",
  "indexmap 2.2.3",
  "inquire",
  "ipfs-api",
@@ -2697,9 +2728,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 +2886,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",
@@ -2954,6 +2985,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.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "http-range-header"
 version = "0.3.1"
@@ -2998,9 +3052,9 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
+ "h2 0.3.26",
  "http 0.2.11",
- "http-body",
+ "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
@@ -3012,6 +3066,27 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2 0.4.5",
+ "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 +3097,7 @@ dependencies = [
  "common-multipart-rfc7578",
  "futures-core",
  "http 0.2.11",
- "hyper",
+ "hyper 0.14.28",
 ]
 
 [[package]]
@@ -3033,7 +3108,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 +3122,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.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "hyper 1.3.1",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "iana-time-zone"
 version = "0.1.60"
@@ -3148,7 +3243,7 @@ dependencies = [
  "bytes",
  "futures",
  "http 0.2.11",
- "hyper",
+ "hyper 0.14.28",
  "log",
  "rand",
  "tokio",
@@ -3284,7 +3379,7 @@ dependencies = [
  "bytes",
  "futures",
  "http 0.2.11",
- "hyper",
+ "hyper 0.14.28",
  "hyper-multipart-rfc7578",
  "ipfs-api-prelude",
  "thiserror",
@@ -3465,7 +3560,7 @@ dependencies = [
  "beef",
  "futures-timer",
  "futures-util",
- "hyper",
+ "hyper 0.14.28",
  "jsonrpsee-types",
  "parking_lot",
  "pin-project",
@@ -3487,7 +3582,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 +3603,7 @@ checksum = "5cc7c6d1a2c58f6135810284a390d9f823d0f508db74cd914d8237802de80f98"
 dependencies = [
  "futures-util",
  "http 0.2.11",
- "hyper",
+ "hyper 0.14.28",
  "jsonrpsee-core",
  "jsonrpsee-types",
  "pin-project",
@@ -4383,21 +4478,34 @@ dependencies = [
  "portable-atomic",
 ]
 
+[[package]]
+name = "metrics"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261"
+dependencies = [
+ "ahash",
+ "portable-atomic",
+]
+
 [[package]]
 name = "metrics-exporter-prometheus"
-version = "0.12.2"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d4fa7ce7c4862db464a37b0b31d89bca874562f034bd7993895572783d02950"
+checksum = "bf0af7a0d7ced10c0151f870e5e3f3f8bc9ffc5992d32873566ca1f9169ae776"
 dependencies = [
- "base64 0.21.7",
- "hyper",
- "indexmap 1.9.3",
+ "base64 0.22.1",
+ "http-body-util",
+ "hyper 1.3.1",
+ "hyper-util",
+ "indexmap 2.2.3",
  "ipnet",
- "metrics",
- "metrics-util",
- "quanta",
+ "metrics 0.23.0",
+ "metrics-util 0.17.0",
+ "quanta 0.12.3",
  "thiserror",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
@@ -4422,14 +4530,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.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "hashbrown 0.14.3",
+ "metrics 0.23.0",
+ "num_cpus",
+ "quanta 0.12.3",
+ "sketches-ddsketch",
+]
+
 [[package]]
 name = "miette"
 version = "5.10.0"
@@ -5459,7 +5582,22 @@ dependencies = [
  "libc",
  "mach2",
  "once_cell",
- "raw-cpuid",
+ "raw-cpuid 10.7.0",
+ "wasi",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "quanta"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5"
+dependencies = [
+ "crossbeam-utils",
+ "libc",
+ "once_cell",
+ "raw-cpuid 11.0.2",
  "wasi",
  "web-sys",
  "winapi",
@@ -5632,6 +5770,15 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "raw-cpuid"
+version = "11.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd"
+dependencies = [
+ "bitflags 2.4.2",
+]
+
 [[package]]
 name = "rayon"
 version = "1.8.1"
@@ -5752,10 +5899,10 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2",
+ "h2 0.3.26",
  "http 0.2.11",
- "http-body",
- "hyper",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
  "ipnet",
  "js-sys",
  "log",
@@ -7227,10 +7374,10 @@ dependencies = [
  "axum",
  "base64 0.21.7",
  "bytes",
- "h2",
+ "h2 0.3.26",
  "http 0.2.11",
- "http-body",
- "hyper",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
  "hyper-timeout",
  "percent-encoding",
  "pin-project",
@@ -7274,7 +7421,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 d8c45c0b..cd1bc99e 100644
--- a/homestar-runtime/Cargo.toml
+++ b/homestar-runtime/Cargo.toml
@@ -121,7 +121,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.15.1", default-features = false, features = [
   "http-listener",
 ] }
 metrics-util = "0.15"

From 3224485e360fa00880fbd17ff615b5434986a270 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 22:53:37 +0000
Subject: [PATCH 2/2] chore(deps): cargo hakari

---
 Cargo.lock                         | 1 +
 homestar-workspace-hack/Cargo.toml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 0bd59032..1d1a5841 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2918,6 +2918,7 @@ dependencies = [
  "serde_json",
  "sha2 0.10.8",
  "signature",
+ "smallvec",
  "spin 0.9.8",
  "subtle",
  "syn 1.0.109",
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"] }