feat(redis): Add tags for more commands (getsentry#733)

tonyo · web-flow · commit f3520784bb03 · 2020-06-25T18:49:35.000+02:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -27,6 +27,10 @@ sentry-sdk==0.10.1
 
 A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
 
+## [Unreleased]
+
+* Redis integration: add tags for more commands
+
 ## 0.15.1
 
 * Fix fatal crash in Pyramid integration on 404.
diff --git a/sentry_sdk/integrations/redis.py b/sentry_sdk/integrations/redis.py
@@ -9,6 +9,11 @@
 if MYPY:
     from typing import Any
 
+_SINGLE_KEY_COMMANDS = frozenset(
+    ["decr", "decrby", "get", "incr", "incrby", "pttl", "set", "setex", "setnx", "ttl"]
+)
+_MULTI_KEY_COMMANDS = frozenset(["del", "touch", "unlink"])
+
 
 class RedisIntegration(Integration):
     identifier = "redis"
@@ -62,8 +67,12 @@ def sentry_patched_execute_command(self, name, *args, **kwargs):
             if name:
                 span.set_tag("redis.command", name)
 
-            if name and args and name.lower() in ("get", "set", "setex", "setnx"):
-                span.set_tag("redis.key", args[0])
+            if name and args:
+                name_low = name.lower()
+                if (name_low in _SINGLE_KEY_COMMANDS) or (
+                    name_low in _MULTI_KEY_COMMANDS and len(args) == 1
+                ):
+                    span.set_tag("redis.key", args[0])
 
             return old_execute_command(self, name, *args, **kwargs)
 
