diff --git a/Cargo.lock b/Cargo.lock index a7c0e5b31f..d5ab115e30 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,7 +11,7 @@ dependencies = [ "actix-rt", "actix_derive", "bitflags", - "bytes 1.3.0", + "bytes", "crossbeam-channel", "futures-core", "futures-sink", @@ -20,9 +20,9 @@ dependencies = [ "log", "once_cell", "parking_lot 0.12.1", - "pin-project-lite 0.2.9", + "pin-project-lite", "smallvec", - "tokio 1.22.0", + "tokio", "tokio-util 0.7.4", ] @@ -33,13 +33,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe" dependencies = [ "bitflags", - "bytes 1.3.0", + "bytes", "futures-core", "futures-sink", "log", "memchr", - "pin-project-lite 0.2.9", - "tokio 1.22.0", + "pin-project-lite", + "tokio", "tokio-util 0.7.4", ] @@ -72,7 +72,7 @@ dependencies = [ "base64", "bitflags", "brotli", - "bytes 1.3.0", + "bytes", "bytestring", "derive_more", "encoding_rs", @@ -87,7 +87,7 @@ dependencies = [ "local-channel", "mime", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite", "rand", "sha1", "smallvec", @@ -126,7 +126,7 @@ checksum = "7ea16c295198e958ef31930a6ef37d0fb64e9ca3b6116e6b93a8bdae96ee1000" dependencies = [ "actix-macros", "futures-core", - "tokio 1.22.0", + "tokio", ] [[package]] @@ -143,7 +143,7 @@ dependencies = [ "mio", "num_cpus", "socket2", - "tokio 1.22.0", + "tokio", "tracing 0.1.36", ] @@ -155,7 +155,7 @@ checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" dependencies = [ "futures-core", "paste", - "pin-project-lite 0.2.9", + "pin-project-lite", ] [[package]] @@ -171,7 +171,7 @@ dependencies = [ "futures-core", "http", "log", - "pin-project-lite 0.2.9", + "pin-project-lite", "tokio-rustls 0.23.4", "tokio-util 0.7.4", "webpki-roots", @@ -184,7 +184,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8" dependencies = [ "local-waker", - "pin-project-lite 0.2.9", + "pin-project-lite", ] [[package]] @@ -203,7 +203,7 @@ dependencies = [ "actix-utils", "actix-web-codegen", "ahash", - "bytes 1.3.0", + "bytes", "bytestring", "cfg-if", "cookie", @@ -217,7 +217,7 @@ dependencies = [ "log", "mime", "once_cell", - "pin-project-lite 0.2.9", + "pin-project-lite", "regex", "serde", "serde_json", @@ -328,7 +328,7 @@ dependencies = [ "bb8", "diesel", "thiserror", - "tokio 1.22.0", + "tokio", ] [[package]] @@ -394,7 +394,7 @@ dependencies = [ "actix-utils", "ahash", "base64", - "bytes 1.3.0", + "bytes", "cfg-if", "cookie", "derive_more", @@ -406,13 +406,13 @@ dependencies = [ "log", "mime", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite", "rand", "rustls 0.20.7", "serde", "serde_json", "serde_urlencoded", - "tokio 1.22.0", + "tokio", ] [[package]] @@ -431,13 +431,13 @@ dependencies = [ "aws-smithy-json", "aws-smithy-types", "aws-types", - "bytes 1.3.0", + "bytes", "hex", "http", "hyper", "ring", "time", - "tokio 1.22.0", + "tokio", "tower", "tracing 0.1.36", "zeroize", @@ -466,12 +466,12 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "aws-types", - "bytes 1.3.0", + "bytes", "http", "http-body", "lazy_static", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite", "tracing 0.1.36", ] @@ -491,7 +491,7 @@ dependencies = [ "aws-smithy-json", "aws-smithy-types", "aws-types", - "bytes 1.3.0", + "bytes", "http", "tokio-stream", "tower", @@ -513,7 +513,7 @@ dependencies = [ "aws-smithy-json", "aws-smithy-types", "aws-types", - "bytes 1.3.0", + "bytes", "http", "tokio-stream", "tower", @@ -536,7 +536,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes 1.3.0", + "bytes", "http", "tower", ] @@ -579,8 +579,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc604f278bae64bbd15854baa9c46ed69a56dfb0669d04aab80974749f2d6599" dependencies = [ "futures-util", - "pin-project-lite 0.2.9", - "tokio 1.22.0", + "pin-project-lite", + "tokio", "tokio-stream", ] @@ -594,15 +594,15 @@ dependencies = [ "aws-smithy-http", "aws-smithy-http-tower", "aws-smithy-types", - "bytes 1.3.0", + "bytes", "fastrand", "http", "http-body", "hyper", "hyper-rustls", "lazy_static", - "pin-project-lite 0.2.9", - "tokio 1.22.0", + "pin-project-lite", + "tokio", "tower", "tracing 0.1.36", ] @@ -614,7 +614,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "014a0ef5c4508fc2f6a9d3925c214725af19f020ea388db48e20196cc4cc9d6d" dependencies = [ "aws-smithy-types", - "bytes 1.3.0", + "bytes", "bytes-utils", "futures-core", "http", @@ -622,8 +622,8 @@ dependencies = [ "hyper", "once_cell", "percent-encoding", - "pin-project-lite 0.2.9", - "tokio 1.22.0", + "pin-project-lite", + "tokio", "tokio-util 0.7.4", "tracing 0.1.36", ] @@ -635,10 +635,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deecb478dc3cc40203e0e97ac0fb92947e0719754bbafd0026bdc49318e2fd03" dependencies = [ "aws-smithy-http", - "bytes 1.3.0", + "bytes", "http", "http-body", - "pin-project-lite 0.2.9", + "pin-project-lite", "tower", "tracing 0.1.36", ] @@ -708,7 +708,7 @@ dependencies = [ "async-trait", "axum-core", "bitflags", - "bytes 1.3.0", + "bytes", "futures-util", "http", "http-body", @@ -718,7 +718,7 @@ dependencies = [ "memchr", "mime", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite", "rustversion", "serde", "sync_wrapper", @@ -735,7 +735,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92" dependencies = [ "async-trait", - "bytes 1.3.0", + "bytes", "futures-util", "http", "http-body", @@ -761,7 +761,7 @@ dependencies = [ "futures-channel", "futures-util", "parking_lot 0.12.1", - "tokio 1.22.0", + "tokio", ] [[package]] @@ -836,12 +836,6 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - [[package]] name = "bytes" version = "1.3.0" @@ -854,7 +848,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" dependencies = [ - "bytes 1.3.0", + "bytes", "either", ] @@ -864,7 +858,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7f83e57d9154148e355404702e2694463241880b939570d7c97c014da7a69a1" dependencies = [ - "bytes 1.3.0", + "bytes", ] [[package]] @@ -901,7 +895,7 @@ dependencies = [ name = "common_utils" version = "0.1.0" dependencies = [ - "bytes 1.3.0", + "bytes", "error-stack", "masking", "router_env", @@ -1260,7 +1254,7 @@ dependencies = [ "arc-swap", "arcstr", "async-trait", - "bytes 1.3.0", + "bytes", "bytes-utils", "cfg-if", "float-cmp", @@ -1274,7 +1268,7 @@ dependencies = [ "redis-protocol", "semver", "sha-1", - "tokio 1.22.0", + "tokio", "tokio-native-tls", "tokio-stream", "tokio-util 0.6.10", @@ -1333,12 +1327,13 @@ checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" [[package]] name = "futures-locks" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c4e684ddb2d8a4db5ca8a02b35156da129674ba4412b6f528698d58c594954" +checksum = "3eb42d4fb72227be5778429f9ef5240a38a358925a49f05b5cf702ce7c7e558a" dependencies = [ - "futures", - "tokio 0.2.25", + "futures-channel", + "futures-task", + "tokio", ] [[package]] @@ -1377,7 +1372,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite", "pin-utils", "slab", ] @@ -1444,7 +1439,7 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" dependencies = [ - "bytes 1.3.0", + "bytes", "fnv", "futures-core", "futures-sink", @@ -1452,7 +1447,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.22.0", + "tokio", "tokio-util 0.7.4", "tracing 0.1.36", ] @@ -1502,7 +1497,7 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ - "bytes 1.3.0", + "bytes", "fnv", "itoa 1.0.4", ] @@ -1513,9 +1508,9 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.3.0", + "bytes", "http", - "pin-project-lite 0.2.9", + "pin-project-lite", ] [[package]] @@ -1551,7 +1546,7 @@ version = "0.14.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" dependencies = [ - "bytes 1.3.0", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -1561,9 +1556,9 @@ dependencies = [ "httparse", "httpdate", "itoa 1.0.4", - "pin-project-lite 0.2.9", + "pin-project-lite", "socket2", - "tokio 1.22.0", + "tokio", "tower-service", "tracing 0.1.36", "want", @@ -1581,7 +1576,7 @@ dependencies = [ "log", "rustls 0.19.1", "rustls-native-certs", - "tokio 1.22.0", + "tokio", "tokio-rustls 0.22.0", "webpki 0.21.4", ] @@ -1593,8 +1588,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ "hyper", - "pin-project-lite 0.2.9", - "tokio 1.22.0", + "pin-project-lite", + "tokio", "tokio-io-timeout", ] @@ -1604,10 +1599,10 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.3.0", + "bytes", "hyper", "native-tls", - "tokio 1.22.0", + "tokio", "tokio-native-tls", ] @@ -1815,7 +1810,7 @@ dependencies = [ name = "masking" version = "0.1.0" dependencies = [ - "bytes 1.3.0", + "bytes", "diesel", "serde", "serde_json", @@ -2083,7 +2078,7 @@ dependencies = [ "opentelemetry-proto", "prost", "thiserror", - "tokio 1.22.0", + "tokio", "tonic", ] @@ -2110,7 +2105,7 @@ dependencies = [ "indexmap", "js-sys", "once_cell", - "pin-project-lite 0.2.9", + "pin-project-lite", "thiserror", ] @@ -2131,7 +2126,7 @@ dependencies = [ "percent-encoding", "rand", "thiserror", - "tokio 1.22.0", + "tokio", "tokio-stream", ] @@ -2290,12 +2285,6 @@ dependencies = [ "syn", ] -[[package]] -name = "pin-project-lite" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - [[package]] name = "pin-project-lite" version = "0.2.9" @@ -2398,7 +2387,7 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0" dependencies = [ - "bytes 1.3.0", + "bytes", "prost-derive", ] @@ -2492,7 +2481,7 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c31deddf734dc0a39d3112e73490e88b61a05e83e074d211f348404cee4d2c6" dependencies = [ - "bytes 1.3.0", + "bytes", "bytes-utils", "cookie-factory", "crc16", @@ -2504,7 +2493,7 @@ dependencies = [ name = "redis_interface" version = "0.1.0" dependencies = [ - "bytes 1.3.0", + "bytes", "common_utils", "error-stack", "fred", @@ -2566,7 +2555,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ "base64", - "bytes 1.3.0", + "bytes", "encoding_rs", "futures-core", "futures-util", @@ -2582,11 +2571,11 @@ dependencies = [ "native-tls", "once_cell", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite", "serde", "serde_json", "serde_urlencoded", - "tokio 1.22.0", + "tokio", "tokio-native-tls", "tower-service", "url", @@ -2638,7 +2627,7 @@ dependencies = [ "aws-sdk-kms", "base64", "bb8", - "bytes 1.3.0", + "bytes", "common_utils", "config", "crc32fast", @@ -2677,7 +2666,7 @@ dependencies = [ "strum", "thiserror", "time", - "tokio 1.22.0", + "tokio", "toml", "url", "uuid", @@ -2711,7 +2700,7 @@ dependencies = [ "serde_urlencoded", "strum", "time", - "tokio 1.22.0", + "tokio", "tracing 0.1.36", "tracing-actix-web", "tracing-appender", @@ -3217,17 +3206,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -[[package]] -name = "tokio" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" -dependencies = [ - "bytes 0.5.6", - "pin-project-lite 0.1.12", - "slab", -] - [[package]] name = "tokio" version = "1.22.0" @@ -3235,13 +3213,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" dependencies = [ "autocfg", - "bytes 1.3.0", + "bytes", "libc", "memchr", "mio", "num_cpus", "parking_lot 0.12.1", - "pin-project-lite 0.2.9", + "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", @@ -3254,8 +3232,8 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" dependencies = [ - "pin-project-lite 0.2.9", - "tokio 1.22.0", + "pin-project-lite", + "tokio", ] [[package]] @@ -3276,7 +3254,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" dependencies = [ "native-tls", - "tokio 1.22.0", + "tokio", ] [[package]] @@ -3286,7 +3264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ "rustls 0.19.1", - "tokio 1.22.0", + "tokio", "webpki 0.21.4", ] @@ -3297,7 +3275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls 0.20.7", - "tokio 1.22.0", + "tokio", "webpki 0.22.0", ] @@ -3308,8 +3286,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" dependencies = [ "futures-core", - "pin-project-lite 0.2.9", - "tokio 1.22.0", + "pin-project-lite", + "tokio", ] [[package]] @@ -3318,12 +3296,12 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ - "bytes 1.3.0", + "bytes", "futures-core", "futures-sink", "log", - "pin-project-lite 0.2.9", - "tokio 1.22.0", + "pin-project-lite", + "tokio", ] [[package]] @@ -3332,11 +3310,11 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ - "bytes 1.3.0", + "bytes", "futures-core", "futures-sink", - "pin-project-lite 0.2.9", - "tokio 1.22.0", + "pin-project-lite", + "tokio", "tracing 0.1.36", ] @@ -3359,7 +3337,7 @@ dependencies = [ "async-trait", "axum", "base64", - "bytes 1.3.0", + "bytes", "futures-core", "futures-util", "h2", @@ -3371,7 +3349,7 @@ dependencies = [ "pin-project", "prost", "prost-derive", - "tokio 1.22.0", + "tokio", "tokio-stream", "tokio-util 0.7.4", "tower", @@ -3391,10 +3369,10 @@ dependencies = [ "futures-util", "indexmap", "pin-project", - "pin-project-lite 0.2.9", + "pin-project-lite", "rand", "slab", - "tokio 1.22.0", + "tokio", "tokio-util 0.7.4", "tower-layer", "tower-service", @@ -3408,13 +3386,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba" dependencies = [ "bitflags", - "bytes 1.3.0", + "bytes", "futures-core", "futures-util", "http", "http-body", "http-range-header", - "pin-project-lite 0.2.9", + "pin-project-lite", "tower", "tower-layer", "tower-service", @@ -3440,7 +3418,7 @@ checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" dependencies = [ "cfg-if", "log", - "pin-project-lite 0.2.9", + "pin-project-lite", "tracing-attributes", "tracing-core 0.1.30", ] @@ -3451,7 +3429,7 @@ version = "0.2.0" source = "git+https://github.com/jarnura/tracing?rev=16d277227f60788750528e4f4cc1db4f36b0869f#16d277227f60788750528e4f4cc1db4f36b0869f" dependencies = [ "cfg-if", - "pin-project-lite 0.2.9", + "pin-project-lite", "tracing-core 0.2.0", ] diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index afbb401c14..b5d21ae307 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -38,6 +38,8 @@ dyn-clone = "1.0.9" encoding_rs = "0.8.31" error-stack = "0.2.1" fred = { version = "5.2.0", features = ["metrics", "partial-tracing"] , optional = true } +futures = "0.3.25" +futures-locks = "0.7.0" hex = "0.4.3" http = "0.2.8" josekit = "0.8.1" @@ -62,8 +64,6 @@ time = { version = "0.3.14", features = ["serde", "serde-well-known", "std"] } tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread"] } url = { version = "2.3.1", features = ["serde"] } uuid = { version = "1.1.2", features = ["serde", "v4"] } -futures-locks = "0.6" -futures = "0.3" # First party crates common_utils = { version = "0.1.0", path = "../common_utils" }