Update more deps

Author: rukai

Cargo.lock

@@ -37,8 +37,8 @@ serde_yaml = "0.9.17"
 uuid = { version = "1.0.0", features = ["serde", "v4"] }
 reqwest = { version = "0.13.0", default-features = false, features = ["http2"] }
 redis = { version = "0.29.2", features = ["tokio-comp", "tokio-rustls-comp", "tls-rustls-insecure", "cluster"] }
-cdrs-tokio = "8.0"
-cassandra-protocol = "3.0"
+cdrs-tokio = "9.0"
+cassandra-protocol = "4.0"
 # https://docs.rs/tracing/latest/tracing/level_filters/index.html#compile-time-filters
 # `trace` level is considered development only, and may contain sensitive data, do not include it in release builds.
 tracing = { version = "0.1.15", features = ["release_max_level_debug"] }
@@ -53,7 +53,7 @@ redis-protocol = { version = "6.0.0", features = ["bytes"] }
 futures = "0.3"
 hex = "0.4.3"
 hex-literal = "1.0.0"
-rand = { version = "0.9.0", default-features = false }
+rand = { version = "0.10.0", default-features = false, features = ["thread_rng"] }
 clap = { version = "4.0.4", features = ["cargo", "derive"] }
 async-trait = "0.1.30"
 typetag = "0.2.5"

Cargo.toml

@@ -1,4 +1,4 @@
-use rand::Rng;
+use rand::RngExt;
 use test_helpers::connection::cassandra::{
     CassandraConnection, ResultValue, assert_query_result, run_query,
 };

shotover-proxy/tests/cassandra_int_tests/batch_statements.rs

@@ -175,7 +175,7 @@ mod compound_key {
 mod composite_key {
 
     use super::assert_eq;
-    use rand::{Rng, distr::Alphanumeric};
+    use rand::{RngExt, distr::Alphanumeric};
     use test_helpers::connection::cassandra::{
         CassandraConnection, Consistency, ResultValue, run_query,
     };

shotover-proxy/tests/cassandra_int_tests/routing.rs

@@ -26,7 +26,6 @@ async fn test_metrics() {
 connections_opened{source="valkey"}
 shotover_available_connections_count{source="valkey"}
 shotover_chain_failures_count{chain="valkey"}
-shotover_chain_messages_per_batch_count_count{chain="valkey"}
 shotover_chain_messages_per_batch_count_sum{chain="valkey"}
 shotover_chain_messages_per_batch_count{chain="valkey",quantile="0"}
 shotover_chain_messages_per_batch_count{chain="valkey",quantile="0.1"}
@@ -36,6 +35,7 @@ shotover_chain_messages_per_batch_count{chain="valkey",quantile="0.95"}
 shotover_chain_messages_per_batch_count{chain="valkey",quantile="0.99"}
 shotover_chain_messages_per_batch_count{chain="valkey",quantile="0.999"}
 shotover_chain_messages_per_batch_count{chain="valkey",quantile="1"}
+shotover_chain_messages_per_batch_count{chain="valkey"}
 shotover_chain_requests_batch_size_count{chain="valkey"}
 shotover_chain_requests_batch_size_sum{chain="valkey"}
 shotover_chain_requests_batch_size{chain="valkey",quantile="0"}

shotover-proxy/tests/runner/observability_int_tests.rs

@@ -5,7 +5,7 @@ use fred::clients::Client;
 use fred::interfaces::ClientLike;
 use pretty_assertions::assert_eq;
 use rand::distr::Alphanumeric;
-use rand::{Rng, rng};
+use rand::{RngExt, rng};
 use redis::aio::MultiplexedConnection;
 use redis::cluster::ClusterConnection;
 use redis::{AsyncCommands, Commands, ErrorKind, RedisError, Value};

shotover-proxy/tests/valkey_int_tests/basic_driver_tests.rs

@@ -48,8 +48,8 @@ governor = { version = "0.10", default-features = false, features = [
 ] }
 nonzero_ext = "0.3.0"
 version-compare = { version = "0.2", optional = true }
-rand = { features = ["small_rng"], workspace = true }
-lz4_flex = { version = "0.11.0", optional = true }
+rand = { workspace = true }
+lz4_flex = { version = "0.12.0", optional = true }
 clap.workspace = true
 itertools.workspace = true
 bytes.workspace = true
@@ -91,7 +91,7 @@ http = { version = "1.0.0", optional = true }
 
 #Observability
 metrics = "0.24.0"
-metrics-exporter-prometheus = { version = "0.17.0", default-features = false }
+metrics-exporter-prometheus = { version = "0.18.0", default-features = false }
 tracing.workspace = true
 tracing-subscriber.workspace = true
 tracing-appender.workspace = true

shotover/Cargo.toml

@@ -5,7 +5,7 @@ use kafka_protocol::messages::BrokerId;
 use kafka_protocol::protocol::StrBytes;
 use metrics::{Gauge, gauge};
 use rand::rngs::StdRng;
-use rand::{Rng, SeedableRng};
+use rand::{RngExt, SeedableRng};
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use std::sync::atomic::Ordering;

shotover/src/transforms/kafka/sink_cluster/shotover_node.rs

@@ -31,7 +31,7 @@ reqwest.workspace = true
 tracing-subscriber.workspace = true
 anyhow.workspace = true
 rcgen.workspace = true
-rdkafka = { version = "0.37", features = ["cmake-build"], optional = true }
+rdkafka = { version = "0.39", features = ["cmake-build"], optional = true }
 docker-compose-runner = "0.3.0"
 j4rs = "0.24.0"
 futures-util = "0.3.28"

test-helpers/Cargo.toml

@@ -142,11 +142,11 @@ impl KafkaProducerCpp {
             .unwrap();
 
         if let Some(offset) = expected_offset {
-            assert_eq!(delivery_status.1, offset, "Unexpected offset");
+            assert_eq!(delivery_status.offset, offset, "Unexpected offset");
         }
 
         ProduceResult {
-            partition: delivery_status.0,
+            partition: delivery_status.partition,
         }
     }