Update deps with minimal changes

This updates many dependencies with minimal changes. Based off of
#119

Co-authored-by: Louis Sven Goulet <lgoulet@cloudflare.com>

Author: fisherdarling

.github/workflows/ci.yml

@@ -98,7 +98,7 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
       - name: Run cargo deny checks
-        uses: EmbarkStudios/cargo-deny-action@v1
+        uses: EmbarkStudios/cargo-deny-action@v2
         with:
           command: check
 
@@ -150,7 +150,7 @@ jobs:
     name: Check feature combinations
     strategy:
       matrix:
-        os: [ ubuntu-latest, macos-latest ]
+        os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

Cargo.toml

@@ -27,63 +27,64 @@ debug = 1
 anyhow = "1.0.75"
 foundations = { version = "4.5.0", path = "./foundations" }
 foundations-macros = { version = "4.5.0", path = "./foundations-macros", default-features = false }
-bindgen = { version = "0.68.1", default-features = false }
+bindgen = { version = "0.72", default-features = false }
 cc = "1.0"
 cf-rustracing = "1.1"
-cf-rustracing-jaeger = "1.1"
+cf-rustracing-jaeger = "1.2.2"
 clap = "4.4"
-darling = "0.20.10"
-erased-serde = "0.3.28"
-futures-util = "0.3.28"
+darling = "0.21"
+erased-serde = "0.4"
+futures-util = "0.3"
 governor = "0.6"
 http = "1"
 http-body-util = "0.1"
 hyper = { version = "1", default-features = false }
 hyper-util = { version = "0.1", default-features = false }
-indexmap = "2.0.0"
-ipnetwork = "0.20"
+indexmap = "2.0"
+ipnetwork = { version = "0.21", features = ["serde"] }
 libc = "0.2"
 once_cell = "1.5"
-tonic = { version = "0.12", default-features = false }
-opentelemetry-proto = "0.7"
-parking_lot = "0.12.1"
+tonic = { version = "0.13", default-features = false }
+opentelemetry-proto = "0.30"
+parking_lot = "0.12"
 proc-macro2 = { version = "1", default-features = false }
-prometheus = { version = "0.13.3", default-features = false }
-prometheus-client = "0.18.1"
-prometools = "0.2.1"
-rand = "0.8"
-percent-encoding = "2.3.1"
+prometheus = { version = "0.14", default-features = false }
+prometheus-client = "0.18"
+prometools = "0.2.2"
+rand = "0.9"
+percent-encoding = "2.3"
 quote = "1"
 regex = "1.8"
 reqwest = { version = "0.12", default-features = false }
-socket2 = { version = "0.5.3", features = ["all"] }
+socket2 = { version = "0.5", features = ["all"] }
 syn = "2"
 serde = "1"
-serde_path_to_error = "0.1.15"
+serde_path_to_error = "0.1.17"
 serde_yaml = "0.8.26"
-serde_with = "3.3.0"
-slab = "0.4.9"
+serde_with = "3.3"
+slab = "0.4"
 slog = "2.7"
 slog-async = "2.3"
 slog-json = "2.3"
 slog-term = "2.4"
 tempfile = "3.7"
 tokio = "1.41.0"
 thread_local = "1.1"
-tikv-jemallocator = "0.5"
-tikv-jemalloc-ctl = "0.5"
+tikv-jemallocator = "0.6"
+tikv-jemalloc-ctl = "0.6"
 tower-service = "0.3"
 tracing-slog = "0.3.0"
 tracing-subscriber = "0.3"
-yaml-merge-keys = "0.5"
+yaml-merge-keys = { version = "0.5", features = ["serde_yaml"] }
 
 # needed for minver
-async-stream = "0.3.5"
-local-ip-address = "0.5.7"
-lock_api = "0.4.11"
-log = "0.4.20"
-neli = "0.6.4"
-neli-proc-macros = "0.1.3"
-nix = "0.29.0"
-parking_lot_core = "0.9.9"
-thiserror = "1.0.56"
+async-stream = "0.3"
+local-ip-address = "0.6.5"
+lock_api = "0.4"
+log = "0.4.27"
+neli = "0.6.5"
+neli-proc-macros = "0.1.4"
+nix = "0.30"
+parking_lot_core = "0.9"
+thiserror = "2.0.12"
+tower = "0.5.2"

deny.toml

@@ -1,13 +1,6 @@
 [advisories]
-vulnerability = "deny"
-unmaintained = "allow"
-notice = "allow"
-unsound = "deny"
-severity-threshold = "medium"
-ignore = [
-    # No fix available, but only applies to Windows, hence not a problem for us.
-    "RUSTSEC-2021-0145",
-]
+unmaintained = "none"
+ignore = []
 
 
 [bans]
@@ -24,8 +17,14 @@ unknown-git = "allow"
 allow-git = []
 
 [licenses]
-unlicensed = "allow"
-allow-osi-fsf-free = "either"
-copyleft = "deny"
-allow = ["MPL-2.0"]
-confidence-threshold = 0.9
+private.ignore = true
+unused-allowed-license = "allow"
+# Licences should be at least osi or fsf-free
+# and not copyleft
+allow = [
+    "MIT",
+    "Apache-2.0",
+    "BSD-3-Clause",
+    "Unicode-3.0",
+    "ISC",
+]

examples/Cargo.toml

@@ -5,15 +5,6 @@ edition = { workspace = true }
 repository = { workspace = true }
 publish = false
 
-[dev-dependencies]
-anyhow = { workspace = true }
-foundations = { workspace = true }
-futures-util = { workspace = true }
-http-body-util = { workspace = true }
-hyper = { workspace = true }
-hyper-util = { workspace = true, features = ["server", "tokio"] }
-tokio = { workspace = true, features = ["full"]}
-
 [[example]]
 name = "http_server"
 path = "http_server/main.rs"

foundations/Cargo.toml

@@ -214,8 +214,8 @@ slog-term = { workspace = true, optional = true }
 socket2 = { workspace = true, optional = true }
 tracing-slog = { workspace = true, optional = true }
 thread_local = { workspace = true, optional = true }
-tokio = { workspace = true, optional = true, features = ["sync", "rt"] }
-tonic = { workspace = true, optional = true, features = ["channel", "prost"] }
+tokio = { workspace = true, optional = true, features = ["sync", "rt", "macros"] }
+tonic = { workspace = true, optional = true, features = ["channel"] }
 tikv-jemallocator = { workspace = true, optional = true, features = [
     "profiling",
     "stats",
@@ -233,6 +233,7 @@ log = { workspace = true, optional = true }
 parking_lot_core = { workspace = true, optional = true }
 regex = { workspace = true, optional = true }
 thiserror = { workspace = true, optional = true }
+tower = { workspace = true, optional = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 tikv-jemalloc-ctl = { workspace = true, optional = true, features = [
@@ -244,15 +245,6 @@ tempfile = { workspace = true, optional = true }
 neli = { workspace = true, optional = true }
 neli-proc-macros = { workspace = true, optional = true }
 
-[dev-dependencies]
-reqwest = { workspace = true }
-serde = { workspace = true, features = ["rc"] }
-tempfile = { workspace = true }
-tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
-ipnetwork = { workspace = true }
-nix = { workspace = true , features = ["fs"] }
-tracing-subscriber = { workspace = true }
-
 [build-dependencies]
 bindgen = { workspace = true, features = ["runtime"], optional = true }
 cc = { workspace = true, optional = true }

foundations/build.rs

@@ -24,7 +24,7 @@ fn ensure_seccomp_sources_fetched() {
 #[cfg(feature = "security")]
 mod security {
     use super::*;
-    use bindgen::{Builder, CargoCallbacks};
+    use bindgen::Builder;
     use std::fs;
     use std::path::Path;
 
@@ -175,7 +175,7 @@ mod security {
             .allowlist_var("PR_GET_SECCOMP")
             .allowlist_var("PR_SET_NAME")
             .derive_default(true)
-            .parse_callbacks(Box::new(CargoCallbacks))
+            .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
             .generate()
             .unwrap()
             .write_to_file(out_dir.join("security_sys.rs"))

foundations/src/telemetry/otlp_conversion/common.rs

@@ -27,6 +27,7 @@ pub(super) fn convert_service_info_to_resource(
     otlp::resource::v1::Resource {
         attributes: vec![service_name_attr],
         dropped_attributes_count: 0,
+        entity_refs: vec![],
     }
 }
 

foundations/src/telemetry/tracing/internal.rs

@@ -211,5 +211,5 @@ fn should_sample(sampling_ratio: f64) -> bool {
         return true;
     }
 
-    rand::thread_rng().gen_range(0.0..1.0) < sampling_ratio
+    rand::rng().random_range(0.0..1.0) < sampling_ratio
 }

foundations/tests/settings.rs

@@ -155,7 +155,7 @@ struct StructWithCrateReexport {
 macro_rules! assert_ser_eq {
     ($obj:expr, $expected:expr) => {
         let actual = to_yaml_string(&$obj).unwrap().trim().to_string();
-        let expected = include_str!($expected);
+        let expected = include_str!($expected).trim();
 
         assert_eq!(
             actual, expected,