Instrument New Redis Methods (#1743)

* Sort redis cluster ignored methods

* Ignore new keyspace pubsub wrapper

* Add instrumentation for new Redis methods

(Redis v8.8.0 & redis-py v8.0.0)

* Mark nginx tests as non-blocking for now

Author: TimPansino

.github/workflows/tests.yml

@@ -61,7 +61,7 @@ jobs:
       - mongodb8
       - mssql
       - mysql
-      - nginx
+      # - nginx
       - oracledb
       - postgres9
       - postgres16

newrelic/hooks/datastore_redis.py

@@ -130,12 +130,30 @@
     "alter_schema_add",
     "alter",
     "append",
+    "arcount",
+    "ardel",
+    "ardelrange",
+    "arget",
+    "argetrange",
+    "argrep",
+    "arinfo",
+    "arinsert",
+    "arlastitems",
+    "arlen",
+    "armget",
+    "armset",
+    "arnext",
+    "arop",
     "arrappend",
     "arrindex",
+    "arring",
     "arrinsert",
     "arrlen",
     "arrpop",
     "arrtrim",
+    "arscan",
+    "arseek",
+    "arset",
     "bgsave",
     "bitcount",
     "bitfield_ro",
@@ -288,6 +306,7 @@
     "incr",
     "incrby",
     "incrbyfloat",
+    "increx",
     "info",
     "initbydim",
     "initbyprob",
@@ -465,6 +484,7 @@
     "xinfo_help",
     "xinfo_stream",
     "xlen",
+    "xnack",
     "xpending_range",
     "xpending",
     "xrange",

tests/datastore_redis/test_uninstrumented_methods.py

@@ -68,6 +68,7 @@
     "get_relation",
     "get_retry",
     "index_name",
+    "keyspace_notifications",
     "labels",
     "list_keys",
     "load_document",

tests/datastore_rediscluster/test_uninstrumented_rediscluster_methods.py

@@ -21,9 +21,21 @@
 client = redis.RedisCluster(host=DB_CLUSTER_SETTINGS["host"], port=DB_CLUSTER_SETTINGS["port"], socket_timeout=5)
 
 IGNORED_METHODS = {
+    "ALL_NODES",
+    "CLUSTER_COMMANDS_RESPONSE_CALLBACKS",
+    "COMMAND_FLAGS",
+    "DEFAULT_NODE",
+    "ERRORS_ALLOW_RETRY",
     "MODULE_CALLBACKS",
     "MODULE_VERSION",
     "NAME",
+    "NODE_FLAGS",
+    "PRIMARIES",
+    "RANDOM",
+    "REPLICAS",
+    "RESPONSE_CALLBACKS",
+    "RESULT_CALLBACKS",
+    "SEARCH_COMMANDS",
     "add_edge",
     "add_node",
     "append_bucket_size",
@@ -41,67 +53,15 @@
     "BatchIndexer",
     "bulk",
     "call_procedure",
+    "client_no_touch",
     "client_tracking_off",
     "client_tracking_on",
     "client",
     "close",
-    "commandmixin",
-    "connection_pool",
-    "connection",
-    "debug_segfault",
-    "edges",
-    "execute_command",
-    "flush",
-    "from_url",
-    "get_connection_kwargs",
-    "get_encoder",
-    "get_label",
-    "get_params_args",
-    "get_property",
-    "get_relation",
-    "get_retry",
-    "hscan_iter",
-    "index_name",
-    "labels",
-    "list_keys",
-    "load_document",
-    "load_external_module",
-    "lock",
-    "maint_notifications_config",
-    "name",
-    "nodes",
-    "parse_response",
-    "pipeline",
-    "property_keys",
-    "register_script",
-    "relationship_types",
-    "response_callbacks",
-    "RESPONSE_CALLBACKS",
-    "sentinel",
-    "set_file",
-    "set_path",
-    "set_response_callback",
-    "set_retry",
-    "transaction",
-    "version",
-    "ALL_NODES",
-    "CLUSTER_COMMANDS_RESPONSE_CALLBACKS",
-    "COMMAND_FLAGS",
-    "DEFAULT_NODE",
-    "ERRORS_ALLOW_RETRY",
-    "NODE_FLAGS",
-    "PRIMARIES",
-    "RANDOM",
-    "REPLICAS",
-    "RESULT_CALLBACKS",
-    "RedisClusterRequestTTL",
-    "SEARCH_COMMANDS",
-    "client_no_touch",
     "cluster_addslotsrange",
     "cluster_bumpepoch",
     "cluster_delslotsrange",
     "cluster_error_retry_attempts",  # Deprecated in redis-py v5.3.0
-    "retry",  # Use instead of cluster_error_retry_attempts after v5.3.0
     "cluster_flushslots",
     "cluster_links",
     "cluster_myid",
@@ -111,39 +71,80 @@
     "cluster_setslot_stable",
     "cluster_shards",
     "command_flags",
+    "commandmixin",
     "commands_parser",
+    "connection_pool",
+    "connection",
+    "debug_segfault",
     "determine_slot",
     "disconnect_connection_pools",
+    "edges",
     "encoder",
+    "execute_command",
+    "flush",
+    "from_url",
+    "get_connection_kwargs",
     "get_default_node",
-    "get_node",
+    "get_encoder",
+    "get_label",
     "get_node_from_key",
-    "get_nodes",
+    "get_node",
     "get_nodes_from_slot",
+    "get_nodes",
+    "get_params_args",
     "get_primaries",
+    "get_property",
     "get_random_node",
     "get_random_primary_node",
     "get_random_primary_or_all_nodes",
     "get_redis_connection",
+    "get_relation",
     "get_replicas",
+    "get_retry",
     "get_special_nodes",
+    "hscan_iter",
+    "index_name",
     "keyslot",
+    "keyspace_notifications",
+    "labels",
+    "list_keys",
+    "load_balancing_strategy",  # Use instead of read_from_replicas after v5.3.0
+    "load_document",
+    "load_external_module",
+    "lock",
+    "maint_notifications_config",
     "mget_nonatomic",
     "monitor",
     "mset_nonatomic",
+    "name",
     "node_flags",
     "nodes_manager",
+    "nodes",
     "on_connect",
+    "parse_response",
+    "pipeline",
+    "property_keys",
     "pubsub",
     "read_from_replicas",  # Deprecated in redis-py v5.3.0
-    "load_balancing_strategy",  # Use instead of read_from_replicas after v5.3.0
+    "RedisClusterRequestTTL",
+    "register_script",
     "reinitialize_counter",
     "reinitialize_steps",
+    "relationship_types",
     "replace_default_node",
+    "response_callbacks",
     "result_callbacks",
+    "retry",  # Use instead of cluster_error_retry_attempts after v5.3.0
+    "sentinel",
     "set_default_node",
-    "user_on_connect_func",
+    "set_file",
+    "set_path",
+    "set_response_callback",
+    "set_retry",
     "startup_nodes",
+    "transaction",
+    "user_on_connect_func",
+    "version",
 }
 
 REDIS_MODULES = {"bf", "cf", "cms", "ft", "graph", "json", "tdigest", "topk", "ts", "vset"}