From 7c5c4e4bf7816973099b5e348badf1118b6a706e Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 13:18:56 +0530 Subject: [PATCH 01/25] build(deps): point tracing and opentelemetry git URLs to upstream repositories --- Cargo.lock | 207 +++++++++++++++-------------------- crates/router_env/Cargo.toml | 13 +-- 2 files changed, 96 insertions(+), 124 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f0aee27d840a..4f233f951af7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -91,7 +91,7 @@ dependencies = [ "rand", "sha1", "smallvec", - "tracing 0.1.36", + "tracing", "zstd", ] @@ -115,7 +115,7 @@ dependencies = [ "http", "regex", "serde", - "tracing 0.1.36", + "tracing", ] [[package]] @@ -144,7 +144,7 @@ dependencies = [ "num_cpus", "socket2", "tokio", - "tracing 0.1.36", + "tracing", ] [[package]] @@ -439,7 +439,7 @@ dependencies = [ "time", "tokio", "tower", - "tracing 0.1.36", + "tracing", "zeroize", ] @@ -454,7 +454,7 @@ dependencies = [ "aws-types", "http", "regex", - "tracing 0.1.36", + "tracing", ] [[package]] @@ -472,7 +472,7 @@ dependencies = [ "lazy_static", "percent-encoding", "pin-project-lite", - "tracing 0.1.36", + "tracing", ] [[package]] @@ -551,7 +551,7 @@ dependencies = [ "aws-smithy-http", "aws-types", "http", - "tracing 0.1.36", + "tracing", ] [[package]] @@ -569,7 +569,7 @@ dependencies = [ "regex", "ring", "time", - "tracing 0.1.36", + "tracing", ] [[package]] @@ -604,7 +604,7 @@ dependencies = [ "pin-project-lite", "tokio", "tower", - "tracing 0.1.36", + "tracing", ] [[package]] @@ -625,7 +625,7 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util 0.7.4", - "tracing 0.1.36", + "tracing", ] [[package]] @@ -640,7 +640,7 @@ dependencies = [ "http-body", "pin-project-lite", "tower", - "tracing 0.1.36", + "tracing", ] [[package]] @@ -695,7 +695,7 @@ dependencies = [ "aws-smithy-types", "http", "rustc_version", - "tracing 0.1.36", + "tracing", "zeroize", ] @@ -1277,7 +1277,7 @@ dependencies = [ "tokio-native-tls", "tokio-stream", "tokio-util 0.6.10", - "tracing 0.1.36", + "tracing", "tracing-futures", "url", ] @@ -1443,7 +1443,7 @@ dependencies = [ "slab", "tokio", "tokio-util 0.7.4", - "tracing 0.1.36", + "tracing", ] [[package]] @@ -1554,7 +1554,7 @@ dependencies = [ "socket2", "tokio", "tower-service", - "tracing 0.1.36", + "tracing", "want", ] @@ -2033,42 +2033,33 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" +checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "js-sys", - "lazy_static", - "percent-encoding", - "pin-project", - "rand", - "thiserror", + "opentelemetry_api 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", + "opentelemetry_sdk 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "opentelemetry" version = "0.18.0" -source = "git+https://github.com/jarnura/opentelemetry-rust?rev=a82056696ca3d26960458269a894e5cf15056ad8#a82056696ca3d26960458269a894e5cf15056ad8" +source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry_api 0.18.0 (git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658)", + "opentelemetry_sdk 0.18.0 (git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658)", ] [[package]] name = "opentelemetry-otlp" version = "0.11.0" -source = "git+https://github.com/jarnura/opentelemetry-rust?rev=a82056696ca3d26960458269a894e5cf15056ad8#a82056696ca3d26960458269a894e5cf15056ad8" +source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" dependencies = [ "async-trait", "futures", "futures-util", "http", - "opentelemetry 0.18.0", + "opentelemetry 0.18.0 (git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658)", "opentelemetry-proto", "prost", "thiserror", @@ -2079,11 +2070,11 @@ dependencies = [ [[package]] name = "opentelemetry-proto" version = "0.1.0" -source = "git+https://github.com/jarnura/opentelemetry-rust?rev=a82056696ca3d26960458269a894e5cf15056ad8#a82056696ca3d26960458269a894e5cf15056ad8" +source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" dependencies = [ "futures", "futures-util", - "opentelemetry 0.18.0", + "opentelemetry 0.18.0 (git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658)", "prost", "tonic", ] @@ -2091,7 +2082,23 @@ dependencies = [ [[package]] name = "opentelemetry_api" version = "0.18.0" -source = "git+https://github.com/jarnura/opentelemetry-rust?rev=a82056696ca3d26960458269a894e5cf15056ad8#a82056696ca3d26960458269a894e5cf15056ad8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +dependencies = [ + "fnv", + "futures-channel", + "futures-util", + "indexmap", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + +[[package]] +name = "opentelemetry_api" +version = "0.18.0" +source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" dependencies = [ "fnv", "futures-channel", @@ -2106,7 +2113,27 @@ dependencies = [ [[package]] name = "opentelemetry_sdk" version = "0.18.0" -source = "git+https://github.com/jarnura/opentelemetry-rust?rev=a82056696ca3d26960458269a894e5cf15056ad8#a82056696ca3d26960458269a894e5cf15056ad8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +dependencies = [ + "async-trait", + "crossbeam-channel", + "dashmap", + "fnv", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", + "percent-encoding", + "rand", + "thiserror", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.18.0" +source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" dependencies = [ "async-trait", "crossbeam-channel", @@ -2116,7 +2143,7 @@ dependencies = [ "futures-executor", "futures-util", "once_cell", - "opentelemetry_api", + "opentelemetry_api 0.18.0 (git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658)", "percent-encoding", "rand", "thiserror", @@ -2684,7 +2711,7 @@ dependencies = [ "config", "gethostname", "once_cell", - "opentelemetry 0.18.0", + "opentelemetry 0.18.0 (git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658)", "opentelemetry-otlp", "rustc-hash", "serde", @@ -2693,13 +2720,13 @@ dependencies = [ "strum", "time", "tokio", - "tracing 0.1.36", + "tracing", "tracing-actix-web", "tracing-appender", "tracing-attributes", - "tracing-core 0.1.30", - "tracing-opentelemetry 0.16.0", - "tracing-subscriber 0.3.16", + "tracing-core", + "tracing-opentelemetry", + "tracing-subscriber", "vergen", ] @@ -3316,7 +3343,7 @@ dependencies = [ "futures-sink", "pin-project-lite", "tokio", - "tracing 0.1.36", + "tracing", ] [[package]] @@ -3356,7 +3383,7 @@ dependencies = [ "tower", "tower-layer", "tower-service", - "tracing 0.1.36", + "tracing", "tracing-futures", ] @@ -3377,7 +3404,7 @@ dependencies = [ "tokio-util 0.7.4", "tower-layer", "tower-service", - "tracing 0.1.36", + "tracing", ] [[package]] @@ -3421,17 +3448,7 @@ dependencies = [ "log", "pin-project-lite", "tracing-attributes", - "tracing-core 0.1.30", -] - -[[package]] -name = "tracing" -version = "0.2.0" -source = "git+https://github.com/jarnura/tracing?rev=16d277227f60788750528e4f4cc1db4f36b0869f#16d277227f60788750528e4f4cc1db4f36b0869f" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-core 0.2.0", + "tracing-core", ] [[package]] @@ -3441,10 +3458,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d725b8fa6ef307b3f4856913523337de45c47cc79271bafd7acfb39559e3a2da" dependencies = [ "actix-web", - "opentelemetry 0.17.0", + "opentelemetry 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", "pin-project", - "tracing 0.1.36", - "tracing-opentelemetry 0.17.4", + "tracing", + "tracing-opentelemetry", "uuid", ] @@ -3456,7 +3473,7 @@ checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", "time", - "tracing-subscriber 0.3.16", + "tracing-subscriber", ] [[package]] @@ -3480,14 +3497,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-core" -version = "0.2.0" -source = "git+https://github.com/jarnura/tracing?rev=16d277227f60788750528e4f4cc1db4f36b0869f#16d277227f60788750528e4f4cc1db4f36b0869f" -dependencies = [ - "once_cell", -] - [[package]] name = "tracing-futures" version = "0.2.5" @@ -3495,7 +3504,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ "pin-project", - "tracing 0.1.36", + "tracing", ] [[package]] @@ -3506,45 +3515,21 @@ checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ "lazy_static", "log", - "tracing-core 0.1.30", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "git+https://github.com/jarnura/tracing?rev=16d277227f60788750528e4f4cc1db4f36b0869f#16d277227f60788750528e4f4cc1db4f36b0869f" -dependencies = [ - "log", - "once_cell", - "tracing-core 0.2.0", + "tracing-core", ] [[package]] name = "tracing-opentelemetry" -version = "0.16.0" -source = "git+https://github.com/jarnura/tracing?rev=16d277227f60788750528e4f4cc1db4f36b0869f#16d277227f60788750528e4f4cc1db4f36b0869f" -dependencies = [ - "async-trait", - "once_cell", - "opentelemetry 0.18.0", - "tracing 0.2.0", - "tracing-core 0.2.0", - "tracing-log 0.2.0", - "tracing-subscriber 0.3.0", -] - -[[package]] -name = "tracing-opentelemetry" -version = "0.17.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" +checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" dependencies = [ "once_cell", - "opentelemetry 0.17.0", - "tracing 0.1.36", - "tracing-core 0.1.30", - "tracing-log 0.1.3", - "tracing-subscriber 0.3.16", + "opentelemetry 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", ] [[package]] @@ -3554,17 +3539,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" dependencies = [ "serde", - "tracing-core 0.1.30", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.0" -source = "git+https://github.com/jarnura/tracing?rev=16d277227f60788750528e4f4cc1db4f36b0869f#16d277227f60788750528e4f4cc1db4f36b0869f" -dependencies = [ - "sharded-slab", - "thread_local", - "tracing-core 0.2.0", + "tracing-core", ] [[package]] @@ -3582,9 +3557,9 @@ dependencies = [ "sharded-slab", "smallvec", "thread_local", - "tracing 0.1.36", - "tracing-core 0.1.30", - "tracing-log 0.1.3", + "tracing", + "tracing-core", + "tracing-log", "tracing-serde", ] diff --git a/crates/router_env/Cargo.toml b/crates/router_env/Cargo.toml index 9ee97c25f699..3cf0e9bf457d 100644 --- a/crates/router_env/Cargo.toml +++ b/crates/router_env/Cargo.toml @@ -12,9 +12,8 @@ build = "src/build.rs" config = { version = "0.13.2", features = ["toml"] } gethostname = "0.2.3" once_cell = "1.15.0" -opentelemetry = { git = "https://github.com/jarnura/opentelemetry-rust", rev = "a82056696ca3d26960458269a894e5cf15056ad8", features = ["rt-tokio-current-thread", "metrics"] } -opentelemetry-otlp = { git = "https://github.com/jarnura/opentelemetry-rust", rev = "a82056696ca3d26960458269a894e5cf15056ad8", features = ["metrics"] } - +opentelemetry = { git = "https://github.com/open-telemetry/opentelemetry-rust/", rev = "44b90202fd744598db8b0ace5b8f0bad7ec45658", features = ["rt-tokio-current-thread", "metrics"] } +opentelemetry-otlp = { git = "https://github.com/open-telemetry/opentelemetry-rust/", rev = "44b90202fd744598db8b0ace5b8f0bad7ec45658", features = ["metrics"] } rustc-hash = "1.1" serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0.85" @@ -22,14 +21,12 @@ serde_urlencoded = "0.7.1" strum = { version = "0.24.1", features = ["derive"] } time = { version = "0.3.14", default-features = false, features = ["formatting"] } tokio = { version = "1.21.2" } - -# We put in a old version, we do not update to avoid clippy errors: https://github.com/tokio-rs/tracing/pull/2270#issuecomment-1282881008 -tracing-attributes = "=0.1.22" tracing = "0.1.36" -tracing-actix-web = { version = "0.6.1", features = ["opentelemetry_0_17"], optional = true } +tracing-actix-web = { version = "0.6.1", features = ["opentelemetry_0_18"], optional = true } tracing-appender = "0.2.2" +tracing-attributes = "0.1.22" tracing-core = "0.1.29" -tracing-opentelemetry = { git = "https://github.com/jarnura/tracing", rev = "16d277227f60788750528e4f4cc1db4f36b0869f" } +tracing-opentelemetry = "0.18.0" tracing-subscriber = { version = "0.3.15", default-features = true, features = ["json", "env-filter", "registry"] } vergen = { version = "7.4.2", optional = true } From 9f533cb8c3365c6883e4c6d2e948fd0b2dcfc486 Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 13:21:03 +0530 Subject: [PATCH 02/25] cargo(workspace): clean up commented code --- Cargo.toml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9e548171f70f..cc7cc81548f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,15 +2,7 @@ resolver = "2" members = ["crates/*", "examples/*"] -# note: all profiles should be here, not in crates -# https://doc.rust-lang.org/cargo/reference/profiles.html - [profile.release] strip = true lto = true codegen-units = 1 - -# [workspace.metadata.dylint] -# libraries = [ -# { git = "https://github.com/trailofbits/dylint", pattern = "examples/general/*" }, -# ] From c61bdf1cc3f58bdcae83627c165d3c8b0bd2de33 Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 13:41:31 +0530 Subject: [PATCH 03/25] build(deps): bump bytes from 1.2.1 to 1.3.0 --- Cargo.lock | 72 ++++++------------------------- Cargo.toml | 3 ++ crates/common_utils/Cargo.toml | 4 +- crates/redis_interface/Cargo.toml | 4 +- crates/router/Cargo.toml | 2 +- 5 files changed, 21 insertions(+), 64 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4f233f951af7..42b5258ee740 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2034,32 +2034,22 @@ dependencies = [ [[package]] name = "opentelemetry" version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" -dependencies = [ - "opentelemetry_api 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", - "opentelemetry_sdk 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "opentelemetry" -version = "0.18.0" -source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" +source = "git+https://github.com/open-telemetry/opentelemetry-rust?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" dependencies = [ - "opentelemetry_api 0.18.0 (git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658)", - "opentelemetry_sdk 0.18.0 (git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658)", + "opentelemetry_api", + "opentelemetry_sdk", ] [[package]] name = "opentelemetry-otlp" version = "0.11.0" -source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" +source = "git+https://github.com/open-telemetry/opentelemetry-rust?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" dependencies = [ "async-trait", "futures", "futures-util", "http", - "opentelemetry 0.18.0 (git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658)", + "opentelemetry", "opentelemetry-proto", "prost", "thiserror", @@ -2070,11 +2060,11 @@ dependencies = [ [[package]] name = "opentelemetry-proto" version = "0.1.0" -source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" +source = "git+https://github.com/open-telemetry/opentelemetry-rust?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" dependencies = [ "futures", "futures-util", - "opentelemetry 0.18.0 (git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658)", + "opentelemetry", "prost", "tonic", ] @@ -2082,23 +2072,7 @@ dependencies = [ [[package]] name = "opentelemetry_api" version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" -dependencies = [ - "fnv", - "futures-channel", - "futures-util", - "indexmap", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", -] - -[[package]] -name = "opentelemetry_api" -version = "0.18.0" -source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" +source = "git+https://github.com/open-telemetry/opentelemetry-rust?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" dependencies = [ "fnv", "futures-channel", @@ -2113,27 +2087,7 @@ dependencies = [ [[package]] name = "opentelemetry_sdk" version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" -dependencies = [ - "async-trait", - "crossbeam-channel", - "dashmap", - "fnv", - "futures-channel", - "futures-executor", - "futures-util", - "once_cell", - "opentelemetry_api 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", - "percent-encoding", - "rand", - "thiserror", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.18.0" -source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" +source = "git+https://github.com/open-telemetry/opentelemetry-rust?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" dependencies = [ "async-trait", "crossbeam-channel", @@ -2143,7 +2097,7 @@ dependencies = [ "futures-executor", "futures-util", "once_cell", - "opentelemetry_api 0.18.0 (git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658)", + "opentelemetry_api", "percent-encoding", "rand", "thiserror", @@ -2711,7 +2665,7 @@ dependencies = [ "config", "gethostname", "once_cell", - "opentelemetry 0.18.0 (git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658)", + "opentelemetry", "opentelemetry-otlp", "rustc-hash", "serde", @@ -3458,7 +3412,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d725b8fa6ef307b3f4856913523337de45c47cc79271bafd7acfb39559e3a2da" dependencies = [ "actix-web", - "opentelemetry 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", + "opentelemetry", "pin-project", "tracing", "tracing-opentelemetry", @@ -3525,7 +3479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" dependencies = [ "once_cell", - "opentelemetry 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", + "opentelemetry", "tracing", "tracing-core", "tracing-log", diff --git a/Cargo.toml b/Cargo.toml index cc7cc81548f3..1063e706bc72 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,3 +6,6 @@ members = ["crates/*", "examples/*"] strip = true lto = true codegen-units = 1 + +[patch.crates-io] +opentelemetry = { git = "https://github.com/open-telemetry/opentelemetry-rust", rev = "44b90202fd744598db8b0ace5b8f0bad7ec45658" } diff --git a/crates/common_utils/Cargo.toml b/crates/common_utils/Cargo.toml index 09b9f1e422b8..f3799a0f0eab 100644 --- a/crates/common_utils/Cargo.toml +++ b/crates/common_utils/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bytes = "1.2.1" +bytes = "1.3.0" error-stack = "0.2.1" once_cell = "1.16.0" regex = "1.7.0" @@ -21,4 +21,4 @@ router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra [dev-dependencies] fake = "2.5.0" -proptest = "1.0.0" \ No newline at end of file +proptest = "1.0.0" diff --git a/crates/redis_interface/Cargo.toml b/crates/redis_interface/Cargo.toml index cc48a6f63f74..dc4b6fb6e67b 100644 --- a/crates/redis_interface/Cargo.toml +++ b/crates/redis_interface/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bytes = "1.2.1" +bytes = "1.3.0" error-stack = "0.2.1" fred = { version = "5.2.0", features = ["metrics", "partial-tracing"] } serde = { version = "1.0.145", features = ["derive"] } @@ -15,4 +15,4 @@ thiserror = "1.0.37" # First party crates common_utils = { version = "0.1.0", path = "../common_utils" } -router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra_implicit_fields", "log_custom_entries_to_extra"] } \ No newline at end of file +router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra_implicit_fields", "log_custom_entries_to_extra"] } diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 2bea53f1e56c..9eaca39ca0d9 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -30,7 +30,7 @@ aws-config = { version = "0.49.0", optional = true } aws-sdk-kms = { version = "0.19.0", optional = true } base64 = "0.13.0" bb8 = "0.8" -bytes = "1.2.1" +bytes = "1.3.0" config = { version = "0.13.2", features = ["toml"] } crc32fast = "1.3.2" diesel = { git = "https://github.com/juspay/diesel", features = ["postgres", "serde_json", "time"], rev = "22f3f59f1db8a3f61623e4d6b375d64cd7bd3d02" } From f42e8ca5aca69cce7546e54acfc79f4adfcc18cf Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 13:43:43 +0530 Subject: [PATCH 04/25] build(deps): bump error-stack from 0.2.1 to 0.2.4 --- Cargo.lock | 4 ++-- crates/common_utils/Cargo.toml | 2 +- crates/redis_interface/Cargo.toml | 2 +- crates/router/Cargo.toml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 42b5258ee740..3dc3f10c6a3d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1723,9 +1723,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.137" +version = "0.2.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" [[package]] name = "libgit2-sys" diff --git a/crates/common_utils/Cargo.toml b/crates/common_utils/Cargo.toml index f3799a0f0eab..e4f84dacd662 100644 --- a/crates/common_utils/Cargo.toml +++ b/crates/common_utils/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] bytes = "1.3.0" -error-stack = "0.2.1" +error-stack = "0.2.4" once_cell = "1.16.0" regex = "1.7.0" serde = { version = "1.0.145", features = ["derive"] } diff --git a/crates/redis_interface/Cargo.toml b/crates/redis_interface/Cargo.toml index dc4b6fb6e67b..d46debc40ce0 100644 --- a/crates/redis_interface/Cargo.toml +++ b/crates/redis_interface/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] bytes = "1.3.0" -error-stack = "0.2.1" +error-stack = "0.2.4" fred = { version = "5.2.0", features = ["metrics", "partial-tracing"] } serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0.85" diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 9eaca39ca0d9..2bb31fffb8a9 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -36,7 +36,7 @@ crc32fast = "1.3.2" diesel = { git = "https://github.com/juspay/diesel", features = ["postgres", "serde_json", "time"], rev = "22f3f59f1db8a3f61623e4d6b375d64cd7bd3d02" } dyn-clone = "1.0.9" encoding_rs = "0.8.31" -error-stack = "0.2.1" +error-stack = "0.2.4" fred = { version = "5.2.0", features = ["metrics", "partial-tracing"] , optional = true } futures = "0.3.25" hex = "0.4.3" From 50b64cca5878f20a8ec9337a09ac65d49e7e77ea Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 13:46:00 +0530 Subject: [PATCH 05/25] build(deps): bump serde from 1.0.145 to 1.0.149 --- Cargo.lock | 8 ++++---- crates/common_utils/Cargo.toml | 2 +- crates/redis_interface/Cargo.toml | 2 +- crates/router/Cargo.toml | 2 +- crates/router_derive/Cargo.toml | 2 +- crates/router_env/Cargo.toml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3dc3f10c6a3d..9c908d8d1786 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2846,18 +2846,18 @@ checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" [[package]] name = "serde" -version = "1.0.148" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc" +checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.148" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c" +checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4" dependencies = [ "proc-macro2", "quote", diff --git a/crates/common_utils/Cargo.toml b/crates/common_utils/Cargo.toml index e4f84dacd662..aad6a7f31aae 100644 --- a/crates/common_utils/Cargo.toml +++ b/crates/common_utils/Cargo.toml @@ -9,7 +9,7 @@ bytes = "1.3.0" error-stack = "0.2.4" once_cell = "1.16.0" regex = "1.7.0" -serde = { version = "1.0.145", features = ["derive"] } +serde = { version = "1.0.149", features = ["derive"] } serde_json = "1.0.85" serde_urlencoded = "0.7.1" thiserror = "1.0.37" diff --git a/crates/redis_interface/Cargo.toml b/crates/redis_interface/Cargo.toml index d46debc40ce0..9d212f000a82 100644 --- a/crates/redis_interface/Cargo.toml +++ b/crates/redis_interface/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" bytes = "1.3.0" error-stack = "0.2.4" fred = { version = "5.2.0", features = ["metrics", "partial-tracing"] } -serde = { version = "1.0.145", features = ["derive"] } +serde = { version = "1.0.149", features = ["derive"] } serde_json = "1.0.85" serde_urlencoded = "0.7.1" thiserror = "1.0.37" diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 2bb31fffb8a9..02fd1fb530bf 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -51,7 +51,7 @@ rand = "0.8.5" regex = "1.6.0" reqwest = { version = "0.11.12", features = ["json"] } ring = "0.16.20" -serde = { version = "1.0.145", features = ["derive"] } +serde = { version = "1.0.149", features = ["derive"] } serde_json = "1.0.85" serde_path_to_error = "0.1.8" serde_qs = { version = "0.10.1", optional = true } diff --git a/crates/router_derive/Cargo.toml b/crates/router_derive/Cargo.toml index 02265a2ff036..fff3ba16ce2e 100644 --- a/crates/router_derive/Cargo.toml +++ b/crates/router_derive/Cargo.toml @@ -17,6 +17,6 @@ syn = { version = "1.0.101", features = ["full", "extra-traits"] } # the full fe [dev-dependencies] diesel = { git = "https://github.com/juspay/diesel", features = ["postgres"], rev = "22f3f59f1db8a3f61623e4d6b375d64cd7bd3d02" } -serde = { version = "1.0.145", features = ["derive"] } +serde = { version = "1.0.149", features = ["derive"] } serde_json = "1.0.85" strum = { version = "0.24.1", features = ["derive"] } diff --git a/crates/router_env/Cargo.toml b/crates/router_env/Cargo.toml index 3cf0e9bf457d..f519c7e83d85 100644 --- a/crates/router_env/Cargo.toml +++ b/crates/router_env/Cargo.toml @@ -15,7 +15,7 @@ once_cell = "1.15.0" opentelemetry = { git = "https://github.com/open-telemetry/opentelemetry-rust/", rev = "44b90202fd744598db8b0ace5b8f0bad7ec45658", features = ["rt-tokio-current-thread", "metrics"] } opentelemetry-otlp = { git = "https://github.com/open-telemetry/opentelemetry-rust/", rev = "44b90202fd744598db8b0ace5b8f0bad7ec45658", features = ["metrics"] } rustc-hash = "1.1" -serde = { version = "1.0.145", features = ["derive"] } +serde = { version = "1.0.149", features = ["derive"] } serde_json = "1.0.85" serde_urlencoded = "0.7.1" strum = { version = "0.24.1", features = ["derive"] } From 47d2187bc1872bdef8e7425638a43b8cea8d8033 Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 13:47:39 +0530 Subject: [PATCH 06/25] build(deps): bump serde_json from 1.0.85 to 1.0.89 --- crates/common_utils/Cargo.toml | 2 +- crates/masking/Cargo.toml | 4 ++-- crates/redis_interface/Cargo.toml | 2 +- crates/router/Cargo.toml | 2 +- crates/router_derive/Cargo.toml | 2 +- crates/router_env/Cargo.toml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/common_utils/Cargo.toml b/crates/common_utils/Cargo.toml index aad6a7f31aae..6104b8a833ca 100644 --- a/crates/common_utils/Cargo.toml +++ b/crates/common_utils/Cargo.toml @@ -10,7 +10,7 @@ error-stack = "0.2.4" once_cell = "1.16.0" regex = "1.7.0" serde = { version = "1.0.149", features = ["derive"] } -serde_json = "1.0.85" +serde_json = "1.0.89" serde_urlencoded = "0.7.1" thiserror = "1.0.37" time = { version = "0.3.17", features = ["serde", "serde-well-known", "std"] } diff --git a/crates/masking/Cargo.toml b/crates/masking/Cargo.toml index 7a4bcc089ab5..3a9fd174f603 100644 --- a/crates/masking/Cargo.toml +++ b/crates/masking/Cargo.toml @@ -19,8 +19,8 @@ rustdoc-args = ["--cfg", "docsrs"] bytes = { version = "1", optional = true } diesel = { git = "https://github.com/juspay/diesel", features = ["postgres", "serde_json", "time"], optional = true, rev = "22f3f59f1db8a3f61623e4d6b375d64cd7bd3d02" } serde = { version = "1", features = ["derive"], optional = true } -serde_json = "1.0.85" +serde_json = "1.0.89" zeroize = { version = "1.5", default-features = false } [dev-dependencies] -serde_json = "1.0.85" +serde_json = "1.0.89" diff --git a/crates/redis_interface/Cargo.toml b/crates/redis_interface/Cargo.toml index 9d212f000a82..3b519ea618f8 100644 --- a/crates/redis_interface/Cargo.toml +++ b/crates/redis_interface/Cargo.toml @@ -9,7 +9,7 @@ bytes = "1.3.0" error-stack = "0.2.4" fred = { version = "5.2.0", features = ["metrics", "partial-tracing"] } serde = { version = "1.0.149", features = ["derive"] } -serde_json = "1.0.85" +serde_json = "1.0.89" serde_urlencoded = "0.7.1" thiserror = "1.0.37" diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 02fd1fb530bf..9335a4ede010 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -52,7 +52,7 @@ regex = "1.6.0" reqwest = { version = "0.11.12", features = ["json"] } ring = "0.16.20" serde = { version = "1.0.149", features = ["derive"] } -serde_json = "1.0.85" +serde_json = "1.0.89" serde_path_to_error = "0.1.8" serde_qs = { version = "0.10.1", optional = true } serde_urlencoded = "0.7.1" diff --git a/crates/router_derive/Cargo.toml b/crates/router_derive/Cargo.toml index fff3ba16ce2e..c90bcc2ab5fb 100644 --- a/crates/router_derive/Cargo.toml +++ b/crates/router_derive/Cargo.toml @@ -18,5 +18,5 @@ syn = { version = "1.0.101", features = ["full", "extra-traits"] } # the full fe [dev-dependencies] diesel = { git = "https://github.com/juspay/diesel", features = ["postgres"], rev = "22f3f59f1db8a3f61623e4d6b375d64cd7bd3d02" } serde = { version = "1.0.149", features = ["derive"] } -serde_json = "1.0.85" +serde_json = "1.0.89" strum = { version = "0.24.1", features = ["derive"] } diff --git a/crates/router_env/Cargo.toml b/crates/router_env/Cargo.toml index f519c7e83d85..7b6c99ce8d51 100644 --- a/crates/router_env/Cargo.toml +++ b/crates/router_env/Cargo.toml @@ -16,7 +16,7 @@ opentelemetry = { git = "https://github.com/open-telemetry/opentelemetry-rust/", opentelemetry-otlp = { git = "https://github.com/open-telemetry/opentelemetry-rust/", rev = "44b90202fd744598db8b0ace5b8f0bad7ec45658", features = ["metrics"] } rustc-hash = "1.1" serde = { version = "1.0.149", features = ["derive"] } -serde_json = "1.0.85" +serde_json = "1.0.89" serde_urlencoded = "0.7.1" strum = { version = "0.24.1", features = ["derive"] } time = { version = "0.3.14", default-features = false, features = ["formatting"] } From 7c70cb612f74fb6cf32e0d060852280c750e522c Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 13:58:08 +0530 Subject: [PATCH 07/25] build(deps): bump async-trait from 0.1.57 to 0.1.59 --- Cargo.lock | 4 ++-- crates/router/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9c908d8d1786..39eb561ca272 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -354,9 +354,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.58" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" +checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" dependencies = [ "proc-macro2", "quote", diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 9335a4ede010..bc2c6b1cd2a6 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -25,7 +25,7 @@ actix-cors = "0.6.3" actix-rt = "2.7.0" actix-web = "4.2.1" async-bb8-diesel = { git = "https://github.com/juspay/async-bb8-diesel", rev = "412663e16802dbc58a1b98bfcbe78fa0090311eb" } -async-trait = "0.1.57" +async-trait = "0.1.59" aws-config = { version = "0.49.0", optional = true } aws-sdk-kms = { version = "0.19.0", optional = true } base64 = "0.13.0" From 2d857db0ffe4a5ceb0c4cfbcc63084ac8cb7aaa5 Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 14:00:42 +0530 Subject: [PATCH 08/25] build(deps): bump base64 from 0.13.0 to 0.13.1 --- crates/router/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index bc2c6b1cd2a6..9c9c5ac4078c 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -28,7 +28,7 @@ async-bb8-diesel = { git = "https://github.com/juspay/async-bb8-diesel", rev = " async-trait = "0.1.59" aws-config = { version = "0.49.0", optional = true } aws-sdk-kms = { version = "0.19.0", optional = true } -base64 = "0.13.0" +base64 = "0.13.1" bb8 = "0.8" bytes = "1.3.0" config = { version = "0.13.2", features = ["toml"] } From a6c95498404880276f6c7c4ce2ac4f475386f280 Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 14:02:12 +0530 Subject: [PATCH 09/25] build(deps): bump config from 0.13.2 to 0.13.3 --- Cargo.lock | 8 ++++---- crates/router/Cargo.toml | 2 +- crates/router_env/Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 39eb561ca272..f6f6cf9ccdb4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -912,9 +912,9 @@ dependencies = [ [[package]] name = "config" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f1667b8320afa80d69d8bbe40830df2c8a06003d86f73d8e003b2c48df416d" +checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7" dependencies = [ "async-trait", "json5", @@ -3525,9 +3525,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 9c9c5ac4078c..3e63f6b5c9c7 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -31,7 +31,7 @@ aws-sdk-kms = { version = "0.19.0", optional = true } base64 = "0.13.1" bb8 = "0.8" bytes = "1.3.0" -config = { version = "0.13.2", features = ["toml"] } +config = { version = "0.13.3", features = ["toml"] } crc32fast = "1.3.2" diesel = { git = "https://github.com/juspay/diesel", features = ["postgres", "serde_json", "time"], rev = "22f3f59f1db8a3f61623e4d6b375d64cd7bd3d02" } dyn-clone = "1.0.9" diff --git a/crates/router_env/Cargo.toml b/crates/router_env/Cargo.toml index 7b6c99ce8d51..e1c358a04bbb 100644 --- a/crates/router_env/Cargo.toml +++ b/crates/router_env/Cargo.toml @@ -9,7 +9,7 @@ license = "Apache-2.0" build = "src/build.rs" [dependencies] -config = { version = "0.13.2", features = ["toml"] } +config = { version = "0.13.3", features = ["toml"] } gethostname = "0.2.3" once_cell = "1.15.0" opentelemetry = { git = "https://github.com/open-telemetry/opentelemetry-rust/", rev = "44b90202fd744598db8b0ace5b8f0bad7ec45658", features = ["rt-tokio-current-thread", "metrics"] } From 29600392e2ee82cb9c766e70fe0d82b7798e3147 Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 14:04:02 +0530 Subject: [PATCH 10/25] build(deps): bump once_cell from 1.15.0 to 1.16.0 --- crates/router/Cargo.toml | 2 +- crates/router_env/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 3e63f6b5c9c7..3a31168c2179 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -46,7 +46,7 @@ literally = "0.1.3" maud = { version = "0.24", features = ["actix-web"] } mime = "0.3.16" nanoid = "0.4.0" -once_cell = "1.15.0" +once_cell = "1.16.0" rand = "0.8.5" regex = "1.6.0" reqwest = { version = "0.11.12", features = ["json"] } diff --git a/crates/router_env/Cargo.toml b/crates/router_env/Cargo.toml index e1c358a04bbb..1ad13076749b 100644 --- a/crates/router_env/Cargo.toml +++ b/crates/router_env/Cargo.toml @@ -11,7 +11,7 @@ build = "src/build.rs" [dependencies] config = { version = "0.13.3", features = ["toml"] } gethostname = "0.2.3" -once_cell = "1.15.0" +once_cell = "1.16.0" opentelemetry = { git = "https://github.com/open-telemetry/opentelemetry-rust/", rev = "44b90202fd744598db8b0ace5b8f0bad7ec45658", features = ["rt-tokio-current-thread", "metrics"] } opentelemetry-otlp = { git = "https://github.com/open-telemetry/opentelemetry-rust/", rev = "44b90202fd744598db8b0ace5b8f0bad7ec45658", features = ["metrics"] } rustc-hash = "1.1" From 6dca9a40184ab7af65e791580ce70eb432edb169 Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 14:52:17 +0530 Subject: [PATCH 11/25] build(deps): remove `regex` from `router` dependencies --- Cargo.lock | 1 - crates/router/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f6f6cf9ccdb4..315259c10333 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2624,7 +2624,6 @@ dependencies = [ "once_cell", "rand", "redis_interface", - "regex", "reqwest", "ring", "router_derive", diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 3a31168c2179..cb403334401d 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -48,7 +48,6 @@ mime = "0.3.16" nanoid = "0.4.0" once_cell = "1.16.0" rand = "0.8.5" -regex = "1.6.0" reqwest = { version = "0.11.12", features = ["json"] } ring = "0.16.20" serde = { version = "1.0.149", features = ["derive"] } From 265872a08e21e6b3eb713badad9f0b0f0183dbca Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 14:55:40 +0530 Subject: [PATCH 12/25] build(deps): bump sha2 from 0.10.5 to 0.10.6 --- crates/router/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index cb403334401d..604f005e85c2 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -55,7 +55,7 @@ serde_json = "1.0.89" serde_path_to_error = "0.1.8" serde_qs = { version = "0.10.1", optional = true } serde_urlencoded = "0.7.1" -sha2 = "0.10.5" +sha2 = "0.10.6" structopt = "0.3.26" strum = { version = "0.24.1", features = ["derive"] } thiserror = "1.0.37" From eefe5cf646123a74fd0a69c68619751ec342c00c Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 14:57:12 +0530 Subject: [PATCH 13/25] build(deps): bump time from 0.3.14 to 0.3.17 --- crates/router/Cargo.toml | 4 ++-- crates/router_env/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 604f005e85c2..0d1a94887bfb 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -59,7 +59,7 @@ sha2 = "0.10.6" structopt = "0.3.26" strum = { version = "0.24.1", features = ["derive"] } thiserror = "1.0.37" -time = { version = "0.3.14", features = ["serde", "serde-well-known", "std"] } +time = { version = "0.3.17", 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"] } @@ -79,7 +79,7 @@ actix-http = "3.2.2" awc = { version = "3.0.1", features = ["rustls"] } derive_deref = "1.1.1" rand = "0.8.5" -time = { version = "0.3.14", features = ["macros"] } +time = { version = "0.3.17", features = ["macros"] } tokio = "1.21.2" toml = "0.5.9" diff --git a/crates/router_env/Cargo.toml b/crates/router_env/Cargo.toml index 1ad13076749b..364d9b259d7a 100644 --- a/crates/router_env/Cargo.toml +++ b/crates/router_env/Cargo.toml @@ -19,7 +19,7 @@ serde = { version = "1.0.149", features = ["derive"] } serde_json = "1.0.89" serde_urlencoded = "0.7.1" strum = { version = "0.24.1", features = ["derive"] } -time = { version = "0.3.14", default-features = false, features = ["formatting"] } +time = { version = "0.3.17", default-features = false, features = ["formatting"] } tokio = { version = "1.21.2" } tracing = "0.1.36" tracing-actix-web = { version = "0.6.1", features = ["opentelemetry_0_18"], optional = true } From 0aea00f89261e0fed2ddfddb4adcb03160fb4fd2 Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 14:59:35 +0530 Subject: [PATCH 14/25] build(deps): bump tokio from 1.21.2 to 1.23.0 --- Cargo.lock | 6 +++--- crates/router/Cargo.toml | 4 ++-- crates/router_env/Cargo.toml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 315259c10333..1ad3ddd3abf9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3189,9 +3189,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.22.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" +checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" dependencies = [ "autocfg", "bytes", @@ -3204,7 +3204,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "winapi", + "windows-sys 0.42.0", ] [[package]] diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 0d1a94887bfb..3b19d38b625f 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -60,7 +60,7 @@ structopt = "0.3.26" strum = { version = "0.24.1", features = ["derive"] } thiserror = "1.0.37" time = { version = "0.3.17", features = ["serde", "serde-well-known", "std"] } -tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread"] } +tokio = { version = "1.23.0", features = ["macros", "rt-multi-thread"] } url = { version = "2.3.1", features = ["serde"] } uuid = { version = "1.1.2", features = ["serde", "v4"] } @@ -80,7 +80,7 @@ awc = { version = "3.0.1", features = ["rustls"] } derive_deref = "1.1.1" rand = "0.8.5" time = { version = "0.3.17", features = ["macros"] } -tokio = "1.21.2" +tokio = "1.23.0" toml = "0.5.9" [[bin]] diff --git a/crates/router_env/Cargo.toml b/crates/router_env/Cargo.toml index 364d9b259d7a..57671188d9f6 100644 --- a/crates/router_env/Cargo.toml +++ b/crates/router_env/Cargo.toml @@ -20,7 +20,7 @@ serde_json = "1.0.89" serde_urlencoded = "0.7.1" strum = { version = "0.24.1", features = ["derive"] } time = { version = "0.3.17", default-features = false, features = ["formatting"] } -tokio = { version = "1.21.2" } +tokio = { version = "1.23.0" } tracing = "0.1.36" tracing-actix-web = { version = "0.6.1", features = ["opentelemetry_0_18"], optional = true } tracing-appender = "0.2.2" @@ -31,7 +31,7 @@ tracing-subscriber = { version = "0.3.15", default-features = true, features = [ vergen = { version = "7.4.2", optional = true } [dev-dependencies] -tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread"] } +tokio = { version = "1.23.0", features = ["macros", "rt-multi-thread"] } [build-dependencies] vergen = "7.4.2" From 57d23ae9b8967bee8d7657378039620cceafe1d4 Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 15:00:55 +0530 Subject: [PATCH 15/25] build(deps): bump uuid from 1.1.2 to 1.2.2 --- crates/router/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 3b19d38b625f..48ca83c59317 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -62,7 +62,7 @@ thiserror = "1.0.37" time = { version = "0.3.17", features = ["serde", "serde-well-known", "std"] } tokio = { version = "1.23.0", features = ["macros", "rt-multi-thread"] } url = { version = "2.3.1", features = ["serde"] } -uuid = { version = "1.1.2", features = ["serde", "v4"] } +uuid = { version = "1.2.2", features = ["serde", "v4"] } # First party crates common_utils = { version = "0.1.0", path = "../common_utils" } From 78573014b90537ab0e1987f0a7ac9af55b60bfa4 Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 15:01:53 +0530 Subject: [PATCH 16/25] build(deps): bump proc-macro2 from 1.0.46 to 1.0.47 --- crates/router_derive/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/router_derive/Cargo.toml b/crates/router_derive/Cargo.toml index c90bcc2ab5fb..c92c65441a42 100644 --- a/crates/router_derive/Cargo.toml +++ b/crates/router_derive/Cargo.toml @@ -11,7 +11,7 @@ proc-macro = true doctest = false [dependencies] -proc-macro2 = "1.0.46" +proc-macro2 = "1.0.47" quote = "1.0.21" syn = { version = "1.0.101", features = ["full", "extra-traits"] } # the full feature does not seem to encompass all the features From 5ab09126be689e54f5ed0400bff1f415ac67553d Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 15:02:55 +0530 Subject: [PATCH 17/25] build(deps): bump syn from 1.0.101 to 1.0.105 --- crates/router_derive/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/router_derive/Cargo.toml b/crates/router_derive/Cargo.toml index c92c65441a42..5ccdbba2e8c7 100644 --- a/crates/router_derive/Cargo.toml +++ b/crates/router_derive/Cargo.toml @@ -13,7 +13,7 @@ doctest = false [dependencies] proc-macro2 = "1.0.47" quote = "1.0.21" -syn = { version = "1.0.101", features = ["full", "extra-traits"] } # the full feature does not seem to encompass all the features +syn = { version = "1.0.105", features = ["full", "extra-traits"] } # the full feature does not seem to encompass all the features [dev-dependencies] diesel = { git = "https://github.com/juspay/diesel", features = ["postgres"], rev = "22f3f59f1db8a3f61623e4d6b375d64cd7bd3d02" } From 0a0309d729dd1ccd1d01891d67f7f7db33e8d59c Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 15:03:54 +0530 Subject: [PATCH 18/25] build(deps): bump gethostname from 0.2.3 to 0.4.1 --- Cargo.lock | 21 ++++++++++++++++++--- crates/router_env/Cargo.toml | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ad3ddd3abf9..0646ad995afa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1383,12 +1383,12 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.2.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +checksum = "8a329e22866dd78b35d2c639a4a23d7b950aeae300dfd79f4fb19f74055c2404" dependencies = [ "libc", - "winapi", + "windows", ] [[package]] @@ -3804,6 +3804,21 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.43.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", +] + [[package]] name = "windows-sys" version = "0.36.1" diff --git a/crates/router_env/Cargo.toml b/crates/router_env/Cargo.toml index 57671188d9f6..0b71b05da1a7 100644 --- a/crates/router_env/Cargo.toml +++ b/crates/router_env/Cargo.toml @@ -10,7 +10,7 @@ build = "src/build.rs" [dependencies] config = { version = "0.13.3", features = ["toml"] } -gethostname = "0.2.3" +gethostname = "0.4.1" once_cell = "1.16.0" opentelemetry = { git = "https://github.com/open-telemetry/opentelemetry-rust/", rev = "44b90202fd744598db8b0ace5b8f0bad7ec45658", features = ["rt-tokio-current-thread", "metrics"] } opentelemetry-otlp = { git = "https://github.com/open-telemetry/opentelemetry-rust/", rev = "44b90202fd744598db8b0ace5b8f0bad7ec45658", features = ["metrics"] } From e7e76180d59e68f7c0b678c0923d704d6447932b Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 15:05:10 +0530 Subject: [PATCH 19/25] build(deps): bump vergen from 7.4.2 to 7.4.3 --- crates/router_env/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/router_env/Cargo.toml b/crates/router_env/Cargo.toml index 0b71b05da1a7..5536f5df7c15 100644 --- a/crates/router_env/Cargo.toml +++ b/crates/router_env/Cargo.toml @@ -28,13 +28,13 @@ tracing-attributes = "0.1.22" tracing-core = "0.1.29" tracing-opentelemetry = "0.18.0" tracing-subscriber = { version = "0.3.15", default-features = true, features = ["json", "env-filter", "registry"] } -vergen = { version = "7.4.2", optional = true } +vergen = { version = "7.4.3", optional = true } [dev-dependencies] tokio = { version = "1.23.0", features = ["macros", "rt-multi-thread"] } [build-dependencies] -vergen = "7.4.2" +vergen = "7.4.3" [features] default = ["actix_web"] From 9731457416cf1c113e7b989e528a0907cc0dc933 Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 20:55:52 +0530 Subject: [PATCH 20/25] build(deps): remove unused deps from `router_env` --- Cargo.lock | 4 ---- crates/router_env/Cargo.toml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0646ad995afa..218e90b1a5fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2669,16 +2669,12 @@ dependencies = [ "rustc-hash", "serde", "serde_json", - "serde_urlencoded", "strum", "time", "tokio", "tracing", "tracing-actix-web", "tracing-appender", - "tracing-attributes", - "tracing-core", - "tracing-opentelemetry", "tracing-subscriber", "vergen", ] diff --git a/crates/router_env/Cargo.toml b/crates/router_env/Cargo.toml index 5536f5df7c15..4bcc9029ba55 100644 --- a/crates/router_env/Cargo.toml +++ b/crates/router_env/Cargo.toml @@ -17,16 +17,12 @@ opentelemetry-otlp = { git = "https://github.com/open-telemetry/opentelemetry-ru rustc-hash = "1.1" serde = { version = "1.0.149", features = ["derive"] } serde_json = "1.0.89" -serde_urlencoded = "0.7.1" strum = { version = "0.24.1", features = ["derive"] } time = { version = "0.3.17", default-features = false, features = ["formatting"] } tokio = { version = "1.23.0" } tracing = "0.1.36" tracing-actix-web = { version = "0.6.1", features = ["opentelemetry_0_18"], optional = true } tracing-appender = "0.2.2" -tracing-attributes = "0.1.22" -tracing-core = "0.1.29" -tracing-opentelemetry = "0.18.0" tracing-subscriber = { version = "0.3.15", default-features = true, features = ["json", "env-filter", "registry"] } vergen = { version = "7.4.3", optional = true } From 1b4627c311cacac144a696b3a18cbca7c4d28934 Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 21:09:09 +0530 Subject: [PATCH 21/25] build(deps): remove unused deps from `router` --- Cargo.lock | 12 ------------ crates/router/Cargo.toml | 1 - 2 files changed, 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 218e90b1a5fc..9bf31ffb604d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2633,7 +2633,6 @@ dependencies = [ "serde_path_to_error", "serde_qs", "serde_urlencoded", - "sha2", "structopt", "strum", "thiserror", @@ -2927,17 +2926,6 @@ dependencies = [ "digest 0.10.6", ] -[[package]] -name = "sha2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.6", -] - [[package]] name = "sharded-slab" version = "0.1.4" diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 48ca83c59317..42c2f01a3b9b 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -55,7 +55,6 @@ serde_json = "1.0.89" serde_path_to_error = "0.1.8" serde_qs = { version = "0.10.1", optional = true } serde_urlencoded = "0.7.1" -sha2 = "0.10.6" structopt = "0.3.26" strum = { version = "0.24.1", features = ["derive"] } thiserror = "1.0.37" From 06df4b2737eb8a78a39e180b1dc0bd5b585ec6c2 Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sat, 10 Dec 2022 21:16:41 +0530 Subject: [PATCH 22/25] build(deps): remove unused deps from `redis_interface` --- Cargo.lock | 3 --- crates/redis_interface/Cargo.toml | 4 ---- 2 files changed, 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9bf31ffb604d..986352f70534 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2468,14 +2468,11 @@ dependencies = [ name = "redis_interface" version = "0.1.0" dependencies = [ - "bytes", "common_utils", "error-stack", "fred", "router_env", "serde", - "serde_json", - "serde_urlencoded", "thiserror", ] diff --git a/crates/redis_interface/Cargo.toml b/crates/redis_interface/Cargo.toml index 3b519ea618f8..1b416e4a3d92 100644 --- a/crates/redis_interface/Cargo.toml +++ b/crates/redis_interface/Cargo.toml @@ -2,15 +2,11 @@ name = "redis_interface" version = "0.1.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bytes = "1.3.0" error-stack = "0.2.4" fred = { version = "5.2.0", features = ["metrics", "partial-tracing"] } serde = { version = "1.0.149", features = ["derive"] } -serde_json = "1.0.89" -serde_urlencoded = "0.7.1" thiserror = "1.0.37" # First party crates From 170f6f38e9fd38ccbf05eb24233ae99133193e3b Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sun, 11 Dec 2022 18:28:41 +0530 Subject: [PATCH 23/25] build(deps): bump base64 from 0.13.1 to 0.20.0 --- Cargo.lock | 26 ++++++++++++++++---------- crates/router/Cargo.toml | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 986352f70534..af4f9803ccb5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -69,7 +69,7 @@ dependencies = [ "actix-service", "actix-utils", "ahash", - "base64", + "base64 0.13.1", "bitflags", "brotli", "bytes", @@ -393,7 +393,7 @@ dependencies = [ "actix-tls", "actix-utils", "ahash", - "base64", + "base64 0.13.1", "bytes", "cfg-if", "cookie", @@ -751,6 +751,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" + [[package]] name = "bb8" version = "0.8.0" @@ -1678,7 +1684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dee6af62ad98bdf699ad2ecc8323479a1fdc7aa5faa6043d93119d83f6c5fca8" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "flate2", "once_cell", "openssl", @@ -2526,7 +2532,7 @@ version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "encoding_rs", "futures-core", @@ -2578,7 +2584,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" dependencies = [ - "base64", + "base64 0.13.1", "bitflags", "serde", ] @@ -2597,7 +2603,7 @@ dependencies = [ "awc", "aws-config", "aws-sdk-kms", - "base64", + "base64 0.20.0", "bb8", "bytes", "common_utils", @@ -2706,7 +2712,7 @@ version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ - "base64", + "base64 0.13.1", "log", "ring", "sct 0.6.1", @@ -3298,7 +3304,7 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64", + "base64 0.13.1", "bytes", "futures-core", "futures-util", @@ -3747,9 +3753,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki 0.22.0", ] diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 42c2f01a3b9b..cd2129813d15 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -28,7 +28,7 @@ async-bb8-diesel = { git = "https://github.com/juspay/async-bb8-diesel", rev = " async-trait = "0.1.59" aws-config = { version = "0.49.0", optional = true } aws-sdk-kms = { version = "0.19.0", optional = true } -base64 = "0.13.1" +base64 = "0.20.0" bb8 = "0.8" bytes = "1.3.0" config = { version = "0.13.3", features = ["toml"] } From d0e5dfc5f3d4a86d50298efd5ec6e3d0b6fb1df9 Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sun, 11 Dec 2022 19:41:13 +0530 Subject: [PATCH 24/25] build: bump MSRV to 1.64 This MSRV bump is required because the `gethostname` crate has bumped its MSRV to 1.64 in `v0.4.0`. --- .deepsource.toml | 2 +- .github/workflows/CI.yml | 2 +- Dockerfile | 2 +- INSTALL_dependencies.sh | 2 +- crates/masking/Cargo.toml | 2 +- crates/router/Cargo.toml | 2 +- crates/router_env/Cargo.toml | 2 +- flake.nix | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.deepsource.toml b/.deepsource.toml index 2f409b0ffa48..4c7e1817f6eb 100644 --- a/.deepsource.toml +++ b/.deepsource.toml @@ -13,4 +13,4 @@ name = "rust" enabled = true [analyzers.meta] -msrv = "1.63.0" +msrv = "1.64.0" diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ac1d2250d255..bab4f6e860a2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -95,7 +95,7 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@master with: - toolchain: 1.63 + toolchain: 1.64 - uses: Swatinem/rust-cache@v2.2.0 with: diff --git a/Dockerfile b/Dockerfile index 8fff63e41b0c..63a5a90cc3fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.63 as builder +FROM rust:1.64 as builder RUN apt-get update \ && apt-get install -y libpq-dev libssl-dev diff --git a/INSTALL_dependencies.sh b/INSTALL_dependencies.sh index 00241abbf161..8f5c481ac435 100755 --- a/INSTALL_dependencies.sh +++ b/INSTALL_dependencies.sh @@ -9,7 +9,7 @@ if [[ "${TRACE-0}" == "1" ]]; then set -o xtrace fi -RUST_MSRV=1.63.0 +RUST_MSRV=1.64.0 _DB_NAME="orca_db" _DB_USER="db_user" _DB_PASS="db_password" diff --git a/crates/masking/Cargo.toml b/crates/masking/Cargo.toml index 3a9fd174f603..2b588d01db76 100644 --- a/crates/masking/Cargo.toml +++ b/crates/masking/Cargo.toml @@ -3,7 +3,7 @@ name = "masking" description = "Personal Identifiable Information protection. Wrapper types and traits for secret management which help ensure they aren't accidentally copied, logged, or otherwise exposed (as much as possible), and also ensure secrets are securely wiped from memory when dropped." version = "0.1.0" edition = "2021" -rust-version = "1.63" +rust-version = "1.64" readme = "README.md" license = "Apache-2.0" diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index cd2129813d15..e975f63751e3 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -4,7 +4,7 @@ description = "Modern, fast and open payment router" version = "0.2.0" edition = "2021" default-run = "router" -rust-version = "1.63" +rust-version = "1.64" readme = "README.md" license = "Apache-2.0" diff --git a/crates/router_env/Cargo.toml b/crates/router_env/Cargo.toml index 4bcc9029ba55..d9fb1518a092 100644 --- a/crates/router_env/Cargo.toml +++ b/crates/router_env/Cargo.toml @@ -3,7 +3,7 @@ name = "router_env" description = "Environment of payment router: logger, basic config, its environment awareness." version = "0.1.0" edition = "2021" -rust-version = "1.63" +rust-version = "1.64" readme = "README.md" license = "Apache-2.0" build = "src/build.rs" diff --git a/flake.nix b/flake.nix index 86379fb64eea..7c8d359d158a 100644 --- a/flake.nix +++ b/flake.nix @@ -37,7 +37,7 @@ pkg-config exa fd - rust-bin.stable."1.63.0".default + rust-bin.stable."1.64.0".default ] ++ lib.optionals stdenv.isDarwin [ frameworks.CoreServices frameworks.Foundation ]; # arch might have issue finding these libs. }; From 99ecacc4996946cd2c65e69e3f64ae949507ab16 Mon Sep 17 00:00:00 2001 From: Sanchith Hegde Date: Sun, 11 Dec 2022 19:53:28 +0530 Subject: [PATCH 25/25] build(metadata): add missing metadata fields to newer crates --- crates/common_utils/Cargo.toml | 5 ++++- crates/redis_interface/Cargo.toml | 4 ++++ crates/router_derive/Cargo.toml | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/crates/common_utils/Cargo.toml b/crates/common_utils/Cargo.toml index 6104b8a833ca..6080e6f33e8e 100644 --- a/crates/common_utils/Cargo.toml +++ b/crates/common_utils/Cargo.toml @@ -1,8 +1,11 @@ [package] name = "common_utils" +description = "Utilities shared across router and other crates" version = "0.1.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +rust-version = "1.64" +readme = "README.md" +license = "Apache-2.0" [dependencies] bytes = "1.3.0" diff --git a/crates/redis_interface/Cargo.toml b/crates/redis_interface/Cargo.toml index 1b416e4a3d92..88941eaa9329 100644 --- a/crates/redis_interface/Cargo.toml +++ b/crates/redis_interface/Cargo.toml @@ -1,7 +1,11 @@ [package] name = "redis_interface" +description = "A user-friendly interface to Redis" version = "0.1.0" edition = "2021" +rust-version = "1.64" +readme = "README.md" +license = "Apache-2.0" [dependencies] error-stack = "0.2.4" diff --git a/crates/router_derive/Cargo.toml b/crates/router_derive/Cargo.toml index 5ccdbba2e8c7..e335ff53b350 100644 --- a/crates/router_derive/Cargo.toml +++ b/crates/router_derive/Cargo.toml @@ -3,6 +3,7 @@ name = "router_derive" description = "Utility macros for the router crate" version = "0.1.0" edition = "2021" +rust-version = "1.64" readme = "README.md" license = "Apache-2.0"