diff options
| -rw-r--r-- | tvix/Cargo.lock | 592 | ||||
| -rw-r--r-- | tvix/Cargo.nix | 1875 | ||||
| -rw-r--r-- | tvix/build/Cargo.toml | 12 | ||||
| -rw-r--r-- | tvix/castore/Cargo.toml | 13 | ||||
| -rw-r--r-- | tvix/castore/src/blobservice/tests/utils.rs | 3 | ||||
| -rw-r--r-- | tvix/castore/src/directoryservice/tests/utils.rs | 3 | ||||
| -rw-r--r-- | tvix/castore/src/tonic.rs | 6 | ||||
| -rw-r--r-- | tvix/crate-hashes.json | 1 | ||||
| -rw-r--r-- | tvix/default.nix | 1 | ||||
| -rw-r--r-- | tvix/glue/Cargo.toml | 2 | ||||
| -rw-r--r-- | tvix/nar-bridge/Cargo.toml | 8 | ||||
| -rw-r--r-- | tvix/store/Cargo.toml | 19 | ||||
| -rw-r--r-- | tvix/store/src/pathinfoservice/tests/utils.rs | 3 | ||||
| -rw-r--r-- | tvix/tracing/Cargo.toml | 16 | ||||
| -rw-r--r-- | tvix/tracing/src/lib.rs | 13 |
15 files changed, 1828 insertions, 739 deletions
diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index 4b731460eb4e..605695a33c6d 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -318,7 +318,7 @@ dependencies = [ "http-body 0.4.6", "hyper 0.14.28", "itoa", - "matchit", + "matchit 0.7.3", "memchr", "mime", "percent-encoding", @@ -344,10 +344,10 @@ dependencies = [ "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.3.1", + "hyper 1.4.1", "hyper-util", "itoa", - "matchit", + "matchit 0.7.3", "memchr", "mime", "percent-encoding", @@ -425,6 +425,12 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -439,9 +445,9 @@ dependencies = [ "gcp_auth", "http 0.2.11", "log", - "prost", - "prost-build", - "prost-types", + "prost 0.12.3", + "prost-build 0.12.3", + "prost-types 0.12.3", "prost-wkt", "prost-wkt-build", "prost-wkt-types", @@ -449,8 +455,8 @@ dependencies = [ "serde_with", "thiserror", "tokio", - "tonic", - "tonic-build", + "tonic 0.11.0", + "tonic-build 0.11.0", "tower", ] @@ -1089,15 +1095,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] name = "endian-type" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1440,11 +1437,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de2c71ea685b88a1aa50e9fb66fe0e1cb29d755f58cca41fb8c91ef604d4f4d4" dependencies = [ "async-trait", - "base64", + "base64 0.21.7", "chrono", "home", "hyper 0.14.28", - "hyper-rustls", + "hyper-rustls 0.24.2", "ring", "rustls 0.21.12", "rustls-pemfile 1.0.4", @@ -1672,12 +1669,6 @@ dependencies = [ ] [[package]] -name = "http-range-header" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" - -[[package]] name = "httparse" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1721,9 +1712,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", @@ -1737,6 +1728,7 @@ dependencies = [ "pin-project-lite", "smallvec", "tokio", + "want", ] [[package]] @@ -1755,6 +1747,24 @@ dependencies = [ ] [[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.4.1", + "hyper-util", + "rustls 0.23.7", + "rustls-native-certs 0.7.0", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", +] + +[[package]] name = "hyper-timeout" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1767,19 +1777,36 @@ dependencies = [ ] [[package]] +name = "hyper-timeout" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper 1.4.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" dependencies = [ "bytes", + "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.0", - "hyper 1.3.1", + "hyper 1.4.1", "pin-project-lite", "socket2", "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2156,6 +2183,12 @@ 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 = "md-5" version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2196,16 +2229,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - -[[package]] name = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2252,18 +2275,18 @@ dependencies = [ "lru", "nix-compat", "parking_lot 0.12.3", - "prost", - "prost-build", + "prost 0.13.1", + "prost-build 0.13.1", "rstest", "serde", "thiserror", "tokio", "tokio-listener", "tokio-util", - "tonic", - "tonic-build", + "tonic 0.12.1", + "tonic-build 0.12.1", "tower", - "tower-http 0.5.2", + "tower-http", "tracing", "tracing-subscriber", "tvix-castore", @@ -2428,17 +2451,17 @@ dependencies = [ [[package]] name = "object_store" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8718f8b65fdf67a45108d1548347d4af7d71fb81ce727bbf9e3b2535e079db3" +checksum = "fbebfd32c213ba1907fa7a9c9138015a8de2b43e30c5aa45b18f7deb46786ad6" dependencies = [ "async-trait", - "base64", + "base64 0.22.1", "bytes", "chrono", "futures", "humantime", - "hyper 0.14.28", + "hyper 1.4.1", "itertools 0.12.0", "md-5", "parking_lot 0.12.3", @@ -2491,55 +2514,62 @@ dependencies = [ ] [[package]] +name = "opentelemetry" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c365a63eec4f55b7efeceb724f1336f26a9cf3427b70e59e2cd2a5b947fba96" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + +[[package]] name = "opentelemetry-http" -version = "0.11.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7690dc77bf776713848c4faa6501157469017eaf332baccd4eb1cea928743d94" +checksum = "ad31e9de44ee3538fb9d64fe3376c1362f406162434609e79aea2a41a0af78ab" dependencies = [ "async-trait", "bytes", - "http 0.2.11", - "opentelemetry", + "http 1.1.0", + "opentelemetry 0.24.0", ] [[package]] name = "opentelemetry-otlp" -version = "0.15.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb" +checksum = "6b925a602ffb916fb7421276b86756027b37ee708f9dce2dbdcc51739f07e727" dependencies = [ "async-trait", "futures-core", - "http 0.2.11", - "opentelemetry", + "http 1.1.0", + "opentelemetry 0.24.0", "opentelemetry-proto", - "opentelemetry-semantic-conventions", - "opentelemetry_sdk", - "prost", + "opentelemetry_sdk 0.24.1", + "prost 0.13.1", "thiserror", "tokio", - "tonic", + "tonic 0.12.1", ] [[package]] name = "opentelemetry-proto" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4" +checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9" dependencies = [ - "opentelemetry", - "opentelemetry_sdk", - "prost", - "tonic", + "opentelemetry 0.24.0", + "opentelemetry_sdk 0.24.1", + "prost 0.13.1", + "tonic 0.12.1", ] [[package]] -name = "opentelemetry-semantic-conventions" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910" - -[[package]] name = "opentelemetry_sdk" version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2552,11 +2582,30 @@ dependencies = [ "futures-util", "glob", "once_cell", - "opentelemetry", + "opentelemetry 0.22.0", "ordered-float", "percent-encoding", "rand", "thiserror", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692eac490ec80f24a17828d49b40b60f5aeaccdfe6a503f939713afd22bc28df" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry 0.24.0", + "percent-encoding", + "rand", + "serde_json", + "thiserror", "tokio", "tokio-stream", ] @@ -2842,7 +2891,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.12.3", +] + +[[package]] +name = "prost" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +dependencies = [ + "bytes", + "prost-derive 0.13.1", ] [[package]] @@ -2859,8 +2918,8 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost", - "prost-types", + "prost 0.12.3", + "prost-types 0.12.3", "pulldown-cmark", "pulldown-cmark-to-cmark", "regex", @@ -2870,6 +2929,27 @@ dependencies = [ ] [[package]] +name = "prost-build" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb182580f71dd070f88d01ce3de9f4da5021db7115d2e1c3605a754153b77c1" +dependencies = [ + "bytes", + "heck", + "itertools 0.12.0", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease", + "prost 0.13.1", + "prost-types 0.13.1", + "regex", + "syn 2.0.48", + "tempfile", +] + +[[package]] name = "prost-derive" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2883,12 +2963,34 @@ dependencies = [ ] [[package]] +name = "prost-derive" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +dependencies = [ + "anyhow", + "itertools 0.12.0", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] name = "prost-types" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" dependencies = [ - "prost", + "prost 0.12.3", +] + +[[package]] +name = "prost-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" +dependencies = [ + "prost 0.13.1", ] [[package]] @@ -2899,7 +3001,7 @@ checksum = "4d8ef9c3f0f1dab910d2b7e2c24a8e4322e122eba6d7a1921eeebcebbc046c40" dependencies = [ "chrono", "inventory", - "prost", + "prost 0.12.3", "serde", "serde_derive", "serde_json", @@ -2913,9 +3015,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b31cae9a54ca84fee1504740a82eebf2479532905e106f63ca0c3bc8d780321" dependencies = [ "heck", - "prost", - "prost-build", - "prost-types", + "prost 0.12.3", + "prost-build 0.12.3", + "prost-types 0.12.3", "quote", ] @@ -2926,9 +3028,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "435be4a8704091b4c5fb1d79799de7f2dbff53af05edf29385237f8cf7ab37ee" dependencies = [ "chrono", - "prost", - "prost-build", - "prost-types", + "prost 0.12.3", + "prost-build 0.12.3", + "prost-types 0.12.3", "prost-wkt", "prost-wkt-build", "regex", @@ -2974,6 +3076,53 @@ dependencies = [ ] [[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls 0.23.7", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls 0.23.7", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] name = "quote" version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3150,37 +3299,39 @@ checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" [[package]] name = "reqwest" -version = "0.11.23" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ - "base64", + "base64 0.22.1", "bytes", - "encoding_rs", "futures-core", "futures-util", - "h2 0.3.26", - "http 0.2.11", - "http-body 0.4.6", - "hyper 0.14.28", - "hyper-rustls", + "h2 0.4.4", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.4.1", + "hyper-rustls 0.27.2", + "hyper-util", "ipnet", "js-sys", "log", "mime", - "mime_guess", "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.12", - "rustls-native-certs 0.6.3", - "rustls-pemfile 1.0.4", + "quinn", + "rustls 0.23.7", + "rustls-native-certs 0.7.0", + "rustls-pemfile 2.1.0", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "system-configuration", + "sync_wrapper 1.0.1", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls 0.26.0", "tokio-util", "tower-service", "url", @@ -3193,35 +3344,35 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.2.5" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216" +checksum = "39346a33ddfe6be00cbc17a34ce996818b97b230b87229f10114693becca1268" dependencies = [ "anyhow", "async-trait", - "http 0.2.11", + "http 1.1.0", "reqwest", "serde", - "task-local-extensions", "thiserror", + "tower-service", ] [[package]] name = "reqwest-tracing" -version = "0.4.8" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190838e54153d7a7e2ea98851304b3ce92daeabf14c54d32b01b84a3e636f683" +checksum = "4e45dcad05dc210fdb0278d62a679eb768730af808f8cb552f810da89bdbe76d" dependencies = [ "anyhow", "async-trait", "getrandom", - "matchit", - "opentelemetry", + "http 1.1.0", + "matchit 0.8.4", + "opentelemetry 0.22.0", "reqwest", "reqwest-middleware", - "task-local-extensions", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.23.0", ] [[package]] @@ -3362,6 +3513,21 @@ dependencies = [ ] [[package]] +name = "rustls" +version = "0.23.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebbbdb961df0ad3f2652da8f3fdc4b36122f568f968f45ad3316f26c025c677b" +dependencies = [ + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + +[[package]] name = "rustls-native-certs" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3392,7 +3558,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64", + "base64 0.21.7", ] [[package]] @@ -3401,7 +3567,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c333bb734fcdedcea57de1602543590f545f127dc8b533324318fd492c5c70b" dependencies = [ - "base64", + "base64 0.21.7", "rustls-pki-types", ] @@ -3637,7 +3803,7 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ - "base64", + "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", @@ -3880,27 +4046,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] name = "tabwriter" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3910,15 +4055,6 @@ dependencies = [ ] [[package]] -name = "task-local-extensions" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" -dependencies = [ - "pin-utils", -] - -[[package]] name = "tempfile" version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4103,23 +4239,23 @@ dependencies = [ [[package]] name = "tokio-listener" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4134661e12ec11c6276be73544a43144a357b08dfab5c41fd226e15b5bc9a6b2" +checksum = "914a439d123292125bc806649c396d23e1aac5da4052f0d97b23137b38782f46" dependencies = [ "axum 0.7.5", "clap", "document-features", "futures-core", "futures-util", - "hyper 1.3.1", + "hyper 1.4.1", "hyper-util", "nix 0.26.4", "pin-project", "socket2", "tokio", "tokio-util", - "tonic", + "tonic 0.12.1", "tower", "tower-service", "tracing", @@ -4169,6 +4305,17 @@ dependencies = [ ] [[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.7", + "rustls-pki-types", + "tokio", +] + +[[package]] name = "tokio-stream" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4265,17 +4412,16 @@ dependencies = [ "async-stream", "async-trait", "axum 0.6.20", - "base64", + "base64 0.21.7", "bytes", "h2 0.3.26", "http 0.2.11", "http-body 0.4.6", "hyper 0.14.28", - "hyper-timeout", + "hyper-timeout 0.4.1", "percent-encoding", "pin-project", - "prost", - "rustls-native-certs 0.7.0", + "prost 0.12.3", "rustls-pemfile 2.1.0", "rustls-pki-types", "tokio", @@ -4288,6 +4434,39 @@ dependencies = [ ] [[package]] +name = "tonic" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" +dependencies = [ + "async-stream", + "async-trait", + "axum 0.7.5", + "base64 0.22.1", + "bytes", + "h2 0.4.4", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.4.1", + "hyper-timeout 0.5.1", + "hyper-util", + "percent-encoding", + "pin-project", + "prost 0.13.1", + "rustls-native-certs 0.7.0", + "rustls-pemfile 2.1.0", + "socket2", + "tokio", + "tokio-rustls 0.26.0", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] name = "tonic-build" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4295,22 +4474,35 @@ checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" dependencies = [ "prettyplease", "proc-macro2", - "prost-build", + "prost-build 0.12.3", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tonic-build" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "568392c5a2bd0020723e3f387891176aabafe36fd9fcd074ad309dfa0c8eb964" +dependencies = [ + "prettyplease", + "proc-macro2", + "prost-build 0.13.1", "quote", "syn 2.0.48", ] [[package]] name = "tonic-reflection" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "548c227bd5c0fae5925812c4ec6c66ffcfced23ea370cb823f4d18f0fc1cb6a7" +checksum = "b742c83ad673e9ab5b4ce0981f7b9e8932be9d60e8682cbf9120494764dbc173" dependencies = [ - "prost", - "prost-types", + "prost 0.13.1", + "prost-types 0.13.1", "tokio", "tokio-stream", - "tonic", + "tonic 0.12.1", ] [[package]] @@ -4335,25 +4527,6 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" -dependencies = [ - "bitflags 2.4.2", - "bytes", - "futures-core", - "futures-util", - "http 0.2.11", - "http-body 0.4.6", - "http-range-header", - "pin-project-lite", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" @@ -4455,8 +4628,25 @@ checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" dependencies = [ "js-sys", "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.22.0", + "opentelemetry_sdk 0.22.1", + "smallvec", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", + "web-time", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.25.0" +source = "git+https://github.com/tokio-rs/tracing-opentelemetry?branch=otel-0.24#6fb2ba4c8b5b5b00e2566256c3ce80d7ebbe59ec" +dependencies = [ + "js-sys", + "once_cell", + "opentelemetry 0.24.0", + "opentelemetry_sdk 0.24.1", "smallvec", "tracing", "tracing-core", @@ -4527,14 +4717,14 @@ dependencies = [ "bytes", "clap", "itertools 0.12.0", - "prost", - "prost-build", + "prost 0.13.1", + "prost-build 0.13.1", "rstest", "thiserror", "tokio", "tokio-listener", - "tonic", - "tonic-build", + "tonic 0.12.1", + "tonic-build 0.12.1", "tonic-reflection", "tracing", "tvix-castore", @@ -4561,14 +4751,15 @@ dependencies = [ "fuse-backend-rs", "futures", "hex-literal", + "hyper-util", "lazy_static", "libc", "object_store", "parking_lot 0.12.3", "petgraph", "pin-project-lite", - "prost", - "prost-build", + "prost 0.13.1", + "prost-build 0.13.1", "rstest", "rstest_reuse", "serde", @@ -4585,8 +4776,8 @@ dependencies = [ "tokio-stream", "tokio-tar", "tokio-util", - "tonic", - "tonic-build", + "tonic 0.12.1", + "tonic-build 0.12.1", "tonic-reflection", "tower", "tracing", @@ -4746,13 +4937,14 @@ dependencies = [ "count-write", "data-encoding", "futures", + "hyper-util", "lazy_static", "lru", "nix-compat", "parking_lot 0.12.3", "pin-project-lite", - "prost", - "prost-build", + "prost 0.13.1", + "prost-build 0.13.1", "reqwest", "reqwest-middleware", "rstest", @@ -4770,11 +4962,11 @@ dependencies = [ "tokio-retry", "tokio-stream", "tokio-util", - "tonic", - "tonic-build", + "tonic 0.12.1", + "tonic-build 0.12.1", "tonic-reflection", "tower", - "tower-http 0.4.4", + "tower-http", "tracing", "tracing-indicatif", "tvix-castore", @@ -4788,20 +4980,20 @@ name = "tvix-tracing" version = "0.1.0" dependencies = [ "axum 0.7.5", - "http 0.2.11", + "http 1.1.0", "indicatif", "lazy_static", - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry-http", "opentelemetry-otlp", - "opentelemetry_sdk", + "opentelemetry_sdk 0.24.1", "reqwest-tracing", "thiserror", "tokio", - "tonic", + "tonic 0.12.1", "tracing", "tracing-indicatif", - "tracing-opentelemetry", + "tracing-opentelemetry 0.25.0", "tracing-subscriber", "tracing-tracy", ] @@ -5153,9 +5345,9 @@ checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -5419,9 +5611,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 58c60b0cd1b0..08d1f728548b 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -1063,7 +1063,7 @@ rec { } { name = "matchit"; - packageId = "matchit"; + packageId = "matchit 0.7.3"; } { name = "memchr"; @@ -1182,7 +1182,7 @@ rec { } { name = "hyper"; - packageId = "hyper 1.3.1"; + packageId = "hyper 1.4.1"; optional = true; } { @@ -1197,7 +1197,7 @@ rec { } { name = "matchit"; - packageId = "matchit"; + packageId = "matchit 0.7.3"; } { name = "memchr"; @@ -1521,7 +1521,7 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "base64" = rec { + "base64 0.21.7" = rec { crateName = "base64"; version = "0.21.7"; edition = "2018"; @@ -1536,6 +1536,20 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "default" "std" ]; }; + "base64 0.22.1" = rec { + crateName = "base64"; + version = "0.22.1"; + edition = "2018"; + sha256 = "1imqzgh7bxcikp5vx3shqvw9j09g9ly0xr0jma0q66i52r7jbcvj"; + authors = [ + "Marshall Pierce <marshall@mpierce.org>" + ]; + features = { + "default" = [ "std" ]; + "std" = [ "alloc" ]; + }; + resolvedDefaultFeatures = [ "alloc" "default" "std" ]; + }; "base64ct" = rec { crateName = "base64ct"; version = "1.6.0"; @@ -1572,11 +1586,11 @@ rec { } { name = "prost"; - packageId = "prost"; + packageId = "prost 0.12.3"; } { name = "prost-types"; - packageId = "prost-types"; + packageId = "prost-types 0.12.3"; } { name = "prost-wkt"; @@ -1607,7 +1621,7 @@ rec { } { name = "tonic"; - packageId = "tonic"; + packageId = "tonic 0.11.0"; features = [ "tls" "transport" ]; } { @@ -1618,7 +1632,7 @@ rec { buildDependencies = [ { name = "prost-build"; - packageId = "prost-build"; + packageId = "prost-build 0.12.3"; } { name = "prost-wkt-build"; @@ -1626,7 +1640,7 @@ rec { } { name = "tonic-build"; - packageId = "tonic-build"; + packageId = "tonic-build 0.11.0"; features = [ "cleanup-markdown" ]; } ]; @@ -3411,29 +3425,6 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "encoding_rs" = rec { - crateName = "encoding_rs"; - version = "0.8.33"; - edition = "2018"; - sha256 = "1qa5k4a0ipdrxq4xg9amms9r9pnnfn7nfh2i9m3mw0ka563b6s3j"; - authors = [ - "Henri Sivonen <hsivonen@hsivonen.fi>" - ]; - dependencies = [ - { - name = "cfg-if"; - packageId = "cfg-if"; - } - ]; - features = { - "default" = [ "alloc" ]; - "fast-legacy-encode" = [ "fast-hangul-encode" "fast-hanja-encode" "fast-kanji-encode" "fast-gb-hanzi-encode" "fast-big5-hanzi-encode" ]; - "packed_simd" = [ "dep:packed_simd" ]; - "serde" = [ "dep:serde" ]; - "simd-accel" = [ "packed_simd" "packed_simd/into_bits" ]; - }; - resolvedDefaultFeatures = [ "alloc" "default" ]; - }; "endian-type" = rec { crateName = "endian-type"; version = "0.1.2"; @@ -4429,7 +4420,7 @@ rec { } { name = "base64"; - packageId = "base64"; + packageId = "base64 0.21.7"; } { name = "chrono"; @@ -4447,7 +4438,7 @@ rec { } { name = "hyper-rustls"; - packageId = "hyper-rustls"; + packageId = "hyper-rustls 0.24.2"; usesDefaultFeatures = false; features = [ "tokio-runtime" "http1" "http2" ]; } @@ -5121,13 +5112,6 @@ rec { ]; }; - "http-range-header" = rec { - crateName = "http-range-header"; - version = "0.3.1"; - edition = "2018"; - sha256 = "13vm511vq3bhschkw2xi9nhxzkw53m55gn9vxg7qigfxc29spl5d"; - features = { }; - }; "httparse" = rec { crateName = "httparse"; version = "1.8.0"; @@ -5268,11 +5252,11 @@ rec { }; resolvedDefaultFeatures = [ "client" "default" "full" "h2" "http1" "http2" "runtime" "server" "socket2" "stream" "tcp" ]; }; - "hyper 1.3.1" = rec { + "hyper 1.4.1" = rec { crateName = "hyper"; - version = "1.3.1"; + version = "1.4.1"; edition = "2021"; - sha256 = "0va9pjqshsr8zc07m9h4j2821hsmd9lw9j416yisjqh8gp8msmzy"; + sha256 = "01ds8i3q6hw5kw56mavy544m11gkr87zi999siigdl3n1qpd5psh"; authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; @@ -5336,6 +5320,11 @@ rec { packageId = "tokio"; features = [ "sync" ]; } + { + name = "want"; + packageId = "want"; + optional = true; + } ]; devDependencies = [ { @@ -5364,9 +5353,9 @@ rec { "server" = [ "dep:httpdate" "dep:pin-project-lite" "dep:smallvec" ]; "tracing" = [ "dep:tracing" ]; }; - resolvedDefaultFeatures = [ "default" "http1" "http2" "server" ]; + resolvedDefaultFeatures = [ "client" "default" "http1" "http2" "server" ]; }; - "hyper-rustls" = rec { + "hyper-rustls 0.24.2" = rec { crateName = "hyper-rustls"; version = "0.24.2"; edition = "2021"; @@ -5441,7 +5430,99 @@ rec { }; resolvedDefaultFeatures = [ "http1" "http2" "rustls-native-certs" "tokio-runtime" ]; }; - "hyper-timeout" = rec { + "hyper-rustls 0.27.2" = rec { + crateName = "hyper-rustls"; + version = "0.27.2"; + edition = "2021"; + sha256 = "0ma1wyfnqnkz7zyr7wpply3xfvlijd0rqqhb6ajs28c9jhnbxr2y"; + dependencies = [ + { + name = "futures-util"; + packageId = "futures-util"; + usesDefaultFeatures = false; + } + { + name = "http"; + packageId = "http 1.1.0"; + } + { + name = "hyper"; + packageId = "hyper 1.4.1"; + usesDefaultFeatures = false; + } + { + name = "hyper-util"; + packageId = "hyper-util"; + usesDefaultFeatures = false; + features = [ "client-legacy" "tokio" ]; + } + { + name = "rustls"; + packageId = "rustls 0.23.7"; + usesDefaultFeatures = false; + } + { + name = "rustls-native-certs"; + packageId = "rustls-native-certs 0.7.0"; + optional = true; + } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; + } + { + name = "tokio"; + packageId = "tokio"; + } + { + name = "tokio-rustls"; + packageId = "tokio-rustls 0.26.0"; + usesDefaultFeatures = false; + } + { + name = "tower-service"; + packageId = "tower-service"; + } + ]; + devDependencies = [ + { + name = "hyper-util"; + packageId = "hyper-util"; + usesDefaultFeatures = false; + features = [ "server-auto" ]; + } + { + name = "rustls"; + packageId = "rustls 0.23.7"; + usesDefaultFeatures = false; + features = [ "tls12" ]; + } + { + name = "tokio"; + packageId = "tokio"; + features = [ "io-std" "macros" "net" "rt-multi-thread" ]; + } + ]; + features = { + "aws-lc-rs" = [ "rustls/aws_lc_rs" ]; + "default" = [ "native-tokio" "http1" "tls12" "logging" "aws-lc-rs" ]; + "fips" = [ "aws-lc-rs" "rustls/fips" ]; + "http1" = [ "hyper-util/http1" ]; + "http2" = [ "hyper-util/http2" ]; + "log" = [ "dep:log" ]; + "logging" = [ "log" "tokio-rustls/logging" "rustls/logging" ]; + "native-tokio" = [ "rustls-native-certs" ]; + "ring" = [ "rustls/ring" ]; + "rustls-native-certs" = [ "dep:rustls-native-certs" ]; + "rustls-platform-verifier" = [ "dep:rustls-platform-verifier" ]; + "tls12" = [ "tokio-rustls/tls12" "rustls/tls12" ]; + "webpki-roots" = [ "dep:webpki-roots" ]; + "webpki-tokio" = [ "webpki-roots" ]; + }; + resolvedDefaultFeatures = [ "http1" "http2" "native-tokio" "ring" "rustls-native-certs" "tls12" ]; + }; + "hyper-timeout 0.4.1" = rec { crateName = "hyper-timeout"; version = "0.4.1"; edition = "2018"; @@ -5482,11 +5563,57 @@ rec { ]; }; + "hyper-timeout 0.5.1" = rec { + crateName = "hyper-timeout"; + version = "0.5.1"; + edition = "2018"; + sha256 = "14rpyv9zz0ncadn9qgmnjz0hiqk3nav7hglkk1a6yfy8wmhsj0rj"; + authors = [ + "Herman J. Radtke III <herman@hermanradtke.com>" + ]; + dependencies = [ + { + name = "hyper"; + packageId = "hyper 1.4.1"; + } + { + name = "hyper-util"; + packageId = "hyper-util"; + features = [ "client-legacy" "http1" ]; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + { + name = "tokio"; + packageId = "tokio"; + } + { + name = "tower-service"; + packageId = "tower-service"; + } + ]; + devDependencies = [ + { + name = "hyper"; + packageId = "hyper 1.4.1"; + features = [ "http1" ]; + } + { + name = "tokio"; + packageId = "tokio"; + features = [ "io-std" "io-util" "macros" ]; + } + ]; + + }; "hyper-util" = rec { crateName = "hyper-util"; - version = "0.1.3"; + version = "0.1.6"; edition = "2021"; - sha256 = "1akngan7j0n2n0wd25c6952mvqbkj9gp1lcwzyxjc0d37l8yyf6a"; + sha256 = "0mm9biwckhwqz23s5dp02410aw7sw2ibg167jzwv8kzf957jzf9s"; + libName = "hyper_util"; authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; @@ -5496,6 +5623,11 @@ rec { packageId = "bytes"; } { + name = "futures-channel"; + packageId = "futures-channel"; + optional = true; + } + { name = "futures-util"; packageId = "futures-util"; usesDefaultFeatures = false; @@ -5510,7 +5642,7 @@ rec { } { name = "hyper"; - packageId = "hyper 1.3.1"; + packageId = "hyper 1.4.1"; } { name = "pin-project-lite"; @@ -5526,7 +5658,26 @@ rec { name = "tokio"; packageId = "tokio"; optional = true; - features = [ "net" "rt" "time" ]; + usesDefaultFeatures = false; + } + { + name = "tower"; + packageId = "tower"; + optional = true; + usesDefaultFeatures = false; + features = [ "make" "util" ]; + } + { + name = "tower-service"; + packageId = "tower-service"; + optional = true; + } + { + name = "tracing"; + packageId = "tracing"; + optional = true; + usesDefaultFeatures = false; + features = [ "std" ]; } ]; devDependencies = [ @@ -5536,27 +5687,28 @@ rec { } { name = "hyper"; - packageId = "hyper 1.3.1"; + packageId = "hyper 1.4.1"; features = [ "full" ]; } { name = "tokio"; packageId = "tokio"; - features = [ "macros" "test-util" ]; + features = [ "macros" "test-util" "signal" ]; } ]; features = { "client" = [ "hyper/client" "dep:tracing" "dep:futures-channel" "dep:tower" "dep:tower-service" ]; - "client-legacy" = [ "client" ]; - "full" = [ "client" "client-legacy" "server" "server-auto" "service" "http1" "http2" "tokio" ]; + "client-legacy" = [ "client" "dep:socket2" "tokio/sync" ]; + "full" = [ "client" "client-legacy" "server" "server-auto" "server-graceful" "service" "http1" "http2" "tokio" ]; "http1" = [ "hyper/http1" ]; "http2" = [ "hyper/http2" ]; "server" = [ "hyper/server" ]; "server-auto" = [ "server" "http1" "http2" ]; + "server-graceful" = [ "server" "tokio/sync" ]; "service" = [ "dep:tower" "dep:tower-service" ]; - "tokio" = [ "dep:tokio" "dep:socket2" ]; + "tokio" = [ "dep:tokio" "tokio/net" "tokio/rt" "tokio/time" ]; }; - resolvedDefaultFeatures = [ "default" "http1" "http2" "server" "server-auto" "tokio" ]; + resolvedDefaultFeatures = [ "client" "client-legacy" "default" "http1" "http2" "server" "server-auto" "service" "tokio" ]; }; "iana-time-zone" = rec { crateName = "iana-time-zone"; @@ -6620,7 +6772,7 @@ rec { ]; }; - "matchit" = rec { + "matchit 0.7.3" = rec { crateName = "matchit"; version = "0.7.3"; edition = "2021"; @@ -6631,6 +6783,17 @@ rec { features = { }; resolvedDefaultFeatures = [ "default" ]; }; + "matchit 0.8.4" = rec { + crateName = "matchit"; + version = "0.8.4"; + edition = "2021"; + sha256 = "1hzl48fwq1cn5dvshfly6vzkzqhfihya65zpj7nz7lfx82mgzqa7"; + authors = [ + "Ibraheem Ahmed <ibraheem@ibraheem.ca>" + ]; + features = { }; + resolvedDefaultFeatures = [ "default" ]; + }; "md-5" = rec { crateName = "md-5"; version = "0.10.6"; @@ -6730,34 +6893,6 @@ rec { ]; }; - "mime_guess" = rec { - crateName = "mime_guess"; - version = "2.0.4"; - edition = "2015"; - sha256 = "1vs28rxnbfwil6f48hh58lfcx90klcvg68gxdc60spwa4cy2d4j1"; - authors = [ - "Austin Bonander <austin.bonander@gmail.com>" - ]; - dependencies = [ - { - name = "mime"; - packageId = "mime"; - } - { - name = "unicase"; - packageId = "unicase"; - } - ]; - buildDependencies = [ - { - name = "unicase"; - packageId = "unicase"; - } - ]; - features = { - "default" = [ "rev-mappings" ]; - }; - }; "minimal-lexical" = rec { crateName = "minimal-lexical"; version = "0.2.1"; @@ -6911,7 +7046,7 @@ rec { } { name = "prost"; - packageId = "prost"; + packageId = "prost 0.13.1"; } { name = "serde"; @@ -6938,7 +7073,7 @@ rec { } { name = "tonic"; - packageId = "tonic"; + packageId = "tonic 0.12.1"; features = [ "tls" "tls-roots" ]; } { @@ -6947,7 +7082,7 @@ rec { } { name = "tower-http"; - packageId = "tower-http 0.5.2"; + packageId = "tower-http"; features = [ "trace" ]; } { @@ -6979,11 +7114,11 @@ rec { buildDependencies = [ { name = "prost-build"; - packageId = "prost-build"; + packageId = "prost-build 0.13.1"; } { name = "tonic-build"; - packageId = "tonic-build"; + packageId = "tonic-build 0.12.1"; } ]; devDependencies = [ @@ -7503,9 +7638,9 @@ rec { }; "object_store" = rec { crateName = "object_store"; - version = "0.9.1"; + version = "0.10.1"; edition = "2021"; - sha256 = "1cwx0xg57cp3z6xjgrqwp0gxgxsagls4h5cd212pmxpxcn5qywdq"; + sha256 = "1mkag13fnzcgn52smi9h7ssf53as04w9373sz83ikfhkq8rgvszv"; dependencies = [ { name = "async-trait"; @@ -7513,7 +7648,7 @@ rec { } { name = "base64"; - packageId = "base64"; + packageId = "base64 0.22.1"; optional = true; usesDefaultFeatures = false; features = [ "std" ]; @@ -7538,7 +7673,7 @@ rec { } { name = "hyper"; - packageId = "hyper 0.14.28"; + packageId = "hyper 1.4.1"; optional = true; usesDefaultFeatures = false; } @@ -7578,7 +7713,7 @@ rec { packageId = "reqwest"; optional = true; usesDefaultFeatures = false; - features = [ "rustls-tls-native-roots" ]; + features = [ "rustls-tls-native-roots" "http2" ]; } { name = "ring"; @@ -7632,7 +7767,7 @@ rec { devDependencies = [ { name = "hyper"; - packageId = "hyper 0.14.28"; + packageId = "hyper 1.4.1"; features = [ "server" ]; } { @@ -7699,7 +7834,7 @@ rec { ]; }; - "opentelemetry" = rec { + "opentelemetry 0.22.0" = rec { crateName = "opentelemetry"; version = "0.22.0"; edition = "2021"; @@ -7746,11 +7881,54 @@ rec { }; resolvedDefaultFeatures = [ "default" "metrics" "pin-project-lite" "trace" ]; }; + "opentelemetry 0.24.0" = rec { + crateName = "opentelemetry"; + version = "0.24.0"; + edition = "2021"; + sha256 = "15msgya5nandw9chxdr76k7sj9kg6gqj9dyfzrz5pxf4xrimldjc"; + dependencies = [ + { + name = "futures-core"; + packageId = "futures-core"; + } + { + name = "futures-sink"; + packageId = "futures-sink"; + } + { + name = "js-sys"; + packageId = "js-sys"; + target = { target, features }: (("wasm32" == target."arch" or null) && (!("wasi" == target."os" or null))); + } + { + name = "once_cell"; + packageId = "once_cell"; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + optional = true; + } + { + name = "thiserror"; + packageId = "thiserror"; + usesDefaultFeatures = false; + } + ]; + features = { + "default" = [ "trace" "metrics" "logs" ]; + "logs_level_enabled" = [ "logs" ]; + "pin-project-lite" = [ "dep:pin-project-lite" ]; + "testing" = [ "trace" "metrics" ]; + "trace" = [ "pin-project-lite" ]; + }; + resolvedDefaultFeatures = [ "default" "logs" "metrics" "pin-project-lite" "trace" ]; + }; "opentelemetry-http" = rec { crateName = "opentelemetry-http"; - version = "0.11.1"; + version = "0.13.0"; edition = "2021"; - sha256 = "151xfhlakkmi9v6sqarkmxz02sbl2l0nbajgij216rvppxvxr43n"; + sha256 = "1avqmyh42apakbkhjij3c9hl0brnq5v37zk4kpxkhdgf8kgfjcdd"; dependencies = [ { name = "async-trait"; @@ -7762,28 +7940,28 @@ rec { } { name = "http"; - packageId = "http 0.2.11"; + packageId = "http 1.1.0"; usesDefaultFeatures = false; + features = [ "std" ]; } { name = "opentelemetry"; - packageId = "opentelemetry"; + packageId = "opentelemetry 0.24.0"; features = [ "trace" ]; } ]; features = { - "hyper" = [ "dep:hyper" ]; - "isahc" = [ "dep:isahc" ]; + "hyper" = [ "dep:http-body-util" "dep:hyper" "dep:hyper-util" "dep:tokio" ]; "reqwest" = [ "dep:reqwest" ]; "reqwest-rustls" = [ "reqwest" "reqwest/rustls-tls-native-roots" ]; - "tokio" = [ "dep:tokio" ]; + "reqwest-rustls-webpki-roots" = [ "reqwest" "reqwest/rustls-tls-webpki-roots" ]; }; }; "opentelemetry-otlp" = rec { crateName = "opentelemetry-otlp"; - version = "0.15.0"; + version = "0.17.0"; edition = "2021"; - sha256 = "1jxbi5w4xgwg4gcj0lz4310y926bglw25b2546pkkilmjj6nn08s"; + sha256 = "09z70ygp6lfcplnwx7cgf3p3fyq2arkvhxhj8avnz4gv5xh5m4kb"; dependencies = [ { name = "async-trait"; @@ -7795,13 +7973,14 @@ rec { } { name = "http"; - packageId = "http 0.2.11"; + packageId = "http 1.1.0"; optional = true; usesDefaultFeatures = false; + features = [ "std" ]; } { name = "opentelemetry"; - packageId = "opentelemetry"; + packageId = "opentelemetry 0.24.0"; usesDefaultFeatures = false; } { @@ -7810,17 +7989,13 @@ rec { usesDefaultFeatures = false; } { - name = "opentelemetry-semantic-conventions"; - packageId = "opentelemetry-semantic-conventions"; - } - { name = "opentelemetry_sdk"; - packageId = "opentelemetry_sdk"; + packageId = "opentelemetry_sdk 0.24.1"; usesDefaultFeatures = false; } { name = "prost"; - packageId = "prost"; + packageId = "prost 0.13.1"; optional = true; } { @@ -7837,7 +8012,7 @@ rec { } { name = "tonic"; - packageId = "tonic"; + packageId = "tonic 0.12.1"; optional = true; usesDefaultFeatures = false; } @@ -7851,10 +8026,11 @@ rec { } ]; features = { - "default" = [ "grpc-tonic" "trace" ]; + "default" = [ "grpc-tonic" "trace" "metrics" "logs" ]; "grpc-tonic" = [ "tonic" "prost" "http" "tokio" "opentelemetry-proto/gen-tonic" ]; "gzip-tonic" = [ "tonic/gzip" ]; "http" = [ "dep:http" ]; + "http-json" = [ "serde_json" "prost" "opentelemetry-http" "opentelemetry-proto/gen-tonic-messages" "opentelemetry-proto/with-serde" "http" "trace" "metrics" ]; "http-proto" = [ "prost" "opentelemetry-http" "opentelemetry-proto/gen-tonic-messages" "http" "trace" "metrics" ]; "integration-testing" = [ "tonic" "prost" "tokio/full" "trace" ]; "logs" = [ "opentelemetry/logs" "opentelemetry_sdk/logs" "opentelemetry-proto/logs" ]; @@ -7864,47 +8040,58 @@ rec { "reqwest" = [ "dep:reqwest" ]; "reqwest-blocking-client" = [ "reqwest/blocking" "opentelemetry-http/reqwest" ]; "reqwest-client" = [ "reqwest" "opentelemetry-http/reqwest" ]; - "reqwest-rustls" = [ "reqwest" "reqwest/rustls-tls-native-roots" ]; + "reqwest-rustls" = [ "reqwest" "opentelemetry-http/reqwest-rustls" ]; + "reqwest-rustls-webpki-roots" = [ "reqwest" "opentelemetry-http/reqwest-rustls-webpki-roots" ]; "serde" = [ "dep:serde" ]; - "serialize" = [ "serde" ]; + "serde_json" = [ "dep:serde_json" ]; + "serialize" = [ "serde" "serde_json" ]; "tls" = [ "tonic/tls" ]; "tls-roots" = [ "tls" "tonic/tls-roots" ]; + "tls-webpki-roots" = [ "tls" "tonic/tls-webpki-roots" ]; "tokio" = [ "dep:tokio" ]; "tonic" = [ "dep:tonic" ]; "trace" = [ "opentelemetry/trace" "opentelemetry_sdk/trace" "opentelemetry-proto/trace" ]; }; - resolvedDefaultFeatures = [ "default" "grpc-tonic" "http" "prost" "tokio" "tonic" "trace" ]; + resolvedDefaultFeatures = [ "default" "grpc-tonic" "http" "logs" "metrics" "prost" "tokio" "tonic" "trace" ]; }; "opentelemetry-proto" = rec { crateName = "opentelemetry-proto"; - version = "0.5.0"; + version = "0.7.0"; edition = "2021"; - sha256 = "1r5a1k4fryqijhsar36ld806yf82isw11xfnx7d80nwgnv4xv3rs"; + sha256 = "1nahv1dflvwdgi4c4p7ikd59x0yyivf85w02398q9jgrpwh9zvih"; dependencies = [ { name = "opentelemetry"; - packageId = "opentelemetry"; + packageId = "opentelemetry 0.24.0"; usesDefaultFeatures = false; } { name = "opentelemetry_sdk"; - packageId = "opentelemetry_sdk"; + packageId = "opentelemetry_sdk 0.24.1"; usesDefaultFeatures = false; } { name = "prost"; - packageId = "prost"; + packageId = "prost 0.13.1"; optional = true; } { name = "tonic"; - packageId = "tonic"; + packageId = "tonic 0.12.1"; optional = true; usesDefaultFeatures = false; features = [ "codegen" "prost" ]; } ]; + devDependencies = [ + { + name = "opentelemetry"; + packageId = "opentelemetry 0.24.0"; + features = [ "testing" ]; + } + ]; features = { + "default" = [ "full" ]; "full" = [ "gen-tonic" "trace" "logs" "metrics" "zpages" "with-serde" ]; "gen-tonic" = [ "gen-tonic-messages" "tonic/transport" ]; "gen-tonic-messages" = [ "tonic" "prost" ]; @@ -7914,22 +8101,16 @@ rec { "prost" = [ "dep:prost" ]; "schemars" = [ "dep:schemars" ]; "serde" = [ "dep:serde" ]; + "testing" = [ "opentelemetry/testing" ]; "tonic" = [ "dep:tonic" ]; "trace" = [ "opentelemetry/trace" "opentelemetry_sdk/trace" ]; "with-schemars" = [ "schemars" ]; "with-serde" = [ "serde" "hex" ]; "zpages" = [ "trace" ]; }; - resolvedDefaultFeatures = [ "gen-tonic" "gen-tonic-messages" "prost" "tonic" "trace" ]; + resolvedDefaultFeatures = [ "gen-tonic" "gen-tonic-messages" "logs" "metrics" "prost" "tonic" "trace" ]; }; - "opentelemetry-semantic-conventions" = rec { - crateName = "opentelemetry-semantic-conventions"; - version = "0.14.0"; - edition = "2021"; - sha256 = "04197racbkpj75fh9jnwkdznjzv6l2ljpbr8ryfk9f9gqkb5pazr"; - - }; - "opentelemetry_sdk" = rec { + "opentelemetry_sdk 0.22.1" = rec { crateName = "opentelemetry_sdk"; version = "0.22.1"; edition = "2021"; @@ -7970,7 +8151,7 @@ rec { } { name = "opentelemetry"; - packageId = "opentelemetry"; + packageId = "opentelemetry 0.22.0"; } { name = "ordered-float"; @@ -7993,6 +8174,94 @@ rec { packageId = "thiserror"; usesDefaultFeatures = false; } + ]; + features = { + "async-std" = [ "dep:async-std" ]; + "async-trait" = [ "dep:async-trait" ]; + "crossbeam-channel" = [ "dep:crossbeam-channel" ]; + "default" = [ "trace" ]; + "glob" = [ "dep:glob" ]; + "http" = [ "dep:http" ]; + "jaeger_remote_sampler" = [ "trace" "opentelemetry-http" "http" "serde" "serde_json" "url" ]; + "logs" = [ "opentelemetry/logs" "crossbeam-channel" "async-trait" "serde_json" ]; + "logs_level_enabled" = [ "logs" "opentelemetry/logs_level_enabled" ]; + "metrics" = [ "opentelemetry/metrics" "glob" "async-trait" ]; + "opentelemetry-http" = [ "dep:opentelemetry-http" ]; + "percent-encoding" = [ "dep:percent-encoding" ]; + "rand" = [ "dep:rand" ]; + "rt-async-std" = [ "async-std" ]; + "rt-tokio" = [ "tokio" "tokio-stream" ]; + "rt-tokio-current-thread" = [ "tokio" "tokio-stream" ]; + "serde" = [ "dep:serde" ]; + "serde_json" = [ "dep:serde_json" ]; + "testing" = [ "opentelemetry/testing" "trace" "metrics" "logs" "rt-async-std" "rt-tokio" "rt-tokio-current-thread" "tokio/macros" "tokio/rt-multi-thread" ]; + "tokio" = [ "dep:tokio" ]; + "tokio-stream" = [ "dep:tokio-stream" ]; + "trace" = [ "opentelemetry/trace" "crossbeam-channel" "rand" "async-trait" "percent-encoding" ]; + "url" = [ "dep:url" ]; + }; + resolvedDefaultFeatures = [ "async-trait" "crossbeam-channel" "glob" "metrics" "percent-encoding" "rand" "trace" ]; + }; + "opentelemetry_sdk 0.24.1" = rec { + crateName = "opentelemetry_sdk"; + version = "0.24.1"; + edition = "2021"; + sha256 = "1pr8phigsfki77wh79g6vz6flnhgnr09pm18g2hj83y81r4sqbk9"; + dependencies = [ + { + name = "async-trait"; + packageId = "async-trait"; + optional = true; + } + { + name = "futures-channel"; + packageId = "futures-channel"; + } + { + name = "futures-executor"; + packageId = "futures-executor"; + } + { + name = "futures-util"; + packageId = "futures-util"; + usesDefaultFeatures = false; + features = [ "std" "sink" "async-await-macro" ]; + } + { + name = "glob"; + packageId = "glob"; + optional = true; + } + { + name = "once_cell"; + packageId = "once_cell"; + } + { + name = "opentelemetry"; + packageId = "opentelemetry 0.24.0"; + } + { + name = "percent-encoding"; + packageId = "percent-encoding"; + optional = true; + } + { + name = "rand"; + packageId = "rand"; + optional = true; + usesDefaultFeatures = false; + features = [ "std" "std_rng" "small_rng" ]; + } + { + name = "serde_json"; + packageId = "serde_json"; + optional = true; + } + { + name = "thiserror"; + packageId = "thiserror"; + usesDefaultFeatures = false; + } { name = "tokio"; packageId = "tokio"; @@ -8009,12 +8278,11 @@ rec { features = { "async-std" = [ "dep:async-std" ]; "async-trait" = [ "dep:async-trait" ]; - "crossbeam-channel" = [ "dep:crossbeam-channel" ]; - "default" = [ "trace" ]; + "default" = [ "trace" "metrics" "logs" ]; "glob" = [ "dep:glob" ]; "http" = [ "dep:http" ]; "jaeger_remote_sampler" = [ "trace" "opentelemetry-http" "http" "serde" "serde_json" "url" ]; - "logs" = [ "opentelemetry/logs" "crossbeam-channel" "async-trait" "serde_json" ]; + "logs" = [ "opentelemetry/logs" "async-trait" "serde_json" ]; "logs_level_enabled" = [ "logs" "opentelemetry/logs_level_enabled" ]; "metrics" = [ "opentelemetry/metrics" "glob" "async-trait" ]; "opentelemetry-http" = [ "dep:opentelemetry-http" ]; @@ -8028,10 +8296,10 @@ rec { "testing" = [ "opentelemetry/testing" "trace" "metrics" "logs" "rt-async-std" "rt-tokio" "rt-tokio-current-thread" "tokio/macros" "tokio/rt-multi-thread" ]; "tokio" = [ "dep:tokio" ]; "tokio-stream" = [ "dep:tokio-stream" ]; - "trace" = [ "opentelemetry/trace" "crossbeam-channel" "rand" "async-trait" "percent-encoding" ]; + "trace" = [ "opentelemetry/trace" "rand" "async-trait" "percent-encoding" ]; "url" = [ "dep:url" ]; }; - resolvedDefaultFeatures = [ "async-trait" "crossbeam-channel" "default" "glob" "metrics" "percent-encoding" "rand" "rt-tokio" "tokio" "tokio-stream" "trace" ]; + resolvedDefaultFeatures = [ "async-trait" "default" "glob" "logs" "metrics" "percent-encoding" "rand" "rt-tokio" "serde_json" "tokio" "tokio-stream" "trace" ]; }; "ordered-float" = rec { crateName = "ordered-float"; @@ -8806,7 +9074,7 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "bit-set" "default" "fork" "lazy_static" "regex-syntax" "rusty-fork" "std" "tempfile" "timeout" ]; }; - "prost" = rec { + "prost 0.12.3" = rec { crateName = "prost"; version = "0.12.3"; edition = "2021"; @@ -8824,7 +9092,7 @@ rec { } { name = "prost-derive"; - packageId = "prost-derive"; + packageId = "prost-derive 0.12.3"; optional = true; } ]; @@ -8834,7 +9102,37 @@ rec { }; resolvedDefaultFeatures = [ "default" "prost-derive" "std" ]; }; - "prost-build" = rec { + "prost 0.13.1" = rec { + crateName = "prost"; + version = "0.13.1"; + edition = "2021"; + sha256 = "1k1k4g4is0h80c648scs4spyi9r7pi1xid264hgcd276zp9v6gg1"; + authors = [ + "Dan Burkert <dan@danburkert.com>" + "Lucio Franco <luciofranco14@gmail.com>" + "Casper Meijn <casper@meijn.net>" + "Tokio Contributors <team@tokio.rs>" + ]; + dependencies = [ + { + name = "bytes"; + packageId = "bytes"; + usesDefaultFeatures = false; + } + { + name = "prost-derive"; + packageId = "prost-derive 0.13.1"; + optional = true; + } + ]; + features = { + "default" = [ "derive" "std" ]; + "derive" = [ "dep:prost-derive" ]; + "prost-derive" = [ "derive" ]; + }; + resolvedDefaultFeatures = [ "default" "derive" "prost-derive" "std" ]; + }; + "prost-build 0.12.3" = rec { crateName = "prost-build"; version = "0.12.3"; edition = "2021"; @@ -8885,12 +9183,12 @@ rec { } { name = "prost"; - packageId = "prost"; + packageId = "prost 0.12.3"; usesDefaultFeatures = false; } { name = "prost-types"; - packageId = "prost-types"; + packageId = "prost-types 0.12.3"; usesDefaultFeatures = false; } { @@ -8936,7 +9234,91 @@ rec { }; resolvedDefaultFeatures = [ "cleanup-markdown" "default" "format" "prettyplease" "pulldown-cmark" "pulldown-cmark-to-cmark" "syn" ]; }; - "prost-derive" = rec { + "prost-build 0.13.1" = rec { + crateName = "prost-build"; + version = "0.13.1"; + edition = "2021"; + sha256 = "1hbp7cam99q56qf2wp8inwfh59adkzgf676hi07hgpbi1xc85cav"; + authors = [ + "Dan Burkert <dan@danburkert.com>" + "Lucio Franco <luciofranco14@gmail.com>" + "Casper Meijn <casper@meijn.net>" + "Tokio Contributors <team@tokio.rs>" + ]; + dependencies = [ + { + name = "bytes"; + packageId = "bytes"; + usesDefaultFeatures = false; + } + { + name = "heck"; + packageId = "heck"; + } + { + name = "itertools"; + packageId = "itertools 0.12.0"; + usesDefaultFeatures = false; + features = [ "use_alloc" ]; + } + { + name = "log"; + packageId = "log"; + } + { + name = "multimap"; + packageId = "multimap"; + usesDefaultFeatures = false; + } + { + name = "once_cell"; + packageId = "once_cell"; + } + { + name = "petgraph"; + packageId = "petgraph"; + usesDefaultFeatures = false; + } + { + name = "prettyplease"; + packageId = "prettyplease"; + optional = true; + } + { + name = "prost"; + packageId = "prost 0.13.1"; + usesDefaultFeatures = false; + } + { + name = "prost-types"; + packageId = "prost-types 0.13.1"; + usesDefaultFeatures = false; + } + { + name = "regex"; + packageId = "regex"; + usesDefaultFeatures = false; + features = [ "std" "unicode-bool" ]; + } + { + name = "syn"; + packageId = "syn 2.0.48"; + optional = true; + features = [ "full" ]; + } + { + name = "tempfile"; + packageId = "tempfile"; + } + ]; + features = { + "cleanup-markdown" = [ "dep:pulldown-cmark" "dep:pulldown-cmark-to-cmark" ]; + "default" = [ "format" ]; + "format" = [ "dep:prettyplease" "dep:syn" ]; + }; + resolvedDefaultFeatures = [ "default" "format" ]; + }; + "prost-derive 0.12.3" = rec { crateName = "prost-derive"; version = "0.12.3"; edition = "2021"; @@ -8974,7 +9356,44 @@ rec { ]; }; - "prost-types" = rec { + "prost-derive 0.13.1" = rec { + crateName = "prost-derive"; + version = "0.13.1"; + edition = "2021"; + sha256 = "1jng0kwkwiih777f77kn6ja7hdvi7sxbg11nndwagsy4mnqckghq"; + procMacro = true; + authors = [ + "Dan Burkert <dan@danburkert.com>" + "Lucio Franco <luciofranco14@gmail.com>" + "Casper Meijn <casper@meijn.net>" + "Tokio Contributors <team@tokio.rs>" + ]; + dependencies = [ + { + name = "anyhow"; + packageId = "anyhow"; + } + { + name = "itertools"; + packageId = "itertools 0.12.0"; + } + { + name = "proc-macro2"; + packageId = "proc-macro2"; + } + { + name = "quote"; + packageId = "quote"; + } + { + name = "syn"; + packageId = "syn 2.0.48"; + features = [ "extra-traits" ]; + } + ]; + + }; + "prost-types 0.12.3" = rec { crateName = "prost-types"; version = "0.12.3"; edition = "2021"; @@ -8987,7 +9406,32 @@ rec { dependencies = [ { name = "prost"; - packageId = "prost"; + packageId = "prost 0.12.3"; + usesDefaultFeatures = false; + features = [ "prost-derive" ]; + } + ]; + features = { + "default" = [ "std" ]; + "std" = [ "prost/std" ]; + }; + resolvedDefaultFeatures = [ "default" "std" ]; + }; + "prost-types 0.13.1" = rec { + crateName = "prost-types"; + version = "0.13.1"; + edition = "2021"; + sha256 = "1hjww9k35c4fqjd75ziyjvyzl8kv9aqnw841ll64p7gl0n5idrff"; + authors = [ + "Dan Burkert <dan@danburkert.com>" + "Lucio Franco <luciofranco14@gmail.com>" + "Casper Meijn <casper@meijn.net>" + "Tokio Contributors <team@tokio.rs>" + ]; + dependencies = [ + { + name = "prost"; + packageId = "prost 0.13.1"; usesDefaultFeatures = false; features = [ "prost-derive" ]; } @@ -9019,7 +9463,7 @@ rec { } { name = "prost"; - packageId = "prost"; + packageId = "prost 0.12.3"; } { name = "serde"; @@ -9055,15 +9499,15 @@ rec { } { name = "prost"; - packageId = "prost"; + packageId = "prost 0.12.3"; } { name = "prost-build"; - packageId = "prost-build"; + packageId = "prost-build 0.12.3"; } { name = "prost-types"; - packageId = "prost-types"; + packageId = "prost-types 0.12.3"; } { name = "quote"; @@ -9089,7 +9533,7 @@ rec { } { name = "prost"; - packageId = "prost"; + packageId = "prost 0.12.3"; } { name = "prost-wkt"; @@ -9111,15 +9555,15 @@ rec { buildDependencies = [ { name = "prost"; - packageId = "prost"; + packageId = "prost 0.12.3"; } { name = "prost-build"; - packageId = "prost-build"; + packageId = "prost-build 0.12.3"; } { name = "prost-types"; - packageId = "prost-types"; + packageId = "prost-types 0.12.3"; } { name = "prost-wkt-build"; @@ -9229,6 +9673,173 @@ rec { }; resolvedDefaultFeatures = [ "default" "overlapped-lists" "serde" "serialize" ]; }; + "quinn" = rec { + crateName = "quinn"; + version = "0.11.2"; + edition = "2021"; + sha256 = "1bdkir6irdxld7xq2zd58scmm44w3vx1zswq6x0mfy6fpbmfxkp4"; + dependencies = [ + { + name = "bytes"; + packageId = "bytes"; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + { + name = "quinn-proto"; + packageId = "quinn-proto"; + rename = "proto"; + usesDefaultFeatures = false; + } + { + name = "quinn-udp"; + packageId = "quinn-udp"; + rename = "udp"; + usesDefaultFeatures = false; + } + { + name = "rustc-hash"; + packageId = "rustc-hash"; + } + { + name = "rustls"; + packageId = "rustls 0.23.7"; + optional = true; + usesDefaultFeatures = false; + features = [ "ring" "std" ]; + } + { + name = "thiserror"; + packageId = "thiserror"; + } + { + name = "tokio"; + packageId = "tokio"; + features = [ "sync" ]; + } + { + name = "tracing"; + packageId = "tracing"; + } + ]; + devDependencies = [ + { + name = "tokio"; + packageId = "tokio"; + features = [ "rt" "rt-multi-thread" "time" "macros" "sync" ]; + } + ]; + features = { + "async-io" = [ "dep:async-io" ]; + "async-std" = [ "dep:async-std" ]; + "default" = [ "log" "platform-verifier" "ring" "runtime-tokio" "rustls" ]; + "futures-io" = [ "dep:futures-io" ]; + "log" = [ "tracing/log" "proto/log" "udp/log" ]; + "platform-verifier" = [ "proto/platform-verifier" ]; + "ring" = [ "proto/ring" ]; + "runtime-async-std" = [ "async-io" "async-std" ]; + "runtime-smol" = [ "async-io" "smol" ]; + "runtime-tokio" = [ "tokio/time" "tokio/rt" "tokio/net" ]; + "rustls" = [ "dep:rustls" "proto/rustls" "proto/ring" ]; + "smol" = [ "dep:smol" ]; + }; + resolvedDefaultFeatures = [ "ring" "runtime-tokio" "rustls" ]; + }; + "quinn-proto" = rec { + crateName = "quinn-proto"; + version = "0.11.3"; + edition = "2021"; + sha256 = "1zhfcj6fffdgkqdhxzlr18hqmpwqshwbx9280h8bi78h7b01gxfx"; + dependencies = [ + { + name = "bytes"; + packageId = "bytes"; + } + { + name = "rand"; + packageId = "rand"; + } + { + name = "ring"; + packageId = "ring"; + optional = true; + } + { + name = "rustc-hash"; + packageId = "rustc-hash"; + } + { + name = "rustls"; + packageId = "rustls 0.23.7"; + optional = true; + usesDefaultFeatures = false; + features = [ "ring" "std" ]; + } + { + name = "slab"; + packageId = "slab"; + } + { + name = "thiserror"; + packageId = "thiserror"; + } + { + name = "tinyvec"; + packageId = "tinyvec"; + features = [ "alloc" ]; + } + { + name = "tracing"; + packageId = "tracing"; + } + ]; + features = { + "arbitrary" = [ "dep:arbitrary" ]; + "default" = [ "rustls" "log" ]; + "log" = [ "tracing/log" ]; + "platform-verifier" = [ "dep:rustls-platform-verifier" ]; + "ring" = [ "dep:ring" ]; + "rustls" = [ "dep:rustls" "ring" ]; + }; + resolvedDefaultFeatures = [ "ring" "rustls" ]; + }; + "quinn-udp" = rec { + crateName = "quinn-udp"; + version = "0.5.2"; + edition = "2021"; + sha256 = "0ilcrwrah36nqxh329p31ghj3rxm4sw5w4iy2kxwf3w68nf655lh"; + dependencies = [ + { + name = "libc"; + packageId = "libc"; + } + { + name = "once_cell"; + packageId = "once_cell"; + target = { target, features }: (target."windows" or false); + } + { + name = "socket2"; + packageId = "socket2"; + } + { + name = "tracing"; + packageId = "tracing"; + } + { + name = "windows-sys"; + packageId = "windows-sys 0.52.0"; + target = { target, features }: (target."windows" or false); + features = [ "Win32_Foundation" "Win32_System_IO" "Win32_Networking_WinSock" ]; + } + ]; + features = { + "default" = [ "log" ]; + "log" = [ "tracing/log" ]; + }; + }; "quote" = rec { crateName = "quote"; version = "1.0.35"; @@ -9732,27 +10343,22 @@ rec { }; "reqwest" = rec { crateName = "reqwest"; - version = "0.11.23"; - edition = "2018"; - sha256 = "0hgvzb7r46656r9vqhl5qk1kbr2xzjb91yr2cb321160ka6sxc9p"; + version = "0.12.5"; + edition = "2021"; + sha256 = "0dva5mx1cli19adc9igc81ix4si7yiri24ayxdw8652pgnid5mn7"; authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; dependencies = [ { name = "base64"; - packageId = "base64"; + packageId = "base64 0.22.1"; } { name = "bytes"; packageId = "bytes"; } { - name = "encoding_rs"; - packageId = "encoding_rs"; - target = { target, features }: (!("wasm32" == target."arch" or null)); - } - { name = "futures-core"; packageId = "futures-core"; usesDefaultFeatures = false; @@ -9764,31 +10370,43 @@ rec { } { name = "h2"; - packageId = "h2 0.3.26"; + packageId = "h2 0.4.4"; + optional = true; target = { target, features }: (!("wasm32" == target."arch" or null)); } { name = "http"; - packageId = "http 0.2.11"; + packageId = "http 1.1.0"; } { name = "http-body"; - packageId = "http-body 0.4.6"; + packageId = "http-body 1.0.0"; + target = { target, features }: (!("wasm32" == target."arch" or null)); + } + { + name = "http-body-util"; + packageId = "http-body-util"; target = { target, features }: (!("wasm32" == target."arch" or null)); } { name = "hyper"; - packageId = "hyper 0.14.28"; - usesDefaultFeatures = false; + packageId = "hyper 1.4.1"; target = { target, features }: (!("wasm32" == target."arch" or null)); - features = [ "tcp" "http1" "http2" "client" "runtime" ]; + features = [ "http1" "client" ]; } { name = "hyper-rustls"; - packageId = "hyper-rustls"; + packageId = "hyper-rustls 0.27.2"; optional = true; usesDefaultFeatures = false; target = { target, features }: (!("wasm32" == target."arch" or null)); + features = [ "http1" "tls12" ]; + } + { + name = "hyper-util"; + packageId = "hyper-util"; + target = { target, features }: (!("wasm32" == target."arch" or null)); + features = [ "http1" "client" "client-legacy" "tokio" ]; } { name = "ipnet"; @@ -9811,12 +10429,6 @@ rec { target = { target, features }: (!("wasm32" == target."arch" or null)); } { - name = "mime_guess"; - packageId = "mime_guess"; - optional = true; - usesDefaultFeatures = false; - } - { name = "once_cell"; packageId = "once_cell"; target = { target, features }: (!("wasm32" == target."arch" or null)); @@ -9832,23 +10444,39 @@ rec { target = { target, features }: (!("wasm32" == target."arch" or null)); } { + name = "quinn"; + packageId = "quinn"; + optional = true; + usesDefaultFeatures = false; + target = { target, features }: (!("wasm32" == target."arch" or null)); + features = [ "rustls" "runtime-tokio" ]; + } + { name = "rustls"; - packageId = "rustls 0.21.12"; + packageId = "rustls 0.23.7"; optional = true; + usesDefaultFeatures = false; target = { target, features }: (!("wasm32" == target."arch" or null)); - features = [ "dangerous_configuration" ]; + features = [ "std" "tls12" ]; } { name = "rustls-native-certs"; - packageId = "rustls-native-certs 0.6.3"; + packageId = "rustls-native-certs 0.7.0"; optional = true; target = { target, features }: (!("wasm32" == target."arch" or null)); } { name = "rustls-pemfile"; - packageId = "rustls-pemfile 1.0.4"; + packageId = "rustls-pemfile 2.1.0"; + optional = true; + target = { target, features }: (!("wasm32" == target."arch" or null)); + } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; optional = true; target = { target, features }: (!("wasm32" == target."arch" or null)); + features = [ "alloc" ]; } { name = "serde"; @@ -9869,9 +10497,8 @@ rec { packageId = "serde_urlencoded"; } { - name = "system-configuration"; - packageId = "system-configuration"; - target = { target, features }: ("macos" == target."os" or null); + name = "sync_wrapper"; + packageId = "sync_wrapper 1.0.1"; } { name = "tokio"; @@ -9882,9 +10509,11 @@ rec { } { name = "tokio-rustls"; - packageId = "tokio-rustls 0.24.1"; + packageId = "tokio-rustls 0.26.0"; optional = true; + usesDefaultFeatures = false; target = { target, features }: (!("wasm32" == target."arch" or null)); + features = [ "tls12" ]; } { name = "tokio-util"; @@ -9932,11 +10561,31 @@ rec { ]; devDependencies = [ { + name = "futures-util"; + packageId = "futures-util"; + usesDefaultFeatures = false; + target = { target, features }: (!("wasm32" == target."arch" or null)); + features = [ "std" "alloc" ]; + } + { name = "hyper"; - packageId = "hyper 0.14.28"; + packageId = "hyper 1.4.1"; + usesDefaultFeatures = false; + target = { target, features }: (!("wasm32" == target."arch" or null)); + features = [ "http1" "http2" "client" "server" ]; + } + { + name = "hyper-util"; + packageId = "hyper-util"; + target = { target, features }: (!("wasm32" == target."arch" or null)); + features = [ "http1" "http2" "client" "client-legacy" "server-auto" "tokio" ]; + } + { + name = "rustls"; + packageId = "rustls 0.23.7"; usesDefaultFeatures = false; target = { target, features }: (!("wasm32" == target."arch" or null)); - features = [ "tcp" "stream" "http1" "http2" "client" "server" "runtime" ]; + features = [ "ring" ]; } { name = "serde"; @@ -9959,57 +10608,44 @@ rec { } ]; features = { - "__rustls" = [ "hyper-rustls" "tokio-rustls" "rustls" "__tls" "rustls-pemfile" ]; - "async-compression" = [ "dep:async-compression" ]; - "blocking" = [ "futures-util/io" "tokio/rt-multi-thread" "tokio/sync" ]; - "brotli" = [ "async-compression" "async-compression/brotli" "tokio-util" ]; - "cookie_crate" = [ "dep:cookie_crate" ]; - "cookie_store" = [ "dep:cookie_store" ]; - "cookies" = [ "cookie_crate" "cookie_store" ]; - "default" = [ "default-tls" ]; - "default-tls" = [ "hyper-tls" "native-tls-crate" "__tls" "tokio-native-tls" ]; - "deflate" = [ "async-compression" "async-compression/zlib" "tokio-util" ]; - "futures-channel" = [ "dep:futures-channel" ]; - "gzip" = [ "async-compression" "async-compression/gzip" "tokio-util" ]; - "h3" = [ "dep:h3" ]; - "h3-quinn" = [ "dep:h3-quinn" ]; - "http3" = [ "rustls-tls-manual-roots" "h3" "h3-quinn" "quinn" "futures-channel" ]; - "hyper-rustls" = [ "dep:hyper-rustls" ]; - "hyper-tls" = [ "dep:hyper-tls" ]; - "json" = [ "serde_json" ]; - "mime_guess" = [ "dep:mime_guess" ]; - "multipart" = [ "mime_guess" ]; + "__rustls" = [ "dep:hyper-rustls" "dep:tokio-rustls" "dep:rustls" "__tls" "dep:rustls-pemfile" "dep:rustls-pki-types" ]; + "__rustls-ring" = [ "hyper-rustls?/ring" "tokio-rustls?/ring" "rustls?/ring" "quinn?/ring" ]; + "__tls" = [ "dep:rustls-pemfile" "tokio/io-util" ]; + "blocking" = [ "dep:futures-channel" "futures-channel?/sink" "futures-util/io" "futures-util/sink" "tokio/sync" ]; + "brotli" = [ "dep:async-compression" "async-compression?/brotli" "dep:tokio-util" ]; + "charset" = [ "dep:encoding_rs" ]; + "cookies" = [ "dep:cookie_crate" "dep:cookie_store" ]; + "default" = [ "default-tls" "charset" "http2" "macos-system-configuration" ]; + "default-tls" = [ "dep:hyper-tls" "dep:native-tls-crate" "__tls" "dep:tokio-native-tls" ]; + "deflate" = [ "dep:async-compression" "async-compression?/zlib" "dep:tokio-util" ]; + "gzip" = [ "dep:async-compression" "async-compression?/gzip" "dep:tokio-util" ]; + "h2" = [ "dep:h2" ]; + "hickory-dns" = [ "dep:hickory-resolver" ]; + "http2" = [ "h2" "hyper/http2" "hyper-util/http2" "hyper-rustls?/http2" ]; + "http3" = [ "rustls-tls-manual-roots" "dep:h3" "dep:h3-quinn" "dep:quinn" "dep:slab" "dep:futures-channel" ]; + "json" = [ "dep:serde_json" ]; + "macos-system-configuration" = [ "dep:system-configuration" ]; + "multipart" = [ "dep:mime_guess" ]; "native-tls" = [ "default-tls" ]; - "native-tls-alpn" = [ "native-tls" "native-tls-crate/alpn" ]; - "native-tls-crate" = [ "dep:native-tls-crate" ]; - "native-tls-vendored" = [ "native-tls" "native-tls-crate/vendored" ]; - "quinn" = [ "dep:quinn" ]; - "rustls" = [ "dep:rustls" ]; - "rustls-native-certs" = [ "dep:rustls-native-certs" ]; - "rustls-pemfile" = [ "dep:rustls-pemfile" ]; + "native-tls-alpn" = [ "native-tls" "native-tls-crate?/alpn" "hyper-tls?/alpn" ]; + "native-tls-vendored" = [ "native-tls" "native-tls-crate?/vendored" ]; "rustls-tls" = [ "rustls-tls-webpki-roots" ]; - "rustls-tls-manual-roots" = [ "__rustls" ]; - "rustls-tls-native-roots" = [ "rustls-native-certs" "__rustls" ]; - "rustls-tls-webpki-roots" = [ "webpki-roots" "__rustls" ]; - "serde_json" = [ "dep:serde_json" ]; - "socks" = [ "tokio-socks" ]; - "stream" = [ "tokio/fs" "tokio-util" "wasm-streams" ]; - "tokio-native-tls" = [ "dep:tokio-native-tls" ]; - "tokio-rustls" = [ "dep:tokio-rustls" ]; - "tokio-socks" = [ "dep:tokio-socks" ]; - "tokio-util" = [ "dep:tokio-util" ]; - "trust-dns" = [ "trust-dns-resolver" ]; - "trust-dns-resolver" = [ "dep:trust-dns-resolver" ]; - "wasm-streams" = [ "dep:wasm-streams" ]; - "webpki-roots" = [ "dep:webpki-roots" ]; + "rustls-tls-manual-roots" = [ "__rustls" "__rustls-ring" ]; + "rustls-tls-manual-roots-no-provider" = [ "__rustls" ]; + "rustls-tls-native-roots" = [ "dep:rustls-native-certs" "hyper-rustls?/native-tokio" "__rustls" "__rustls-ring" ]; + "rustls-tls-no-provider" = [ "rustls-tls-manual-roots-no-provider" ]; + "rustls-tls-webpki-roots" = [ "dep:webpki-roots" "hyper-rustls?/webpki-tokio" "__rustls" "__rustls-ring" ]; + "socks" = [ "dep:tokio-socks" ]; + "stream" = [ "tokio/fs" "dep:tokio-util" "dep:wasm-streams" ]; + "zstd" = [ "dep:async-compression" "async-compression?/zstd" "dep:tokio-util" ]; }; - resolvedDefaultFeatures = [ "__rustls" "__tls" "hyper-rustls" "json" "mime_guess" "multipart" "rustls" "rustls-native-certs" "rustls-pemfile" "rustls-tls-native-roots" "serde_json" "stream" "tokio-rustls" "tokio-util" "wasm-streams" ]; + resolvedDefaultFeatures = [ "__rustls" "__rustls-ring" "__tls" "h2" "http2" "json" "rustls-tls-native-roots" "stream" ]; }; "reqwest-middleware" = rec { crateName = "reqwest-middleware"; - version = "0.2.5"; + version = "0.3.2"; edition = "2018"; - sha256 = "05j2k29mrdc23cqpyiqirj61i74r3cspwv19y25j73ka4f3mjwss"; + sha256 = "0s0jrbn3ns8l07qjjwmq62r9g2w1jvllr8qpph6f0szyvlrnld1r"; authors = [ "Rodrigo Gryzinski <rodrigo.gryzinski@truelayer.com>" ]; @@ -10024,34 +10660,40 @@ rec { } { name = "http"; - packageId = "http 0.2.11"; + packageId = "http 1.1.0"; } { name = "reqwest"; packageId = "reqwest"; usesDefaultFeatures = false; - features = [ "json" "multipart" ]; } { name = "serde"; packageId = "serde"; } { - name = "task-local-extensions"; - packageId = "task-local-extensions"; - } - { name = "thiserror"; packageId = "thiserror"; } + { + name = "tower-service"; + packageId = "tower-service"; + } ]; - + features = { + "charset" = [ "reqwest/charset" ]; + "http2" = [ "reqwest/http2" ]; + "json" = [ "reqwest/json" ]; + "multipart" = [ "reqwest/multipart" ]; + "rustls-tls" = [ "reqwest/rustls-tls" ]; + }; }; "reqwest-tracing" = rec { crateName = "reqwest-tracing"; - version = "0.4.8"; + version = "0.5.2"; edition = "2018"; - sha256 = "10zn6vka710vn0r4vi8lpzmdm4nfnc2171cqxbiagmsk87jkh20r"; + sha256 = "0vg7vfdsh3c15xawpy08z0576s5pkrkjmmkq0bdhy8fw0nnxqiaf"; + libName = "reqwest_tracing"; authors = [ "Rodrigo Gryzinski <rodrigo.gryzinski@truelayer.com>" ]; @@ -10071,12 +10713,16 @@ rec { features = [ "js" ]; } { + name = "http"; + packageId = "http 1.1.0"; + } + { name = "matchit"; - packageId = "matchit"; + packageId = "matchit 0.8.4"; } { name = "opentelemetry"; - packageId = "opentelemetry"; + packageId = "opentelemetry 0.22.0"; rename = "opentelemetry_0_22_pkg"; optional = true; } @@ -10090,51 +10736,36 @@ rec { packageId = "reqwest-middleware"; } { - name = "task-local-extensions"; - packageId = "task-local-extensions"; - } - { name = "tracing"; packageId = "tracing"; } { name = "tracing-opentelemetry"; - packageId = "tracing-opentelemetry"; + packageId = "tracing-opentelemetry 0.23.0"; rename = "tracing-opentelemetry_0_23_pkg"; optional = true; } ]; + devDependencies = [ + { + name = "reqwest"; + packageId = "reqwest"; + features = [ "rustls-tls" ]; + } + ]; features = { - "opentelemetry_0_13" = [ "opentelemetry_0_13_pkg" "tracing-opentelemetry_0_12_pkg" ]; - "opentelemetry_0_13_pkg" = [ "dep:opentelemetry_0_13_pkg" ]; - "opentelemetry_0_14" = [ "opentelemetry_0_14_pkg" "tracing-opentelemetry_0_13_pkg" ]; - "opentelemetry_0_14_pkg" = [ "dep:opentelemetry_0_14_pkg" ]; - "opentelemetry_0_15" = [ "opentelemetry_0_15_pkg" "tracing-opentelemetry_0_14_pkg" ]; - "opentelemetry_0_15_pkg" = [ "dep:opentelemetry_0_15_pkg" ]; - "opentelemetry_0_16" = [ "opentelemetry_0_16_pkg" "tracing-opentelemetry_0_16_pkg" ]; - "opentelemetry_0_16_pkg" = [ "dep:opentelemetry_0_16_pkg" ]; - "opentelemetry_0_17" = [ "opentelemetry_0_17_pkg" "tracing-opentelemetry_0_17_pkg" ]; - "opentelemetry_0_17_pkg" = [ "dep:opentelemetry_0_17_pkg" ]; - "opentelemetry_0_18" = [ "opentelemetry_0_18_pkg" "tracing-opentelemetry_0_18_pkg" ]; - "opentelemetry_0_18_pkg" = [ "dep:opentelemetry_0_18_pkg" ]; - "opentelemetry_0_19" = [ "opentelemetry_0_19_pkg" "tracing-opentelemetry_0_19_pkg" ]; - "opentelemetry_0_19_pkg" = [ "dep:opentelemetry_0_19_pkg" ]; - "opentelemetry_0_20" = [ "opentelemetry_0_20_pkg" "tracing-opentelemetry_0_20_pkg" ]; + "opentelemetry_0_20" = [ "opentelemetry_0_20_pkg" "tracing-opentelemetry_0_21_pkg" ]; "opentelemetry_0_20_pkg" = [ "dep:opentelemetry_0_20_pkg" ]; "opentelemetry_0_21" = [ "opentelemetry_0_21_pkg" "tracing-opentelemetry_0_22_pkg" ]; "opentelemetry_0_21_pkg" = [ "dep:opentelemetry_0_21_pkg" ]; "opentelemetry_0_22" = [ "opentelemetry_0_22_pkg" "tracing-opentelemetry_0_23_pkg" ]; "opentelemetry_0_22_pkg" = [ "dep:opentelemetry_0_22_pkg" ]; - "tracing-opentelemetry_0_12_pkg" = [ "dep:tracing-opentelemetry_0_12_pkg" ]; - "tracing-opentelemetry_0_13_pkg" = [ "dep:tracing-opentelemetry_0_13_pkg" ]; - "tracing-opentelemetry_0_14_pkg" = [ "dep:tracing-opentelemetry_0_14_pkg" ]; - "tracing-opentelemetry_0_16_pkg" = [ "dep:tracing-opentelemetry_0_16_pkg" ]; - "tracing-opentelemetry_0_17_pkg" = [ "dep:tracing-opentelemetry_0_17_pkg" ]; - "tracing-opentelemetry_0_18_pkg" = [ "dep:tracing-opentelemetry_0_18_pkg" ]; - "tracing-opentelemetry_0_19_pkg" = [ "dep:tracing-opentelemetry_0_19_pkg" ]; - "tracing-opentelemetry_0_20_pkg" = [ "dep:tracing-opentelemetry_0_20_pkg" ]; + "opentelemetry_0_23" = [ "opentelemetry_0_23_pkg" "tracing-opentelemetry_0_24_pkg" ]; + "opentelemetry_0_23_pkg" = [ "dep:opentelemetry_0_23_pkg" ]; + "tracing-opentelemetry_0_21_pkg" = [ "dep:tracing-opentelemetry_0_21_pkg" ]; "tracing-opentelemetry_0_22_pkg" = [ "dep:tracing-opentelemetry_0_22_pkg" ]; "tracing-opentelemetry_0_23_pkg" = [ "dep:tracing-opentelemetry_0_23_pkg" ]; + "tracing-opentelemetry_0_24_pkg" = [ "dep:tracing-opentelemetry_0_24_pkg" ]; }; resolvedDefaultFeatures = [ "opentelemetry_0_22" "opentelemetry_0_22_pkg" "tracing-opentelemetry_0_23_pkg" ]; }; @@ -10567,7 +11198,7 @@ rec { "read_buf" = [ "rustversion" ]; "rustversion" = [ "dep:rustversion" ]; }; - resolvedDefaultFeatures = [ "dangerous_configuration" "default" "log" "logging" "tls12" ]; + resolvedDefaultFeatures = [ "default" "log" "logging" "tls12" ]; }; "rustls 0.22.4" = rec { crateName = "rustls"; @@ -10625,6 +11256,72 @@ rec { }; resolvedDefaultFeatures = [ "log" "logging" "ring" "tls12" ]; }; + "rustls 0.23.7" = rec { + crateName = "rustls"; + version = "0.23.7"; + edition = "2021"; + sha256 = "0yv7bh16rwhn6fnlb3wnixb2y4in9gf3z3ysa8k3zbgh3nbdpfzb"; + dependencies = [ + { + name = "log"; + packageId = "log"; + optional = true; + } + { + name = "once_cell"; + packageId = "once_cell"; + usesDefaultFeatures = false; + features = [ "alloc" "race" ]; + } + { + name = "ring"; + packageId = "ring"; + optional = true; + } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; + features = [ "alloc" ]; + } + { + name = "rustls-webpki"; + packageId = "rustls-webpki 0.102.2"; + rename = "webpki"; + usesDefaultFeatures = false; + features = [ "alloc" ]; + } + { + name = "subtle"; + packageId = "subtle"; + usesDefaultFeatures = false; + } + { + name = "zeroize"; + packageId = "zeroize"; + } + ]; + devDependencies = [ + { + name = "log"; + packageId = "log"; + } + ]; + features = { + "aws-lc-rs" = [ "aws_lc_rs" ]; + "aws_lc_rs" = [ "dep:aws-lc-rs" "webpki/aws_lc_rs" ]; + "default" = [ "aws_lc_rs" "logging" "std" "tls12" ]; + "fips" = [ "aws_lc_rs" "aws-lc-rs?/fips" ]; + "hashbrown" = [ "dep:hashbrown" ]; + "log" = [ "dep:log" ]; + "logging" = [ "log" ]; + "read_buf" = [ "rustversion" "std" ]; + "ring" = [ "dep:ring" "webpki/ring" ]; + "rustversion" = [ "dep:rustversion" ]; + "std" = [ "webpki/std" "pki-types/std" "once_cell/std" ]; + }; + resolvedDefaultFeatures = [ "log" "logging" "ring" "std" "tls12" ]; + }; "rustls-native-certs 0.6.3" = rec { crateName = "rustls-native-certs"; version = "0.6.3"; @@ -10694,7 +11391,7 @@ rec { dependencies = [ { name = "base64"; - packageId = "base64"; + packageId = "base64 0.21.7"; } ]; @@ -10707,7 +11404,7 @@ rec { dependencies = [ { name = "base64"; - packageId = "base64"; + packageId = "base64 0.21.7"; usesDefaultFeatures = false; features = [ "alloc" ]; } @@ -11372,7 +12069,7 @@ rec { dependencies = [ { name = "base64"; - packageId = "base64"; + packageId = "base64 0.21.7"; optional = true; usesDefaultFeatures = false; } @@ -12121,50 +12818,6 @@ rec { "futures-core" = [ "dep:futures-core" ]; }; }; - "system-configuration" = rec { - crateName = "system-configuration"; - version = "0.5.1"; - edition = "2021"; - sha256 = "1rz0r30xn7fiyqay2dvzfy56cvaa3km74hnbz2d72p97bkf3lfms"; - authors = [ - "Mullvad VPN" - ]; - dependencies = [ - { - name = "bitflags"; - packageId = "bitflags 1.3.2"; - } - { - name = "core-foundation"; - packageId = "core-foundation"; - } - { - name = "system-configuration-sys"; - packageId = "system-configuration-sys"; - } - ]; - - }; - "system-configuration-sys" = rec { - crateName = "system-configuration-sys"; - version = "0.5.0"; - edition = "2021"; - sha256 = "1jckxvdr37bay3i9v52izgy52dg690x5xfg3hd394sv2xf4b2px7"; - authors = [ - "Mullvad VPN" - ]; - dependencies = [ - { - name = "core-foundation-sys"; - packageId = "core-foundation-sys"; - } - { - name = "libc"; - packageId = "libc"; - } - ]; - - }; "tabwriter" = rec { crateName = "tabwriter"; version = "1.4.0"; @@ -12182,23 +12835,6 @@ rec { features = { }; resolvedDefaultFeatures = [ "default" ]; }; - "task-local-extensions" = rec { - crateName = "task-local-extensions"; - version = "0.1.4"; - edition = "2018"; - sha256 = "1s1l0i4qzgxpjxmy3ng4fik2ki5jgngypzj06a782cyhwmk3hcms"; - authors = [ - "Conrad Ludgate <conrad.ludgate@truelayer.com>" - "Rodrigo Gryzinski <rodrigo.gryzinski@truelayer.com>" - ]; - dependencies = [ - { - name = "pin-utils"; - packageId = "pin-utils"; - } - ]; - - }; "tempfile" = rec { crateName = "tempfile"; version = "3.9.0"; @@ -12750,9 +13386,10 @@ rec { }; "tokio-listener" = rec { crateName = "tokio-listener"; - version = "0.4.2"; + version = "0.4.3"; edition = "2021"; - sha256 = "1cm6r5dmpq96s8gw9dgsinq5g8s466j48dg7dckwc4gc28g6cd21"; + sha256 = "0iigg0w7n4r3ggcz0lj0vb2smq93dlwrqr06r1di54ij2afl6jli"; + libName = "tokio_listener"; dependencies = [ { name = "axum"; @@ -12782,7 +13419,7 @@ rec { } { name = "hyper"; - packageId = "hyper 1.3.1"; + packageId = "hyper 1.4.1"; rename = "hyper1"; optional = true; features = [ "server" ]; @@ -12824,8 +13461,8 @@ rec { } { name = "tonic"; - packageId = "tonic"; - rename = "tonic"; + packageId = "tonic 0.12.1"; + rename = "tonic_012"; optional = true; } { @@ -12871,11 +13508,12 @@ rec { "socket_options" = [ "socket2" ]; "tokio-util" = [ "dep:tokio-util" ]; "tonic010" = [ "dep:tonic_010" ]; - "tonic011" = [ "dep:tonic" ]; + "tonic011" = [ "dep:tonic_011" ]; + "tonic012" = [ "dep:tonic_012" ]; "unix_path_tools" = [ "nix" ]; "user_facing_default" = [ "inetd" "unix" "unix_path_tools" "sd_listen" "socket_options" ]; }; - resolvedDefaultFeatures = [ "axum07" "clap" "default" "inetd" "multi-listener" "nix" "sd_listen" "socket2" "socket_options" "tokio-util" "tonic011" "unix" "unix_path_tools" "user_facing_default" ]; + resolvedDefaultFeatures = [ "axum07" "clap" "default" "inetd" "multi-listener" "nix" "sd_listen" "socket2" "socket_options" "tokio-util" "tonic012" "unix" "unix_path_tools" "user_facing_default" ]; }; "tokio-macros" = rec { crateName = "tokio-macros"; @@ -12965,7 +13603,6 @@ rec { "secret_extraction" = [ "rustls/secret_extraction" ]; "tls12" = [ "rustls/tls12" ]; }; - resolvedDefaultFeatures = [ "default" "logging" "tls12" ]; }; "tokio-rustls 0.25.0" = rec { crateName = "tokio-rustls"; @@ -13003,6 +13640,46 @@ rec { }; resolvedDefaultFeatures = [ "default" "logging" "ring" "tls12" ]; }; + "tokio-rustls 0.26.0" = rec { + crateName = "tokio-rustls"; + version = "0.26.0"; + edition = "2021"; + sha256 = "1m00czrmk8x7pdjnz10a3da3i1d0sdf9j9vfp5dnk5ss1q6w8yqc"; + dependencies = [ + { + name = "rustls"; + packageId = "rustls 0.23.7"; + usesDefaultFeatures = false; + features = [ "std" ]; + } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; + } + { + name = "tokio"; + packageId = "tokio"; + } + ]; + devDependencies = [ + { + name = "tokio"; + packageId = "tokio"; + features = [ "full" ]; + } + ]; + features = { + "aws-lc-rs" = [ "aws_lc_rs" ]; + "aws_lc_rs" = [ "rustls/aws_lc_rs" ]; + "default" = [ "logging" "tls12" "aws_lc_rs" ]; + "fips" = [ "rustls/fips" ]; + "logging" = [ "rustls/logging" ]; + "ring" = [ "rustls/ring" ]; + "tls12" = [ "rustls/tls12" ]; + }; + resolvedDefaultFeatures = [ "logging" "ring" "tls12" ]; + }; "tokio-stream" = rec { crateName = "tokio-stream"; version = "0.1.14"; @@ -13319,7 +13996,7 @@ rec { }; resolvedDefaultFeatures = [ "default" "serde" ]; }; - "tonic" = rec { + "tonic 0.11.0" = rec { crateName = "tonic"; version = "0.11.0"; edition = "2021"; @@ -13346,7 +14023,7 @@ rec { } { name = "base64"; - packageId = "base64"; + packageId = "base64 0.21.7"; } { name = "bytes"; @@ -13373,7 +14050,7 @@ rec { } { name = "hyper-timeout"; - packageId = "hyper-timeout"; + packageId = "hyper-timeout 0.4.1"; optional = true; } { @@ -13386,17 +14063,12 @@ rec { } { name = "prost"; - packageId = "prost"; + packageId = "prost 0.12.3"; optional = true; usesDefaultFeatures = false; features = [ "std" ]; } { - name = "rustls-native-certs"; - packageId = "rustls-native-certs 0.7.0"; - optional = true; - } - { name = "rustls-pemfile"; packageId = "rustls-pemfile 2.1.0"; optional = true; @@ -13463,9 +14135,172 @@ rec { "transport" = [ "dep:async-stream" "dep:axum" "channel" "dep:h2" "dep:hyper" "tokio/net" "tokio/time" "dep:tower" "dep:hyper-timeout" ]; "zstd" = [ "dep:zstd" ]; }; - resolvedDefaultFeatures = [ "channel" "codegen" "default" "prost" "tls" "tls-roots" "tls-roots-common" "transport" ]; + resolvedDefaultFeatures = [ "channel" "codegen" "default" "prost" "tls" "transport" ]; + }; + "tonic 0.12.1" = rec { + crateName = "tonic"; + version = "0.12.1"; + edition = "2021"; + sha256 = "00bl9i4fal2s90g1p877053dkpbxvgsqj5c24y6mka5bj559yr9q"; + authors = [ + "Lucio Franco <luciofranco14@gmail.com>" + ]; + dependencies = [ + { + name = "async-stream"; + packageId = "async-stream"; + optional = true; + } + { + name = "async-trait"; + packageId = "async-trait"; + optional = true; + } + { + name = "axum"; + packageId = "axum 0.7.5"; + optional = true; + usesDefaultFeatures = false; + } + { + name = "base64"; + packageId = "base64 0.22.1"; + } + { + name = "bytes"; + packageId = "bytes"; + } + { + name = "h2"; + packageId = "h2 0.4.4"; + optional = true; + } + { + name = "http"; + packageId = "http 1.1.0"; + } + { + name = "http-body"; + packageId = "http-body 1.0.0"; + } + { + name = "http-body-util"; + packageId = "http-body-util"; + } + { + name = "hyper"; + packageId = "hyper 1.4.1"; + optional = true; + features = [ "http1" "http2" ]; + } + { + name = "hyper-timeout"; + packageId = "hyper-timeout 0.5.1"; + optional = true; + } + { + name = "hyper-util"; + packageId = "hyper-util"; + optional = true; + features = [ "tokio" ]; + } + { + name = "percent-encoding"; + packageId = "percent-encoding"; + } + { + name = "pin-project"; + packageId = "pin-project"; + } + { + name = "prost"; + packageId = "prost 0.13.1"; + optional = true; + usesDefaultFeatures = false; + features = [ "std" ]; + } + { + name = "rustls-native-certs"; + packageId = "rustls-native-certs 0.7.0"; + optional = true; + } + { + name = "rustls-pemfile"; + packageId = "rustls-pemfile 2.1.0"; + optional = true; + } + { + name = "socket2"; + packageId = "socket2"; + optional = true; + features = [ "all" ]; + } + { + name = "tokio"; + packageId = "tokio"; + optional = true; + usesDefaultFeatures = false; + } + { + name = "tokio-rustls"; + packageId = "tokio-rustls 0.26.0"; + optional = true; + usesDefaultFeatures = false; + features = [ "logging" "tls12" "ring" ]; + } + { + name = "tokio-stream"; + packageId = "tokio-stream"; + usesDefaultFeatures = false; + } + { + name = "tower"; + packageId = "tower"; + optional = true; + usesDefaultFeatures = false; + } + { + name = "tower-layer"; + packageId = "tower-layer"; + } + { + name = "tower-service"; + packageId = "tower-service"; + } + { + name = "tracing"; + packageId = "tracing"; + } + ]; + devDependencies = [ + { + name = "tokio"; + packageId = "tokio"; + features = [ "rt" "macros" ]; + } + { + name = "tower"; + packageId = "tower"; + features = [ "full" ]; + } + ]; + features = { + "channel" = [ "dep:hyper" "hyper?/client" "dep:hyper-util" "hyper-util?/client-legacy" "dep:tower" "tower?/balance" "tower?/buffer" "tower?/discover" "tower?/limit" "dep:tokio" "tokio?/time" "dep:hyper-timeout" ]; + "codegen" = [ "dep:async-trait" ]; + "default" = [ "transport" "codegen" "prost" ]; + "gzip" = [ "dep:flate2" ]; + "prost" = [ "dep:prost" ]; + "router" = [ "dep:axum" "dep:tower" "tower?/util" ]; + "server" = [ "router" "dep:async-stream" "dep:h2" "dep:hyper" "hyper?/server" "dep:hyper-util" "hyper-util?/service" "hyper-util?/server-auto" "dep:socket2" "dep:tokio" "tokio?/macros" "tokio?/net" "tokio?/time" "tokio-stream/net" "dep:tower" "tower?/util" "tower?/limit" ]; + "tls" = [ "dep:rustls-pemfile" "dep:tokio-rustls" "dep:tokio" "tokio?/rt" "tokio?/macros" ]; + "tls-roots" = [ "tls" "channel" "dep:rustls-native-certs" ]; + "tls-webpki-roots" = [ "tls" "channel" "dep:webpki-roots" ]; + "transport" = [ "server" "channel" ]; + "zstd" = [ "dep:zstd" ]; + }; + resolvedDefaultFeatures = [ "channel" "codegen" "default" "prost" "router" "server" "tls" "tls-roots" "transport" ]; }; - "tonic-build" = rec { + "tonic-build 0.11.0" = rec { crateName = "tonic-build"; version = "0.11.0"; edition = "2021"; @@ -13484,7 +14319,7 @@ rec { } { name = "prost-build"; - packageId = "prost-build"; + packageId = "prost-build 0.12.3"; optional = true; } { @@ -13504,11 +14339,50 @@ rec { }; resolvedDefaultFeatures = [ "cleanup-markdown" "default" "prost" "prost-build" "transport" ]; }; + "tonic-build 0.12.1" = rec { + crateName = "tonic-build"; + version = "0.12.1"; + edition = "2021"; + sha256 = "0r5riq6gm79hmmsd1z6rdziszava2y8phf1z7rr2005xlb2r50sn"; + authors = [ + "Lucio Franco <luciofranco14@gmail.com>" + ]; + dependencies = [ + { + name = "prettyplease"; + packageId = "prettyplease"; + } + { + name = "proc-macro2"; + packageId = "proc-macro2"; + } + { + name = "prost-build"; + packageId = "prost-build 0.13.1"; + optional = true; + } + { + name = "quote"; + packageId = "quote"; + } + { + name = "syn"; + packageId = "syn 2.0.48"; + } + ]; + features = { + "cleanup-markdown" = [ "prost" "prost-build/cleanup-markdown" ]; + "default" = [ "transport" "prost" ]; + "prost" = [ "prost-build" ]; + "prost-build" = [ "dep:prost-build" ]; + }; + resolvedDefaultFeatures = [ "default" "prost" "prost-build" "transport" ]; + }; "tonic-reflection" = rec { crateName = "tonic-reflection"; - version = "0.11.0"; + version = "0.12.1"; edition = "2021"; - sha256 = "19xn3kyg062d7y1cnw537v9cxkzzcrnfri0jb29fbyn0smxj532l"; + sha256 = "0wy1vdj4fj90j6zjqs78c2fvwcl9krxiz6709idspsbksqxchhmp"; authors = [ "James Nugent <james@jen20.com>" "Samani G. Gikandi <samani@gojulas.com>" @@ -13516,11 +14390,11 @@ rec { dependencies = [ { name = "prost"; - packageId = "prost"; + packageId = "prost 0.13.1"; } { name = "prost-types"; - packageId = "prost-types"; + packageId = "prost-types 0.13.1"; optional = true; } { @@ -13537,7 +14411,7 @@ rec { } { name = "tonic"; - packageId = "tonic"; + packageId = "tonic 0.12.1"; usesDefaultFeatures = false; features = [ "codegen" "prost" ]; } @@ -13545,7 +14419,7 @@ rec { devDependencies = [ { name = "tonic"; - packageId = "tonic"; + packageId = "tonic 0.12.1"; usesDefaultFeatures = false; features = [ "transport" ]; } @@ -13678,107 +14552,7 @@ rec { }; resolvedDefaultFeatures = [ "__common" "balance" "buffer" "default" "discover" "futures-core" "futures-util" "indexmap" "limit" "load" "log" "make" "pin-project" "pin-project-lite" "rand" "ready-cache" "slab" "timeout" "tokio" "tokio-util" "tracing" "util" ]; }; - "tower-http 0.4.4" = rec { - crateName = "tower-http"; - version = "0.4.4"; - edition = "2018"; - sha256 = "0h0i2flrw25zwxv72sifq4v5mwcb030spksy7r2a4xl2d4fvpib1"; - authors = [ - "Tower Maintainers <team@tower-rs.com>" - ]; - dependencies = [ - { - name = "bitflags"; - packageId = "bitflags 2.4.2"; - } - { - name = "bytes"; - packageId = "bytes"; - } - { - name = "futures-core"; - packageId = "futures-core"; - } - { - name = "futures-util"; - packageId = "futures-util"; - usesDefaultFeatures = false; - } - { - name = "http"; - packageId = "http 0.2.11"; - } - { - name = "http-body"; - packageId = "http-body 0.4.6"; - } - { - name = "http-range-header"; - packageId = "http-range-header"; - } - { - name = "pin-project-lite"; - packageId = "pin-project-lite"; - } - { - name = "tower-layer"; - packageId = "tower-layer"; - } - { - name = "tower-service"; - packageId = "tower-service"; - } - { - name = "tracing"; - packageId = "tracing"; - optional = true; - usesDefaultFeatures = false; - } - ]; - devDependencies = [ - { - name = "bytes"; - packageId = "bytes"; - } - ]; - features = { - "async-compression" = [ "dep:async-compression" ]; - "auth" = [ "base64" "validate-request" ]; - "base64" = [ "dep:base64" ]; - "catch-panic" = [ "tracing" "futures-util/std" ]; - "compression-br" = [ "async-compression/brotli" "tokio-util" "tokio" ]; - "compression-deflate" = [ "async-compression/zlib" "tokio-util" "tokio" ]; - "compression-full" = [ "compression-br" "compression-deflate" "compression-gzip" "compression-zstd" ]; - "compression-gzip" = [ "async-compression/gzip" "tokio-util" "tokio" ]; - "compression-zstd" = [ "async-compression/zstd" "tokio-util" "tokio" ]; - "decompression-br" = [ "async-compression/brotli" "tokio-util" "tokio" ]; - "decompression-deflate" = [ "async-compression/zlib" "tokio-util" "tokio" ]; - "decompression-full" = [ "decompression-br" "decompression-deflate" "decompression-gzip" "decompression-zstd" ]; - "decompression-gzip" = [ "async-compression/gzip" "tokio-util" "tokio" ]; - "decompression-zstd" = [ "async-compression/zstd" "tokio-util" "tokio" ]; - "follow-redirect" = [ "iri-string" "tower/util" ]; - "fs" = [ "tokio/fs" "tokio-util/io" "tokio/io-util" "mime_guess" "mime" "percent-encoding" "httpdate" "set-status" "futures-util/alloc" "tracing" ]; - "full" = [ "add-extension" "auth" "catch-panic" "compression-full" "cors" "decompression-full" "follow-redirect" "fs" "limit" "map-request-body" "map-response-body" "metrics" "normalize-path" "propagate-header" "redirect" "request-id" "sensitive-headers" "set-header" "set-status" "timeout" "trace" "util" "validate-request" ]; - "httpdate" = [ "dep:httpdate" ]; - "iri-string" = [ "dep:iri-string" ]; - "metrics" = [ "tokio/time" ]; - "mime" = [ "dep:mime" ]; - "mime_guess" = [ "dep:mime_guess" ]; - "percent-encoding" = [ "dep:percent-encoding" ]; - "request-id" = [ "uuid" ]; - "timeout" = [ "tokio/time" ]; - "tokio" = [ "dep:tokio" ]; - "tokio-util" = [ "dep:tokio-util" ]; - "tower" = [ "dep:tower" ]; - "trace" = [ "tracing" ]; - "tracing" = [ "dep:tracing" ]; - "util" = [ "tower" ]; - "uuid" = [ "dep:uuid" ]; - "validate-request" = [ "mime" ]; - }; - resolvedDefaultFeatures = [ "default" "trace" "tracing" ]; - }; - "tower-http 0.5.2" = rec { + "tower-http" = rec { crateName = "tower-http"; version = "0.5.2"; edition = "2018"; @@ -14091,7 +14865,7 @@ rec { }; resolvedDefaultFeatures = [ "log-tracer" "std" ]; }; - "tracing-opentelemetry" = rec { + "tracing-opentelemetry 0.23.0" = rec { crateName = "tracing-opentelemetry"; version = "0.23.0"; edition = "2018"; @@ -14112,13 +14886,13 @@ rec { } { name = "opentelemetry"; - packageId = "opentelemetry"; + packageId = "opentelemetry 0.22.0"; usesDefaultFeatures = false; features = [ "trace" ]; } { name = "opentelemetry_sdk"; - packageId = "opentelemetry_sdk"; + packageId = "opentelemetry_sdk 0.22.1"; usesDefaultFeatures = false; features = [ "trace" ]; } @@ -14158,12 +14932,12 @@ rec { devDependencies = [ { name = "opentelemetry"; - packageId = "opentelemetry"; + packageId = "opentelemetry 0.22.0"; features = [ "trace" "metrics" ]; } { name = "opentelemetry_sdk"; - packageId = "opentelemetry_sdk"; + packageId = "opentelemetry_sdk 0.22.1"; usesDefaultFeatures = false; features = [ "trace" "rt-tokio" ]; } @@ -14191,6 +14965,109 @@ rec { }; resolvedDefaultFeatures = [ "default" "metrics" "smallvec" "tracing-log" ]; }; + "tracing-opentelemetry 0.25.0" = rec { + crateName = "tracing-opentelemetry"; + version = "0.25.0"; + edition = "2021"; + workspace_member = null; + src = pkgs.fetchgit { + url = "https://github.com/tokio-rs/tracing-opentelemetry"; + rev = "6fb2ba4c8b5b5b00e2566256c3ce80d7ebbe59ec"; + sha256 = "1b0qw6jv1dws2s8vmk1m0zryhihsd4n1vp0yvbbwx5qjqdsny3i1"; + }; + dependencies = [ + { + name = "js-sys"; + packageId = "js-sys"; + target = { target, features }: (("wasm32" == target."arch" or null) && (!("wasi" == target."os" or null))); + } + { + name = "once_cell"; + packageId = "once_cell"; + } + { + name = "opentelemetry"; + packageId = "opentelemetry 0.24.0"; + usesDefaultFeatures = false; + features = [ "trace" ]; + } + { + name = "opentelemetry_sdk"; + packageId = "opentelemetry_sdk 0.24.1"; + usesDefaultFeatures = false; + features = [ "trace" ]; + } + { + name = "smallvec"; + packageId = "smallvec"; + optional = true; + } + { + name = "tracing"; + packageId = "tracing"; + usesDefaultFeatures = false; + features = [ "std" ]; + } + { + name = "tracing-core"; + packageId = "tracing-core"; + } + { + name = "tracing-log"; + packageId = "tracing-log"; + optional = true; + usesDefaultFeatures = false; + } + { + name = "tracing-subscriber"; + packageId = "tracing-subscriber"; + usesDefaultFeatures = false; + features = [ "registry" "std" ]; + } + { + name = "web-time"; + packageId = "web-time"; + target = { target, features }: (("wasm32" == target."arch" or null) && (!("wasi" == target."os" or null))); + } + ]; + devDependencies = [ + { + name = "opentelemetry"; + packageId = "opentelemetry 0.24.0"; + features = [ "trace" "metrics" ]; + } + { + name = "opentelemetry_sdk"; + packageId = "opentelemetry_sdk 0.24.1"; + usesDefaultFeatures = false; + features = [ "trace" "rt-tokio" ]; + } + { + name = "tracing"; + packageId = "tracing"; + usesDefaultFeatures = false; + features = [ "std" "attributes" ]; + } + { + name = "tracing-subscriber"; + packageId = "tracing-subscriber"; + usesDefaultFeatures = false; + features = [ "registry" "std" "fmt" ]; + } + ]; + features = { + "async-trait" = [ "dep:async-trait" ]; + "default" = [ "tracing-log" "metrics" ]; + "futures-util" = [ "dep:futures-util" ]; + "lazy_static" = [ "dep:lazy_static" ]; + "metrics" = [ "opentelemetry/metrics" "opentelemetry_sdk/metrics" "smallvec" ]; + "metrics_gauge_unstable" = [ "opentelemetry/otel_unstable" ]; + "smallvec" = [ "dep:smallvec" ]; + "thiserror" = [ "dep:thiserror" ]; + "tracing-log" = [ "dep:tracing-log" ]; + }; + resolvedDefaultFeatures = [ "default" "metrics" "smallvec" "tracing-log" ]; + }; "tracing-subscriber" = rec { crateName = "tracing-subscriber"; version = "0.3.18"; @@ -14456,7 +15333,7 @@ rec { } { name = "prost"; - packageId = "prost"; + packageId = "prost 0.13.1"; } { name = "thiserror"; @@ -14469,11 +15346,11 @@ rec { { name = "tokio-listener"; packageId = "tokio-listener"; - features = [ "tonic011" ]; + features = [ "tonic012" ]; } { name = "tonic"; - packageId = "tonic"; + packageId = "tonic 0.12.1"; features = [ "tls" "tls-roots" ]; } { @@ -14501,11 +15378,11 @@ rec { buildDependencies = [ { name = "prost-build"; - packageId = "prost-build"; + packageId = "prost-build 0.13.1"; } { name = "tonic-build"; - packageId = "tonic-build"; + packageId = "tonic-build 0.12.1"; } ]; devDependencies = [ @@ -14583,6 +15460,10 @@ rec { packageId = "futures"; } { + name = "hyper-util"; + packageId = "hyper-util"; + } + { name = "lazy_static"; packageId = "lazy_static"; } @@ -14610,7 +15491,7 @@ rec { } { name = "prost"; - packageId = "prost"; + packageId = "prost 0.13.1"; } { name = "serde"; @@ -14663,7 +15544,7 @@ rec { } { name = "tonic"; - packageId = "tonic"; + packageId = "tonic 0.12.1"; } { name = "tonic-reflection"; @@ -14733,11 +15614,11 @@ rec { buildDependencies = [ { name = "prost-build"; - packageId = "prost-build"; + packageId = "prost-build 0.13.1"; } { name = "tonic-build"; - packageId = "tonic-build"; + packageId = "tonic-build 0.12.1"; } ]; devDependencies = [ @@ -15338,6 +16219,10 @@ rec { packageId = "futures"; } { + name = "hyper-util"; + packageId = "hyper-util"; + } + { name = "lazy_static"; packageId = "lazy_static"; } @@ -15360,7 +16245,7 @@ rec { } { name = "prost"; - packageId = "prost"; + packageId = "prost 0.13.1"; } { name = "reqwest"; @@ -15409,7 +16294,7 @@ rec { { name = "tokio-listener"; packageId = "tokio-listener"; - features = [ "clap" "multi-listener" "sd_listen" "tonic011" ]; + features = [ "clap" "multi-listener" "sd_listen" "tonic012" ]; } { name = "tokio-stream"; @@ -15423,7 +16308,7 @@ rec { } { name = "tonic"; - packageId = "tonic"; + packageId = "tonic 0.12.1"; features = [ "tls" "tls-roots" ]; } { @@ -15437,7 +16322,7 @@ rec { } { name = "tower-http"; - packageId = "tower-http 0.4.4"; + packageId = "tower-http"; features = [ "trace" ]; } { @@ -15469,11 +16354,11 @@ rec { buildDependencies = [ { name = "prost-build"; - packageId = "prost-build"; + packageId = "prost-build 0.13.1"; } { name = "tonic-build"; - packageId = "tonic-build"; + packageId = "tonic-build 0.12.1"; } ]; devDependencies = [ @@ -15522,7 +16407,7 @@ rec { } { name = "http"; - packageId = "http 0.2.11"; + packageId = "http 1.1.0"; optional = true; } { @@ -15535,7 +16420,7 @@ rec { } { name = "opentelemetry"; - packageId = "opentelemetry"; + packageId = "opentelemetry 0.24.0"; optional = true; } { @@ -15550,7 +16435,7 @@ rec { } { name = "opentelemetry_sdk"; - packageId = "opentelemetry_sdk"; + packageId = "opentelemetry_sdk 0.24.1"; optional = true; features = [ "rt-tokio" ]; } @@ -15571,7 +16456,7 @@ rec { } { name = "tonic"; - packageId = "tonic"; + packageId = "tonic 0.12.1"; optional = true; } { @@ -15585,7 +16470,7 @@ rec { } { name = "tracing-opentelemetry"; - packageId = "tracing-opentelemetry"; + packageId = "tracing-opentelemetry 0.25.0"; optional = true; } { @@ -16486,9 +17371,9 @@ rec { }; "wasm-streams" = rec { crateName = "wasm-streams"; - version = "0.3.0"; + version = "0.4.0"; edition = "2021"; - sha256 = "1iqa4kmhbsjj8k4q15i1x0x4p3xda0dhbg7zw51mydr4g129sq5l"; + sha256 = "0ad17c59xb8fffsnbrqbyqz93hb66nzxhizpii31icb31g4w8pdn"; type = [ "cdylib" "rlib" ]; authors = [ "Mattias Buelens <mattias@buelens.com>" @@ -16514,7 +17399,7 @@ rec { { name = "web-sys"; packageId = "web-sys"; - features = [ "AbortSignal" ]; + features = [ "AbortSignal" "QueuingStrategy" "ReadableStream" "ReadableStreamType" "ReadableWritablePair" "ReadableStreamByobReader" "ReadableStreamReaderMode" "ReadableStreamReadResult" "ReadableStreamByobRequest" "ReadableStreamDefaultReader" "ReadableByteStreamController" "ReadableStreamGetReaderOptions" "ReadableStreamDefaultController" "StreamPipeOptions" "TransformStream" "TransformStreamDefaultController" "Transformer" "UnderlyingSink" "UnderlyingSource" "WritableStream" "WritableStreamDefaultController" "WritableStreamDefaultWriter" ]; } ]; devDependencies = [ @@ -16993,7 +17878,7 @@ rec { "XrViewerPose" = [ "XrPose" ]; "XrWebGlLayer" = [ "EventTarget" "XrLayer" ]; }; - resolvedDefaultFeatures = [ "AbortController" "AbortSignal" "Blob" "BlobPropertyBag" "CanvasRenderingContext2d" "Document" "DomRect" "DomRectReadOnly" "Element" "Event" "EventTarget" "File" "FormData" "Headers" "HtmlCanvasElement" "HtmlElement" "MessageEvent" "Node" "ReadableStream" "Request" "RequestCredentials" "RequestInit" "RequestMode" "Response" "ServiceWorkerGlobalScope" "Window" "Worker" "WorkerGlobalScope" ]; + resolvedDefaultFeatures = [ "AbortController" "AbortSignal" "Blob" "BlobPropertyBag" "CanvasRenderingContext2d" "Document" "DomRect" "DomRectReadOnly" "Element" "Event" "EventTarget" "File" "FormData" "Headers" "HtmlCanvasElement" "HtmlElement" "MessageEvent" "Node" "QueuingStrategy" "ReadableByteStreamController" "ReadableStream" "ReadableStreamByobReader" "ReadableStreamByobRequest" "ReadableStreamDefaultController" "ReadableStreamDefaultReader" "ReadableStreamGetReaderOptions" "ReadableStreamReadResult" "ReadableStreamReaderMode" "ReadableStreamType" "ReadableWritablePair" "Request" "RequestCredentials" "RequestInit" "RequestMode" "Response" "ServiceWorkerGlobalScope" "StreamPipeOptions" "TransformStream" "TransformStreamDefaultController" "Transformer" "UnderlyingSink" "UnderlyingSource" "Window" "Worker" "WorkerGlobalScope" "WritableStream" "WritableStreamDefaultController" "WritableStreamDefaultWriter" ]; }; "web-time" = rec { crateName = "web-time"; @@ -18713,9 +19598,9 @@ rec { }; "winreg" = rec { crateName = "winreg"; - version = "0.50.0"; + version = "0.52.0"; edition = "2018"; - sha256 = "1cddmp929k882mdh6i9f2as848f13qqna6czwsqzkh1pqnr5fkjj"; + sha256 = "19gh9vp7mp1ab84kc3ag48nm9y7xgjhh3xa4vxss1gylk1rsaxx2"; authors = [ "Igor Shaula <gentoo90@gmail.com>" ]; diff --git a/tvix/build/Cargo.toml b/tvix/build/Cargo.toml index 6faa3ad7abdb..c0cf86408087 100644 --- a/tvix/build/Cargo.toml +++ b/tvix/build/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" bytes = "1.4.0" clap = { version = "4.0", features = ["derive", "env"] } itertools = "0.12.0" -prost = "0.12.1" +prost = "0.13.1" thiserror = "1.0.56" tokio = { version = "1.32.0" } -tokio-listener = { version = "0.4.1", features = [ "tonic011" ] } -tonic = { version = "0.11.0", features = ["tls", "tls-roots"] } +tokio-listener = { version = "0.4.1", features = [ "tonic012" ] } +tonic = { version = "0.12.0", features = ["tls", "tls-roots"] } tvix-castore = { path = "../castore" } tvix-tracing = { path = "../tracing" } tracing = "0.1.40" @@ -19,11 +19,11 @@ url = "2.4.0" [dependencies.tonic-reflection] optional = true -version = "0.11.0" +version = "0.12.0" [build-dependencies] -prost-build = "0.12.1" -tonic-build = "0.11.0" +prost-build = "0.13.1" +tonic-build = "0.12.0" [features] default = [] diff --git a/tvix/castore/Cargo.toml b/tvix/castore/Cargo.toml index f428101bd8d7..aaa788ca707c 100644 --- a/tvix/castore/Cargo.toml +++ b/tvix/castore/Cargo.toml @@ -15,17 +15,17 @@ digest = "0.10.7" fastcdc = { version = "3.1.0", features = ["tokio"] } futures = "0.3.30" lazy_static = "1.4.0" -object_store = { version = "0.9.1", features = ["http"] } +object_store = { version = "0.10.1", features = ["http"] } parking_lot = "0.12.1" pin-project-lite = "0.2.13" -prost = "0.12.1" +prost = "0.13.1" sled = { version = "0.34.7" } thiserror = "1.0.38" tokio-stream = { version = "0.1.14", features = ["fs", "net"] } tokio-util = { version = "0.7.9", features = ["io", "io-util", "codec"] } tokio-tar = "0.3.1" tokio = { version = "1.32.0", features = ["fs", "macros", "net", "rt", "rt-multi-thread", "signal"] } -tonic = "0.11.0" +tonic = "0.12.0" tower = "0.4.13" tracing = "0.1.37" tracing-indicatif = "0.3.6" @@ -39,6 +39,7 @@ serde_qs = "0.12.0" petgraph = "0.6.4" erased-serde = "0.4.5" serde_tagged = "0.3.0" +hyper-util = "0.1.6" [dependencies.bigtable_rs] optional = true @@ -58,7 +59,7 @@ optional = true [dependencies.tonic-reflection] optional = true -version = "0.11.0" +version = "0.12.0" [dependencies.vhost] optional = true @@ -85,8 +86,8 @@ optional = true version = "0.2.1" [build-dependencies] -prost-build = "0.12.1" -tonic-build = "0.11.0" +prost-build = "0.13.1" +tonic-build = "0.12.0" [dev-dependencies] async-process = "2.1.0" diff --git a/tvix/castore/src/blobservice/tests/utils.rs b/tvix/castore/src/blobservice/tests/utils.rs index 706c4b5e4319..7df4f00d3a09 100644 --- a/tvix/castore/src/blobservice/tests/utils.rs +++ b/tvix/castore/src/blobservice/tests/utils.rs @@ -2,6 +2,7 @@ use crate::blobservice::{BlobService, MemoryBlobService}; use crate::proto::blob_service_client::BlobServiceClient; use crate::proto::GRPCBlobServiceWrapper; use crate::{blobservice::GRPCBlobService, proto::blob_service_server::BlobServiceServer}; +use hyper_util::rt::TokioIo; use tonic::transport::{Endpoint, Server, Uri}; /// Constructs and returns a gRPC BlobService. @@ -33,7 +34,7 @@ pub async fn make_grpc_blob_service_client() -> Box<dyn BlobService> { .unwrap() .connect_with_connector(tower::service_fn(move |_: Uri| { let right = maybe_right.take().unwrap(); - async move { Ok::<_, std::io::Error>(right) } + async move { Ok::<_, std::io::Error>(TokioIo::new(right)) } })) .await .unwrap(), diff --git a/tvix/castore/src/directoryservice/tests/utils.rs b/tvix/castore/src/directoryservice/tests/utils.rs index 0f706695eec8..3d245ea412d5 100644 --- a/tvix/castore/src/directoryservice/tests/utils.rs +++ b/tvix/castore/src/directoryservice/tests/utils.rs @@ -6,6 +6,7 @@ use crate::{ proto::directory_service_server::DirectoryServiceServer, }; +use hyper_util::rt::TokioIo; use tonic::transport::{Endpoint, Server, Uri}; /// Constructs and returns a gRPC DirectoryService. @@ -37,7 +38,7 @@ pub async fn make_grpc_directory_service_client() -> Box<dyn DirectoryService> { .unwrap() .connect_with_connector(tower::service_fn(move |_: Uri| { let right = maybe_right.take().unwrap(); - async move { Ok::<_, std::io::Error>(right) } + async move { Ok::<_, std::io::Error>(TokioIo::new(right)) } })) .await .unwrap(), diff --git a/tvix/castore/src/tonic.rs b/tvix/castore/src/tonic.rs index 4b65d6b028ef..e63e1ad7aab8 100644 --- a/tvix/castore/src/tonic.rs +++ b/tvix/castore/src/tonic.rs @@ -1,3 +1,4 @@ +use hyper_util::rt::TokioIo; use tokio::net::UnixStream; use tonic::transport::{Channel, Endpoint}; @@ -25,7 +26,10 @@ pub async fn channel_from_url(url: &url::Url) -> Result<Channel, self::Error> { let connector = tower::service_fn({ let url = url.clone(); - move |_: tonic::transport::Uri| UnixStream::connect(url.path().to_string().clone()) + move |_: tonic::transport::Uri| { + let unix = UnixStream::connect(url.path().to_string().clone()); + async move { Ok::<_, std::io::Error>(TokioIo::new(unix.await?)) } + } }); // the URL doesn't matter diff --git a/tvix/crate-hashes.json b/tvix/crate-hashes.json index 11679cb2ebdd..bcd929c7bc6f 100644 --- a/tvix/crate-hashes.json +++ b/tvix/crate-hashes.json @@ -1,3 +1,4 @@ { + "git+https://github.com/tokio-rs/tracing-opentelemetry?branch=otel-0.24#0.25.0": "1b0qw6jv1dws2s8vmk1m0zryhihsd4n1vp0yvbbwx5qjqdsny3i1", "git+https://github.com/tvlfyi/wu-manber.git#wu-manber@0.1.0": "1zhk83lbq99xzyjwphv2qrb8f8qgfqwa5bbbvyzm0z0bljsjv0pd" } \ No newline at end of file diff --git a/tvix/default.nix b/tvix/default.nix index f8aa47a108c5..a37b28ca7fc7 100644 --- a/tvix/default.nix +++ b/tvix/default.nix @@ -19,6 +19,7 @@ let (lib.nameValuePair "${crates.internal.crates.${k}.crateName}-${crates.internal.crates.${k}.version}" crates.internal.crates.${k}.src.outputHash) ) [ "wu-manber" + "tracing-opentelemetry 0.25.0" ]); }; diff --git a/tvix/glue/Cargo.toml b/tvix/glue/Cargo.toml index 1bf1052517d2..6fe35c7a5a89 100644 --- a/tvix/glue/Cargo.toml +++ b/tvix/glue/Cargo.toml @@ -12,7 +12,7 @@ futures = "0.3.30" magic = "0.16.2" nix-compat = { path = "../nix-compat" } pin-project = "1.1" -reqwest = { version = "0.11.22", features = ["rustls-tls-native-roots"], default-features = false } +reqwest = { version = "0.12.0", features = ["rustls-tls-native-roots"], default-features = false } tvix-build = { path = "../build", default-features = false, features = []} tvix-eval = { path = "../eval" } tvix-castore = { path = "../castore" } diff --git a/tvix/nar-bridge/Cargo.toml b/tvix/nar-bridge/Cargo.toml index dd38d1b30e9f..c2a03d981793 100644 --- a/tvix/nar-bridge/Cargo.toml +++ b/tvix/nar-bridge/Cargo.toml @@ -12,13 +12,13 @@ clap = { version = "4.0", features = ["derive", "env"] } data-encoding = "2.3.3" futures = "0.3.30" itertools = "0.12.0" -prost = "0.12.1" +prost = "0.13.1" nix-compat = { path = "../nix-compat", features = ["async"] } thiserror = "1.0.56" tokio = { version = "1.32.0" } tokio-listener = { version = "0.4.2", features = [ "axum07", "clap", "multi-listener", "sd_listen" ] } tokio-util = { version = "0.7.9", features = ["io", "io-util", "compat"] } -tonic = { version = "0.11.0", features = ["tls", "tls-roots"] } +tonic = { version = "0.12.0", features = ["tls", "tls-roots"] } tvix-castore = { path = "../castore" } tvix-store = { path = "../store" } tvix-tracing = { path = "../tracing", features = ["tonic", "axum"] } @@ -30,8 +30,8 @@ lru = "0.12.3" parking_lot = "0.12.3" [build-dependencies] -prost-build = "0.12.1" -tonic-build = "0.11.0" +prost-build = "0.13.1" +tonic-build = "0.12.0" [features] default = ["otlp"] diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml index 8063a0e874c3..f1d88ba085ea 100644 --- a/tvix/store/Cargo.toml +++ b/tvix/store/Cargo.toml @@ -17,7 +17,7 @@ futures = "0.3.30" lazy_static = "1.4.0" nix-compat = { path = "../nix-compat", features = ["async"] } pin-project-lite = "0.2.13" -prost = "0.12.1" +prost = "0.13.1" serde = { version = "1.0.197", features = [ "derive" ] } serde_json = "1.0" serde_with = "3.7.0" @@ -26,34 +26,35 @@ sha2 = "0.10.6" sled = { version = "0.34.7" } thiserror = "1.0.38" tokio = { version = "1.32.0", features = ["fs", "macros", "net", "rt", "rt-multi-thread", "signal"] } -tokio-listener = { version = "0.4.2", features = [ "clap", "multi-listener", "sd_listen", "tonic011" ] } +tokio-listener = { version = "0.4.2", features = [ "clap", "multi-listener", "sd_listen", "tonic012" ] } tokio-stream = { version = "0.1.14", features = ["fs"] } tokio-util = { version = "0.7.9", features = ["io", "io-util", "compat"] } -tonic = { version = "0.11.0", features = ["tls", "tls-roots"] } +tonic = { version = "0.12.0", features = ["tls", "tls-roots"] } tower = "0.4.13" -tower-http = { version = "0.4.4", features = ["trace"] } +tower-http = { version = "0.5.0", features = ["trace"] } tvix-castore = { path = "../castore" } url = "2.4.0" walkdir = "2.4.0" -reqwest = { version = "0.11.22", features = ["rustls-tls-native-roots", "stream"], default-features = false } -reqwest-middleware = "0.2.5" +reqwest = { version = "0.12.0", features = ["rustls-tls-native-roots", "stream"], default-features = false } +reqwest-middleware = "0.3.0" lru = "0.12.3" parking_lot = "0.12.2" tvix-tracing = { path = "../tracing", features = ["tonic", "reqwest"] } tracing = "0.1.40" tracing-indicatif = "0.3.6" +hyper-util = "0.1.6" [dependencies.tonic-reflection] optional = true -version = "0.11.0" +version = "0.12.0" [dependencies.bigtable_rs] optional = true version = "0.2.10" [build-dependencies] -prost-build = "0.12.1" -tonic-build = "0.11.0" +prost-build = "0.13.1" +tonic-build = "0.12.0" [dev-dependencies] async-process = "2.1.0" diff --git a/tvix/store/src/pathinfoservice/tests/utils.rs b/tvix/store/src/pathinfoservice/tests/utils.rs index 3e4fe5c05a24..8b192e303b89 100644 --- a/tvix/store/src/pathinfoservice/tests/utils.rs +++ b/tvix/store/src/pathinfoservice/tests/utils.rs @@ -1,5 +1,6 @@ use std::sync::Arc; +use hyper_util::rt::TokioIo; use tonic::transport::{Endpoint, Server, Uri}; use tvix_castore::{blobservice::BlobService, directoryservice::DirectoryService}; @@ -57,7 +58,7 @@ pub async fn make_grpc_path_info_service_client() -> ( .unwrap() .connect_with_connector(tower::service_fn(move |_: Uri| { let right = maybe_right.take().unwrap(); - async move { Ok::<_, std::io::Error>(right) } + async move { Ok::<_, std::io::Error>(TokioIo::new(right)) } })) .await .unwrap(), diff --git a/tvix/tracing/Cargo.toml b/tvix/tracing/Cargo.toml index db1626d26d52..cdcbf4968230 100644 --- a/tvix/tracing/Cargo.toml +++ b/tvix/tracing/Cargo.toml @@ -12,17 +12,17 @@ tracing-indicatif = "0.3.6" tokio = { version = "1.32.0" , features = ["sync", "rt"] } thiserror = "1.0.38" -tracing-opentelemetry = { version = "0.23.0", optional = true } -opentelemetry = { version = "0.22.0", optional = true } -opentelemetry-otlp = { version = "0.15.0", optional = true } -opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio"], optional = true } +tracing-opentelemetry = { git = "https://github.com/tokio-rs/tracing-opentelemetry", branch = "otel-0.24", version = "0.25.0", optional = true } +opentelemetry = { version = "0.24.0", optional = true } +opentelemetry-otlp = { version = "0.17.0", optional = true } +opentelemetry_sdk = { version = "0.24.1", features = ["rt-tokio"], optional = true } tracing-tracy = { version = "0.11.0", features = ["flush-on-exit"], optional = true } -opentelemetry-http = { version = "0.11.0", optional = true } +opentelemetry-http = { version = "0.13.0", optional = true } -tonic = { version = "0.11.0", optional = true } -http = { version = "0.2.11", optional = true } +tonic = { version = "0.12.0", optional = true } +http = { version = "1.1.0", optional = true } -reqwest-tracing = { version = "0.4.8", default-features = false, optional = true } +reqwest-tracing = { version = "0.5.0", default-features = false, optional = true } axum = { version = "0.7.5", optional = true } diff --git a/tvix/tracing/src/lib.rs b/tvix/tracing/src/lib.rs index 35fdcda5a88a..fa9723d8cecc 100644 --- a/tvix/tracing/src/lib.rs +++ b/tvix/tracing/src/lib.rs @@ -6,7 +6,10 @@ use tracing_indicatif::{filter::IndicatifFilter, writer, IndicatifLayer, Indicat use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer}; #[cfg(feature = "otlp")] -use opentelemetry::{trace::Tracer, KeyValue}; +use opentelemetry::{ + trace::{Tracer, TracerProvider}, + KeyValue, +}; #[cfg(feature = "otlp")] use opentelemetry_sdk::{ propagation::TraceContextPropagator, @@ -264,7 +267,7 @@ fn gen_otlp_tracer( impl Tracer + tracing_opentelemetry::PreSampledTracer, mpsc::Sender<Option<oneshot::Sender<()>>>, ) { - let tracer = opentelemetry_otlp::new_pipeline() + let tracer_provider = opentelemetry_otlp::new_pipeline() .tracing() .with_exporter(opentelemetry_otlp::new_exporter().tonic()) .with_batch_config( @@ -281,7 +284,7 @@ fn gen_otlp_tracer( .with_scheduled_delay(std::time::Duration::from_secs(10)) .build(), ) - .with_trace_config(opentelemetry_sdk::trace::config().with_resource({ + .with_trace_config(opentelemetry_sdk::trace::Config::default().with_resource({ // use SdkProvidedResourceDetector.detect to detect resources, // but replace the default service name with our default. // https://github.com/open-telemetry/opentelemetry-rust/issues/1298 @@ -302,9 +305,7 @@ fn gen_otlp_tracer( // Trace provider is need for later use like flushing the provider. // Needs to be kept around for each message to rx we need to handle. - let tracer_provider = tracer - .provider() - .expect("Failed to get the tracer provider"); + let tracer = tracer_provider.tracer("tvix"); // Set up a channel for flushing trace providers later let (tx, mut rx) = mpsc::channel::<Option<oneshot::Sender<()>>>(16); |