Bump redis dependency to 6.0.0 (#20265)

* bump redis version

* add changelog

* add test for config options

* Also remove connection pool

Author: sarah-witt

agent_requirements.in

@@ -52,7 +52,7 @@ python3-gearman==0.1.0; sys_platform != 'win32'
 pyvmomi==8.0.3.0.1
 pywin32==310; sys_platform == 'win32'
 pyyaml==6.0.2
-redis==5.2.1
+redis==6.0.0
 requests-kerberos==0.15.0
 requests-ntlm==1.3.0
 requests-oauthlib==2.0.0

redisdb/changelog.d/20265.changed

@@ -0,0 +1 @@
+Bump `redis` dependency to `6.0.0` and stop supporting `charset`, `connection_pool`, and `errors` configuration options.

redisdb/datadog_checks/redisdb/redisdb.py

@@ -175,9 +175,6 @@ def _get_conn(self, instance_config):
                     'username',
                     'password',
                     'socket_timeout',
-                    'connection_pool',
-                    'charset',
-                    'errors',
                     'unix_socket_path',
                     'ssl',
                     'ssl_certfile',

redisdb/pyproject.toml

@@ -36,7 +36,7 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 deps = [
-    "redis==5.2.1",
+    "redis==6.0.0",
 ]
 
 [project.urls]

redisdb/tests/test_unit.py

@@ -105,6 +105,33 @@ def test__check_total_commands_processed_present(check, aggregator, redis_instan
     aggregator.assert_metric('redis.net.commands', value=1000, tags=['test_total_commands_processed'])
 
 
+def test_check_all_available_config_options(check, aggregator, redis_instance, dd_run_check):
+    """
+    The check should should create a connection with the supported config options
+    """
+
+    connection_args = {
+        'db': 1,
+        'username': 'user',
+        'password': 'devops-best-friend',
+        'socket_timeout': 5,
+        'host': 'localhost',
+        'port': '6379',
+        'unix_socket_path': '/path',
+        'ssl': True,
+        'ssl_certfile': '/path',
+        'ssl_keyfile': '/path',
+        'ssl_ca_certs': '/path',
+        'ssl_cert_reqs': 0,
+    }
+    redis_instance.update(connection_args)
+
+    redis_check = check(redis_instance)
+    with mock.patch('redis.Redis') as redis_conn:
+        dd_run_check(redis_check)
+        assert redis_conn.call_args.kwargs == connection_args
+
+
 def test_slowlog_quiet_failure(check, aggregator, redis_instance):
     """
     The check should not fail if the slowlog command fails with redis.ResponseError