From 8f805bad5fc62145595d6b72be7665eede7c5e5f Mon Sep 17 00:00:00 2001
From: David Herberth <david.herberth@sentry.io>
Date: Thu, 19 Sep 2024 10:28:30 +0200
Subject: [PATCH] ref(redis): Changes redis fork to improved PR for timeout
 issues

---
 Cargo.lock                                   | 5 ++---
 Cargo.toml                                   | 4 ++--
 relay-cardinality/benches/redis_impl.rs      | 2 +-
 relay-cardinality/src/redis/script.rs        | 5 ++++-
 relay-server/src/services/processor/event.rs | 3 +--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 395ffaba789..1b383fb8360 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3127,8 +3127,8 @@ dependencies = [
 
 [[package]]
 name = "redis"
-version = "0.25.3"
-source = "git+https://github.com/getsentry/redis-rs.git?rev=939e5df6f9cc976b0a53987f6eb3f76b2c398bd6#939e5df6f9cc976b0a53987f6eb3f76b2c398bd6"
+version = "0.27.2"
+source = "git+https://github.com/getsentry/redis-rs.git?rev=fc7d98cc10c16fa7c0c31de64dc1b713354a4384#fc7d98cc10c16fa7c0c31de64dc1b713354a4384"
 dependencies = [
  "arc-swap",
  "combine",
@@ -3142,7 +3142,6 @@ dependencies = [
  "ryu",
  "sha1_smol",
  "socket2",
- "tokio",
  "url",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 8f41c6b8555..c53dcf749a8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -130,8 +130,8 @@ rand_pcg = "0.3.1"
 rayon = "1.10"
 rdkafka = "0.36.2"
 rdkafka-sys = "4.3.0"
-# Git revision until https://github.com/redis-rs/redis-rs/pull/1097 (merged) and https://github.com/redis-rs/redis-rs/pull/1253 are released.
-redis = { git = "https://github.com/getsentry/redis-rs.git", rev = "939e5df6f9cc976b0a53987f6eb3f76b2c398bd6", default-features = false }
+# Git revision until https://github.com/redis-rs/redis-rs/pull/1097 (merged) and https://github.com/redis-rs/redis-rs/pull/1290 are released.
+redis = { git = "https://github.com/getsentry/redis-rs.git", rev = "fc7d98cc10c16fa7c0c31de64dc1b713354a4384", default-features = false }
 regex = "1.10.2"
 regex-lite = "0.1.6"
 reqwest = "0.12.7"
diff --git a/relay-cardinality/benches/redis_impl.rs b/relay-cardinality/benches/redis_impl.rs
index 310cac390f2..07f1375887c 100644
--- a/relay-cardinality/benches/redis_impl.rs
+++ b/relay-cardinality/benches/redis_impl.rs
@@ -27,7 +27,7 @@ fn build_limiter(redis: RedisPool, reset_redis: bool) -> RedisSetLimiter {
     let mut connection = client.connection().unwrap();
 
     if reset_redis {
-        redis::cmd("FLUSHALL").execute(&mut connection);
+        redis::cmd("FLUSHALL").exec(&mut connection).unwrap();
     }
 
     RedisSetLimiter::new(
diff --git a/relay-cardinality/src/redis/script.rs b/relay-cardinality/src/redis/script.rs
index a3b3d495895..f71e3a94e2d 100644
--- a/relay-cardinality/src/redis/script.rs
+++ b/relay-cardinality/src/redis/script.rs
@@ -278,7 +278,10 @@ mod tests {
         let script = CardinalityScript::load();
         let keys = keys(Uuid::new_v4(), &["a", "b", "c"]);
 
-        redis::cmd("SCRIPT").arg("FLUSH").execute(&mut connection);
+        redis::cmd("SCRIPT")
+            .arg("FLUSH")
+            .exec(&mut connection)
+            .unwrap();
         script
             .invoke_one(&mut connection, 50, 3600, 0..30, keys)
             .unwrap();
diff --git a/relay-server/src/services/processor/event.rs b/relay-server/src/services/processor/event.rs
index eee0c3ff79f..54fec8d519f 100644
--- a/relay-server/src/services/processor/event.rs
+++ b/relay-server/src/services/processor/event.rs
@@ -872,8 +872,7 @@ mod tests {
 
         let event = Annotated::new(Event {
             release: Annotated::new(
-                String::from("���7��#1G����7��#1G����7��#1G����7��#1G����7��#")
-                    .into(),
+                String::from("���7��#1G����7��#1G����7��#1G����7��#1G����7��#").into(),
             ),
             ..Default::default()
         });