From b2cb7cf7fc6f556937da61ea514b95e099bd9d5f Mon Sep 17 00:00:00 2001
From: Ivana Kellyerova <ivana.kellyerova@sentry.io>
Date: Wed, 5 Jun 2024 10:23:02 +0200
Subject: [PATCH 1/2] fix(cache): Fix get_safe_key

---
 sentry_sdk/integrations/redis/utils.py              | 2 +-
 tests/integrations/redis/test_redis_cache_module.py | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sentry_sdk/integrations/redis/utils.py b/sentry_sdk/integrations/redis/utils.py
index 64b12395b6..43ea5b1572 100644
--- a/sentry_sdk/integrations/redis/utils.py
+++ b/sentry_sdk/integrations/redis/utils.py
@@ -52,7 +52,7 @@ def _safe_decode(key):
         except UnicodeDecodeError:
             return ""
 
-    return key
+    return str(key)
 
 
 def _key_as_string(key):
diff --git a/tests/integrations/redis/test_redis_cache_module.py b/tests/integrations/redis/test_redis_cache_module.py
index ef25983abe..99e2e4db0a 100644
--- a/tests/integrations/redis/test_redis_cache_module.py
+++ b/tests/integrations/redis/test_redis_cache_module.py
@@ -244,6 +244,12 @@ def test_cache_data(sentry_init, capture_events):
             None,
             (b"\x00c\x0f\xeaC\xe1L\x1c\xbff\xcb\xcc\xc1\xed\xc6\t",),
         ),
+        (
+            "get",
+            [123],
+            None,
+            ("123",),
+        ),
     ],
 )
 def test_get_safe_key(method_name, args, kwargs, expected_key):

From 3cb853ed7b89d67abfb3a4d34368104458aea00f Mon Sep 17 00:00:00 2001
From: Ivana Kellyerova <ivana.kellyerova@sentry.io>
Date: Wed, 5 Jun 2024 10:57:58 +0200
Subject: [PATCH 2/2] tests

---
 tests/integrations/redis/test_redis_cache_module.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/integrations/redis/test_redis_cache_module.py b/tests/integrations/redis/test_redis_cache_module.py
index 99e2e4db0a..1fbc6dcf15 100644
--- a/tests/integrations/redis/test_redis_cache_module.py
+++ b/tests/integrations/redis/test_redis_cache_module.py
@@ -248,7 +248,7 @@ def test_cache_data(sentry_init, capture_events):
             "get",
             [123],
             None,
-            ("123",),
+            (123,),
         ),
     ],
 )
@@ -272,6 +272,9 @@ def test_get_safe_key(method_name, args, kwargs, expected_key):
         ),
         (["bla", "blub", "foo"], "bla, blub, foo"),
         ([uuid.uuid4().bytes], ""),
+        ({"key1": 1, "key2": 2}, "key1, key2"),
+        (1, "1"),
+        ([1, 2, 3, b"hello"], "1, 2, 3, hello"),
     ],
 )
 def test_key_as_string(key, expected_key):