From 68fa9f0cb273b26829ae9fc4f815398d827dfa7a Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Thu, 7 Aug 2025 14:52:18 +0200 Subject: [PATCH 1/5] bridge: Upgrade plugin-kafka dependencies --- bridge/Cargo.lock | 108 +++++++++++++++------ bridge/svix-bridge-plugin-kafka/Cargo.toml | 4 +- 2 files changed, 78 insertions(+), 34 deletions(-) diff --git a/bridge/Cargo.lock b/bridge/Cargo.lock index ae6c0e709..118664562 100644 --- a/bridge/Cargo.lock +++ b/bridge/Cargo.lock @@ -1164,9 +1164,9 @@ checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "cmake" -version = "0.1.52" +version = "0.1.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" +checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" dependencies = [ "cc", ] @@ -1282,14 +1282,20 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.9" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" +checksum = "ec09e802f5081de6157da9a75701d6c713d8dc3ba52571fd4bd25f412644e8a6" dependencies = [ - "quote", - "syn 2.0.89", + "ctor-proc-macro", + "dtor", ] +[[package]] +name = "ctor-proc-macro" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2931af7e13dc045d8e9d26afccc6fa115d64e115c9c84b1166288b46f6782c2" + [[package]] name = "data-encoding" version = "2.6.0" @@ -1573,6 +1579,21 @@ dependencies = [ "text_lines", ] +[[package]] +name = "dtor" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97cbdf2ad6846025e8e25df05171abfb30e3ababa12ee0a0e44b9bbe570633a8" +dependencies = [ + "dtor-proc-macro", +] + +[[package]] +name = "dtor-proc-macro" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7454e41ff9012c00d53cf7f475c5e3afa3b91b7c90568495495e8d9bf47a1055" + [[package]] name = "either" version = "1.13.0" @@ -2225,7 +2246,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -2554,6 +2575,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "io-uring" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "libc", +] + [[package]] name = "ipnet" version = "2.10.1" @@ -2680,9 +2712,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.171" +version = "0.2.174" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" [[package]] name = "libloading" @@ -2691,14 +2723,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "libz-sys" -version = "1.1.20" +version = "1.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" +checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" dependencies = [ "cc", "libc", @@ -2736,9 +2768,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "matchers" @@ -3005,9 +3037,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.107" +version = "0.9.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07" +checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571" dependencies = [ "cc", "libc", @@ -3334,9 +3366,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "polling" @@ -3583,9 +3615,9 @@ dependencies = [ [[package]] name = "rdkafka" -version = "0.36.2" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1beea247b9a7600a81d4cc33f659ce1a77e1988323d7d2809c7ed1c21f4c316d" +checksum = "5f1856d72dbbbea0d2a5b2eaf6af7fb3847ef2746e883b11781446a51dbc85c0" dependencies = [ "futures-channel", "futures-util", @@ -3602,9 +3634,9 @@ dependencies = [ [[package]] name = "rdkafka-sys" -version = "4.8.0+2.3.0" +version = "4.9.0+2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced38182dc436b3d9df0c77976f37a67134df26b050df1f0006688e46fc4c8be" +checksum = "5230dca48bc354d718269f3e4353280e188b610f7af7e2fcf54b7a79d5802872" dependencies = [ "cmake", "libc", @@ -4063,18 +4095,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.215" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", @@ -4083,9 +4115,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7" dependencies = [ "indexmap 2.6.0", "itoa", @@ -4284,6 +4316,16 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "socket2" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + [[package]] name = "sourcemap" version = "8.0.1" @@ -4860,20 +4902,22 @@ dependencies = [ [[package]] name = "tokio" -version = "1.44.2" +version = "1.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" +checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" dependencies = [ "backtrace", "bytes", + "io-uring", "libc", "mio", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.7", + "slab", + "socket2 0.6.0", "tokio-macros", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/bridge/svix-bridge-plugin-kafka/Cargo.toml b/bridge/svix-bridge-plugin-kafka/Cargo.toml index 704e24079..1c9a3da26 100644 --- a/bridge/svix-bridge-plugin-kafka/Cargo.toml +++ b/bridge/svix-bridge-plugin-kafka/Cargo.toml @@ -6,7 +6,7 @@ rust-version = "1.85" publish = false [dependencies] -rdkafka = { version = "0.36.2", features = ["cmake-build", "ssl", "tracing"] } +rdkafka = { version = "0.38.0", features = ["cmake-build", "ssl", "tracing"] } serde.workspace = true serde_json.workspace = true svix-bridge-types.workspace = true @@ -15,7 +15,7 @@ tokio = { workspace = true, features = ["time"] } tracing.workspace = true [dev-dependencies] -ctor = "0.2.8" +ctor = "0.4.3" tracing-subscriber.workspace = true wiremock.workspace = true From d205848e7d404c6092fc4f3d7cb3256be7a7e62a Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Thu, 7 Aug 2025 14:56:31 +0200 Subject: [PATCH 2/5] bridge: Upgrade tower --- bridge/Cargo.lock | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/bridge/Cargo.lock b/bridge/Cargo.lock index 118664562..f0e47eaa8 100644 --- a/bridge/Cargo.lock +++ b/bridge/Cargo.lock @@ -779,9 +779,9 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", - "tower 0.5.1", + "tower 0.5.2", "tower-layer", "tower-service", "tracing", @@ -802,7 +802,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.2", + "sync_wrapper", "tower-layer", "tower-service", "tracing", @@ -2990,7 +2990,7 @@ dependencies = [ "serde", "serde_json", "svix-ksuid", - "sync_wrapper 1.0.2", + "sync_wrapper", "thiserror 1.0.69", "time", "tokio", @@ -3771,7 +3771,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", "tokio-native-tls", "tower-service", @@ -4489,7 +4489,7 @@ dependencies = [ "tikv-jemalloc-ctl", "tikv-jemallocator", "tokio", - "tower 0.5.1", + "tower 0.5.2", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -4703,12 +4703,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.2" @@ -5105,14 +5099,14 @@ dependencies = [ [[package]] name = "tower" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", "pin-project-lite", - "sync_wrapper 0.1.2", + "sync_wrapper", "tokio", "tower-layer", "tower-service", From 1e6dc14b276d9d9e8a10587bd5c4be3ac0af7276 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Thu, 7 Aug 2025 14:57:37 +0200 Subject: [PATCH 3/5] bridge: Upgrade itertools --- bridge/Cargo.lock | 2 +- bridge/svix-bridge/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bridge/Cargo.lock b/bridge/Cargo.lock index f0e47eaa8..1213987eb 100644 --- a/bridge/Cargo.lock +++ b/bridge/Cargo.lock @@ -4473,7 +4473,7 @@ dependencies = [ "deno_ast", "deno_core", "enum_dispatch", - "itertools 0.13.0", + "itertools 0.14.0", "once_cell", "opentelemetry", "opentelemetry-otlp", diff --git a/bridge/svix-bridge/Cargo.toml b/bridge/svix-bridge/Cargo.toml index 05cd1652d..b33effc7c 100644 --- a/bridge/svix-bridge/Cargo.toml +++ b/bridge/svix-bridge/Cargo.toml @@ -10,7 +10,7 @@ anyhow = "1" clap = { version = "4.2.4", features = ["env", "derive"] } axum = { version = "0.7.7", features = ["macros"] } enum_dispatch = "0.3" -itertools = "0.13.0" +itertools = "0.14.0" once_cell = "1.18.0" opentelemetry = "0.26.0" opentelemetry_sdk = { version = "0.26.0", features = ["metrics", "rt-tokio"] } From 05a504ea7a7d4cc4a6cae6c3ef91a740be879cc9 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Thu, 7 Aug 2025 14:58:45 +0200 Subject: [PATCH 4/5] bridge: Upgrade deadpool --- bridge/Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bridge/Cargo.lock b/bridge/Cargo.lock index 1213987eb..b4b659c2f 100644 --- a/bridge/Cargo.lock +++ b/bridge/Cargo.lock @@ -1322,9 +1322,9 @@ dependencies = [ [[package]] name = "deadpool" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6541a3916932fe57768d4be0b1ffb5ec7cbf74ca8c903fdfd5c0fe8aa958f0ed" +checksum = "5ed5957ff93768adf7a65ab167a17835c3d2c3c50d084fe305174c112f468e2f" dependencies = [ "deadpool-runtime", "num_cpus", @@ -4469,7 +4469,7 @@ dependencies = [ "axum", "chrono", "clap", - "deadpool 0.12.1", + "deadpool 0.12.2", "deno_ast", "deno_core", "enum_dispatch", From a119ed784164c9812a9db8e95f59e942edbe2023 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Thu, 7 Aug 2025 15:04:52 +0200 Subject: [PATCH 5/5] bridge: Upgrade plugin-queue dependencies --- bridge/Cargo.lock | 248 ++++++++++-------- bridge/svix-bridge-plugin-queue/Cargo.toml | 10 +- .../tests/it/gcp_pubsub_consumer.rs | 4 +- 3 files changed, 140 insertions(+), 122 deletions(-) diff --git a/bridge/Cargo.lock b/bridge/Cargo.lock index b4b659c2f..6949ef857 100644 --- a/bridge/Cargo.lock +++ b/bridge/Cargo.lock @@ -179,12 +179,6 @@ version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - [[package]] name = "asn1-rs" version = "0.6.2" @@ -885,11 +879,10 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bb8" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89aabfae550a5c44b43ab941844ffcd2e993cb6900b342debf59e9ea74acdb8" +checksum = "212d8b8e1a22743d9241575c6ba822cf9c8fef34771c86ab7e477a4fbfd254e5" dependencies = [ - "async-trait", "futures-util", "parking_lot", "tokio", @@ -897,11 +890,10 @@ dependencies = [ [[package]] name = "bb8-redis" -version = "0.17.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1781f22daa0ae97d934fdf04a5c66646f154a164c4bdc157ec8d3c11166c05cc" +checksum = "5143936af5e1eea1a881e3e3d21b6777da6315e5e307bc3d0c2301c44fa37da9" dependencies = [ - "async-trait", "bb8", "redis", ] @@ -1050,9 +1042,9 @@ dependencies = [ [[package]] name = "bytesize" -version = "1.3.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" +checksum = "a3c8f83209414aacf0eeae3cf730b18d6981697fba62f200fcfb92b9f082acba" [[package]] name = "cbc" @@ -1890,62 +1882,14 @@ dependencies = [ ] [[package]] -name = "generic-array" -version = "0.14.7" +name = "gcloud-auth" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "getrandom" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.13.3+wasi-0.2.2", - "windows-targets 0.52.6", -] - -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "google-cloud-auth" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e57a13fbacc5e9c41ded3ad8d0373175a6b7a6ad430d99e89d314ac121b7ab06" +checksum = "4089aeec499899f6f1309803279763c34d898ca86c1a3e4616cba3ca6bce34b7" dependencies = [ "async-trait", - "base64 0.21.7", - "google-cloud-metadata", - "google-cloud-token", + "base64 0.22.1", + "gcloud-metadata", "home", "jsonwebtoken", "reqwest", @@ -1953,43 +1897,44 @@ dependencies = [ "serde_json", "thiserror 1.0.69", "time", + "token-source", "tokio", "tracing", "urlencoding", ] [[package]] -name = "google-cloud-gax" -version = "0.19.2" +name = "gcloud-gax" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de13e62d7e0ffc3eb40a0113ddf753cf6ec741be739164442b08893db4f9bfca" +checksum = "cb0a39057a0654184e074ddefb734c9a326ba468663b8f329c95f0069b5ccdb5" dependencies = [ - "google-cloud-token", "http 1.1.0", "thiserror 1.0.69", + "token-source", "tokio", "tokio-retry2", - "tonic", + "tonic 0.13.1", "tower 0.4.13", "tracing", ] [[package]] -name = "google-cloud-googleapis" -version = "0.15.0" +name = "gcloud-googleapis" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae8ab26ef7c7c3f7dfb9cc3982293d031d8e78c85d00ddfb704b5c35aeff7c8" +checksum = "501459a508e7887cfedc45a45ee41602ac1f66d2b61deb05f1c2256bf2faf46d" dependencies = [ "prost", "prost-types", - "tonic", + "tonic 0.13.1", ] [[package]] -name = "google-cloud-metadata" -version = "0.5.0" +name = "gcloud-metadata" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f945a208886a13d07636f38fb978da371d0abc3e34bad338124b9f8c135a8f" +checksum = "6d575310b4546530f6b21ee000c20155f11f9291fa0b67ea0949fd48aa49ed70" dependencies = [ "reqwest", "thiserror 1.0.69", @@ -1997,33 +1942,71 @@ dependencies = [ ] [[package]] -name = "google-cloud-pubsub" -version = "0.29.1" +name = "gcloud-pubsub" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045a337f4f21327a27721df5699d395d7f5b56be6e1d5fcb35591364d5d02147" +checksum = "f1d55e2652753753d902a84c56613b9ae35a36416d94e56c1268764bc7e79f05" dependencies = [ "async-channel 1.9.0", "async-stream", - "google-cloud-auth", - "google-cloud-gax", - "google-cloud-googleapis", - "google-cloud-token", + "gcloud-auth", + "gcloud-gax", + "gcloud-googleapis", "prost-types", "thiserror 1.0.69", + "token-source", "tokio", "tokio-util", "tracing", ] [[package]] -name = "google-cloud-token" -version = "0.1.2" +name = "generic-array" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f49c12ba8b21d128a2ce8585955246977fbce4415f680ebf9199b6f9d6d725f" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ - "async-trait", + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets 0.52.6", ] +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + [[package]] name = "gzip-header" version = "1.0.0" @@ -2678,9 +2661,9 @@ dependencies = [ [[package]] name = "lapin" -version = "2.5.0" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209b09a06f4bd4952a0fd0594f90d53cf4496b062f59acc838a2823e1bb7d95c" +checksum = "262f8d3c073435073c3e50bf2d63b361c143dcf418505b8c451fd23c7082a302" dependencies = [ "amq-protocol", "async-global-executor-trait", @@ -2975,7 +2958,7 @@ dependencies = [ [[package]] name = "omniqueue" version = "0.2.1" -source = "git+https://github.com/svix/omniqueue-rs?rev=e953ce07621a33708a4c28d9a5cfe431ede45dee#e953ce07621a33708a4c28d9a5cfe431ede45dee" +source = "git+https://github.com/svix/omniqueue-rs?rev=e7e328a576f921ca58d0bdb56b8df69fd996172d#e7e328a576f921ca58d0bdb56b8df69fd996172d" dependencies = [ "aws-config", "aws-sdk-sqs", @@ -2983,15 +2966,15 @@ dependencies = [ "bb8-redis", "bytesize", "futures-util", - "google-cloud-googleapis", - "google-cloud-pubsub", + "gcloud-googleapis", + "gcloud-pubsub", "lapin", "redis", "serde", "serde_json", "svix-ksuid", "sync_wrapper", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tracing", @@ -3091,7 +3074,7 @@ dependencies = [ "reqwest", "thiserror 1.0.69", "tokio", - "tonic", + "tonic 0.12.3", ] [[package]] @@ -3103,7 +3086,7 @@ dependencies = [ "opentelemetry", "opentelemetry_sdk", "prost", - "tonic", + "tonic 0.12.3", ] [[package]] @@ -3659,13 +3642,12 @@ dependencies = [ [[package]] name = "redis" -version = "0.27.5" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cccf17a692ce51b86564334614d72dcae1def0fd5ecebc9f02956da74352b5" +checksum = "e1f66bf4cac9733a23bcdf1e0e01effbaaad208567beba68be8f67e5f4af3ee1" dependencies = [ - "arc-swap", - "async-trait", "bytes", + "cfg-if", "combine", "futures-util", "itoa", @@ -3675,7 +3657,7 @@ dependencies = [ "pin-project-lite", "ryu", "sha1_smol", - "socket2 0.5.7", + "socket2 0.6.0", "tokio", "tokio-native-tls", "tokio-util", @@ -3890,9 +3872,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.19" +version = "0.23.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" +checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395" dependencies = [ "log", "once_cell", @@ -3910,7 +3892,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a980454b497c439c274f2feae2523ed8138bbd3d323684e1435fec62f800481" dependencies = [ "log", - "rustls 0.23.19", + "rustls 0.23.23", "rustls-native-certs 0.7.3", "rustls-pki-types", "rustls-webpki 0.102.8", @@ -4518,8 +4500,8 @@ dependencies = [ "aws-config", "aws-sdk-sqs", "fastrand 2.2.0", - "google-cloud-googleapis", - "google-cloud-pubsub", + "gcloud-googleapis", + "gcloud-pubsub", "lapin", "omniqueue", "redis", @@ -4894,6 +4876,15 @@ dependencies = [ "zerovec", ] +[[package]] +name = "token-source" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75746ae15bef509f21039a652383104424208fdae172a964a8930858b9a78412" +dependencies = [ + "async-trait", +] + [[package]] name = "tokio" version = "1.47.1" @@ -4993,12 +4984,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" dependencies = [ - "rustls 0.23.19", - "rustls-pki-types", + "rustls 0.23.23", "tokio", ] @@ -5054,7 +5044,6 @@ dependencies = [ "axum", "base64 0.22.1", "bytes", - "flate2", "h2 0.4.7", "http 1.1.0", "http-body 1.0.1", @@ -5065,15 +5054,41 @@ dependencies = [ "percent-encoding", "pin-project", "prost", - "rustls-pemfile 2.2.0", "socket2 0.5.7", "tokio", - "tokio-rustls 0.26.0", "tokio-stream", "tower 0.4.13", "tower-layer", "tower-service", "tracing", +] + +[[package]] +name = "tonic" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e581ba15a835f4d9ea06c55ab1bd4dce26fc53752c69a04aac00703bfb49ba9" +dependencies = [ + "async-trait", + "base64 0.22.1", + "bytes", + "flate2", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.5.1", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "prost", + "tokio", + "tokio-rustls 0.26.2", + "tokio-stream", + "tower 0.5.2", + "tower-layer", + "tower-service", + "tracing", "webpki-roots", ] @@ -5105,9 +5120,12 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", + "indexmap 2.6.0", "pin-project-lite", + "slab", "sync_wrapper", "tokio", + "tokio-util", "tower-layer", "tower-service", "tracing", diff --git a/bridge/svix-bridge-plugin-queue/Cargo.toml b/bridge/svix-bridge-plugin-queue/Cargo.toml index 16baae24e..1d12fc8eb 100644 --- a/bridge/svix-bridge-plugin-queue/Cargo.toml +++ b/bridge/svix-bridge-plugin-queue/Cargo.toml @@ -17,7 +17,7 @@ tracing = "0.1" [dependencies.omniqueue] git = "https://github.com/svix/omniqueue-rs" -rev = "e953ce07621a33708a4c28d9a5cfe431ede45dee" +rev = "e7e328a576f921ca58d0bdb56b8df69fd996172d" default-features = false features = ["gcp_pubsub", "rabbitmq", "redis", "sqs"] @@ -25,10 +25,10 @@ features = ["gcp_pubsub", "rabbitmq", "redis", "sqs"] aws-config = "1.1.5" aws-sdk-sqs = "1.13.0" fastrand = "2.0.1" -google-cloud-googleapis = "0.15.0" -google-cloud-pubsub = "0.29.1" -lapin = "2" -redis = { version = "0.27.2", features = ["tokio-comp", "streams"] } +gcloud-googleapis = "1.2.0" +gcloud-pubsub = "1.3.0" +lapin = "2.5.4" +redis = { version = "0.32.4", features = ["tokio-comp", "streams"] } tracing-subscriber.workspace = true wiremock.workspace = true diff --git a/bridge/svix-bridge-plugin-queue/tests/it/gcp_pubsub_consumer.rs b/bridge/svix-bridge-plugin-queue/tests/it/gcp_pubsub_consumer.rs index 35cc7667e..5c05d7464 100644 --- a/bridge/svix-bridge-plugin-queue/tests/it/gcp_pubsub_consumer.rs +++ b/bridge/svix-bridge-plugin-queue/tests/it/gcp_pubsub_consumer.rs @@ -5,8 +5,8 @@ use std::time::Duration; -use google_cloud_googleapis::pubsub::v1::{DeadLetterPolicy, PubsubMessage}; -use google_cloud_pubsub::{ +use gcloud_googleapis::pubsub::v1::{DeadLetterPolicy, PubsubMessage}; +use gcloud_pubsub::{ client::{Client, ClientConfig}, subscription::{Subscription, SubscriptionConfig}, topic::Topic,