From 8c02fecbace4ef4c676c8a40818b7887b9a1de73 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 01:26:56 +0000 Subject: [PATCH] fix(deps): update rust crate serde_json to v1.0.135 --- Cargo.lock | 230 ++++------------------------------------------ server/Cargo.toml | 39 ++++---- 2 files changed, 36 insertions(+), 233 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6241e366..bfdd6f8a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,7 +27,7 @@ checksum = "f9e772b3bcafe335042b5db010ab7c09013dad6eac4915c91d8d50902769f331" dependencies = [ "actix-utils", "actix-web", - "derive_more 0.99.18", + "derive_more", "futures-util", "log", "once_cell", @@ -51,7 +51,7 @@ dependencies = [ "brotli", "bytes", "bytestring", - "derive_more 0.99.18", + "derive_more", "encoding_rs", "flate2", "futures-core", @@ -229,7 +229,7 @@ dependencies = [ "bytestring", "cfg-if", "cookie", - "derive_more 0.99.18", + "derive_more", "encoding_rs", "futures-core", "futures-util", @@ -263,55 +263,6 @@ dependencies = [ "syn 2.0.82", ] -[[package]] -name = "actix-web-lab" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee75923689132fc5fb57ccc5bb98d25bb214796a29cd505844eb3b42daf11df0" -dependencies = [ - "actix-http", - "actix-router", - "actix-service", - "actix-utils", - "actix-web", - "actix-web-lab-derive", - "ahash", - "arc-swap", - "bytes", - "bytestring", - "csv", - "derive_more 1.0.0", - "form_urlencoded", - "futures-core", - "futures-util", - "http 0.2.12", - "impl-more", - "itertools 0.13.0", - "local-channel", - "mediatype", - "mime", - "pin-project-lite", - "regex", - "serde", - "serde_html_form", - "serde_json", - "serde_path_to_error", - "tokio", - "tokio-stream", - "tracing", -] - -[[package]] -name = "actix-web-lab-derive" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c221da13534b9352f3f79fcbbd6095f6d8aee63bdf1da8a73d36f9eeea17d5a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.82", -] - [[package]] name = "addr2line" version = "0.24.2" @@ -493,7 +444,7 @@ dependencies = [ "base64 0.22.1", "bytes", "cfg-if", - "derive_more 0.99.18", + "derive_more", "futures-core", "futures-util", "h2 0.3.26", @@ -1071,15 +1022,6 @@ dependencies = [ "bytes", ] -[[package]] -name = "capture-logger" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "605a59c5054ce9e87cd329251bcc4c04579d5edbd206b1e4c45fbfe24b13ff82" -dependencies = [ - "log", -] - [[package]] name = "cc" version = "1.1.30" @@ -1338,27 +1280,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "csv" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - [[package]] name = "darling" version = "0.20.10" @@ -1483,27 +1404,6 @@ dependencies = [ "syn 2.0.82", ] -[[package]] -name = "derive_more" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" -dependencies = [ - "derive_more-impl", -] - -[[package]] -name = "derive_more-impl" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.82", - "unicode-xid", -] - [[package]] name = "digest" version = "0.10.7" @@ -1634,22 +1534,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "eventsource-client" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ddc25e1ad2cc0106d5e2d967397b4fb2068a66677ee9b0eea4600e5cfe8fb4" -dependencies = [ - "futures", - "hyper 0.14.31", - "hyper-rustls 0.24.2", - "hyper-timeout", - "log", - "pin-project", - "rand", - "tokio", -] - [[package]] name = "fastrand" version = "2.1.1" @@ -2137,18 +2021,6 @@ dependencies = [ "webpki-roots", ] -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper 0.14.31", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - [[package]] name = "hyper-tls" version = "0.6.0" @@ -2477,12 +2349,6 @@ dependencies = [ "digest", ] -[[package]] -name = "mediatype" -version = "0.19.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8878cd8d1b3c8c8ae4b2ba0a36652b7cf192f618a599a7fbdfa25cffd4ea72dd" - [[package]] name = "memchr" version = "2.7.4" @@ -2674,56 +2540,55 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.27.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab70038c28ed37b97d8ed414b6429d343a8bbf44c9f79ec854f3a643029ba6d7" +checksum = "4c365a63eec4f55b7efeceb724f1336f26a9cf3427b70e59e2cd2a5b947fba96" dependencies = [ "futures-core", "futures-sink", "js-sys", + "once_cell", "pin-project-lite", "thiserror", - "tracing", ] [[package]] name = "opentelemetry-prometheus" -version = "0.27.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b834e966ea5e2d03dfe5f2253f03d22cce21403ee940265070eeee96cee0bcc" +checksum = "cc4191ce34aa274621861a7a9d68dbcf618d5b6c66b10081631b61fd81fbc015" dependencies = [ "once_cell", "opentelemetry", "opentelemetry_sdk", "prometheus", "protobuf", - "tracing", ] [[package]] name = "opentelemetry-semantic-conventions" -version = "0.27.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc1b6902ff63b32ef6c489e8048c5e253e2e4a803ea3ea7e783914536eb15c52" +checksum = "1cefe0543875379e47eb5f1e68ff83f45cc41366a92dfd0d073d513bf68e9a05" [[package]] name = "opentelemetry_sdk" -version = "0.27.1" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "231e9d6ceef9b0b2546ddf52335785ce41252bc7474ee8ba05bfad277be13ab8" +checksum = "692eac490ec80f24a17828d49b40b60f5aeaccdfe6a503f939713afd22bc28df" dependencies = [ "async-trait", "futures-channel", "futures-executor", "futures-util", "glob", + "once_cell", "opentelemetry", "percent-encoding", "rand", "serde", "serde_json", "thiserror", - "tracing", ] [[package]] @@ -2854,26 +2719,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "pin-project" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.82", -] - [[package]] name = "pin-project-lite" version = "0.2.14" @@ -3548,24 +3393,11 @@ dependencies = [ "syn 2.0.82", ] -[[package]] -name = "serde_html_form" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de514ef58196f1fc96dcaef80fe6170a1ce6215df9687a93fe8300e773fefc5" -dependencies = [ - "form_urlencoded", - "indexmap 2.6.0", - "itoa", - "ryu", - "serde", -] - [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", "memchr", @@ -3573,16 +3405,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_path_to_error" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" -dependencies = [ - "itoa", - "serde", -] - [[package]] name = "serde_qs" version = "0.13.0" @@ -3680,9 +3502,9 @@ dependencies = [ [[package]] name = "shadow-rs" -version = "0.36.0" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cfcd0643497a9f780502063aecbcc4a3212cbe4948fd25ee8fd179c2cf9a18" +checksum = "f1b2328fb3ec0d5302f95915e7e77cfc2ff943714d9970bc4b66e9eacf318687" dependencies = [ "const_format", "git2", @@ -4052,16 +3874,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.4.0" @@ -4347,7 +4159,7 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unleash-edge" -version = "19.6.3" +version = "19.6.1" dependencies = [ "actix-cors", "actix-http", @@ -4355,21 +4167,18 @@ dependencies = [ "actix-middleware-etag", "actix-service", "actix-web", - "actix-web-lab", "ahash", "anyhow", "async-trait", "aws-config", "aws-sdk-s3", "base64 0.22.1", - "capture-logger", "chrono", "cidr", "clap", "clap-markdown", "dashmap", "env_logger", - "eventsource-client", "futures", "futures-core", "iter_tools", @@ -4399,7 +4208,6 @@ dependencies = [ "testcontainers", "testcontainers-modules", "tokio", - "tokio-stream", "tracing", "tracing-subscriber", "tracing-test", diff --git a/server/Cargo.toml b/server/Cargo.toml index 629a2b21..d8232080 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -12,8 +12,7 @@ homepage = "https://github.com/Unleash/unleash-edge" license = "MIT" name = "unleash-edge" repository = "https://github.com/Unleash/unleash-edge" -rust-version = "1.81.0" -version = "19.6.3" +version = "19.6.1" [package.metadata.wix] upgrade-guid = "11E5D83A-3034-48BB-9A84-9F589EBD648C" @@ -30,29 +29,27 @@ actix-http = "3.9.0" actix-middleware-etag = "0.4.2" actix-service = "2.0.2" actix-web = { version = "4.9.0", features = ["rustls-0_23", "compress-zstd"] } -actix-web-lab = { version = "0.23.0" } ahash = "0.8.11" -anyhow = "1.0.94" +anyhow = "1.0.91" async-trait = "0.1.83" -aws-config = { version = "1.5.10", features = ["behavior-version-latest"] } -aws-sdk-s3 = { version = "1.65.0", features = ["behavior-version-latest"] } +aws-config = { version = "1.5.7", features = ["behavior-version-latest"] } +aws-sdk-s3 = { version = "1.57.0", features = ["behavior-version-latest"] } base64 = "0.22.1" -chrono = { version = "0.4.39", features = ["serde"] } +chrono = { version = "0.4.38", features = ["serde"] } cidr = "0.3.0" -clap = { version = "4.5.23", features = ["derive", "env"] } +clap = { version = "4.5.19", features = ["derive", "env"] } clap-markdown = "0.1.4" dashmap = "6.0.1" -eventsource-client = { version = "0.13.0" } futures = "0.3.30" futures-core = "0.3.30" iter_tools = "0.24.0" itertools = "0.13.0" lazy_static = "1.4.0" num_cpus = "1.16.0" -opentelemetry = { version = "0.27.0", features = ["trace", "metrics"] } -opentelemetry-prometheus = "0.27.0" -opentelemetry-semantic-conventions = "0.27.0" -opentelemetry_sdk = { version = "0.27.0", features = [ +opentelemetry = { version = "0.24.0", features = ["trace", "metrics"] } +opentelemetry-prometheus = "0.17.0" +opentelemetry-semantic-conventions = "0.16.0" +opentelemetry_sdk = { version = "0.24.0", features = [ "metrics", "serde", "serde_json", @@ -62,17 +59,17 @@ prometheus = { version = "0.13.4", features = ["process"] } prometheus-reqwest-remote-write = { version = "0.2.1" } prometheus-static-metric = "0.5.1" rand = "0.8.5" -redis = { version = "0.27.6", features = [ +redis = { version = "0.27.5", features = [ "tokio-comp", "tokio-rustls-comp", "cluster", ] } -reqwest = { version = "0.12.9", default-features = false, features = [ +reqwest = { version = "0.12.8", default-features = false, features = [ "json", "rustls-tls", "native-tls", ] } -rustls = { version = "0.23.18", default-features = false, features = [ +rustls = { version = "0.23.15", default-features = false, features = [ "logging", "ring", "std", @@ -83,26 +80,24 @@ semver = "1.0.23" serde = { version = "1.0.213", features = ["derive"] } serde_json = "1.0.132" serde_qs = { version = "0.13.0", features = ["actix4", "tracing"] } -shadow-rs = { version = "0.36.0" } -tokio = { version = "1.42.0", features = [ +shadow-rs = { version = "0.35.0" } +tokio = { version = "1.41.0", features = [ "macros", "rt-multi-thread", "tracing", "fs", ] } -tokio-stream = { version = "0.1.17" } tracing = { version = "0.1.40", features = ["log"] } tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] } ulid = "1.1.2" unleash-types = { version = "0.14", features = ["openapi", "hashes"] } -unleash-yggdrasil = { version = "0.14.1" } +unleash-yggdrasil = { version = "0.14.0" } utoipa = { version = "5", features = ["actix_extras", "chrono"] } utoipa-swagger-ui = { version = "8", features = ["actix-web"] } [dev-dependencies] actix-http = "3.9.0" actix-http-test = "3.2.0" actix-service = "2.0.2" -capture-logger = "0.1.1" env_logger = "0.11.5" maplit = "1.0.2" rand = "0.8.5" @@ -115,4 +110,4 @@ testcontainers-modules = { version = "0.11.3", features = [ tracing-test = "0.2.5" [build-dependencies] -shadow-rs = "0.36.0" +shadow-rs = "0.35.0"