fix(redis): remove circular import from redis integrations [backport 2.1] (#7799)

Backport 6de31a4 from #7794 to 2.1.

This change fixes #7783 by
removing the imports of `contrib.redis` code from `contrib.yaaredis` and
`contrib.aredis`.

## Checklist

- [x] Change(s) are motivated and described in the PR description.
- [x] Testing strategy is described if automated tests are not included
in the PR.
- [x] Risk is outlined (performance impact, potential for breakage,
maintainability, etc).
- [x] Change is maintainable (easy to change, telemetry, documentation).
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed. If no release note is required, add label
`changelog/no-changelog`.
- [x] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/)).
- [x] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist

- [x] Title is accurate.
- [x] No unnecessary changes are introduced.
- [x] Description motivates each change.
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes unless absolutely necessary.
- [x] Testing strategy adequately addresses listed risk(s).
- [x] Change is maintainable (easy to change, telemetry, documentation).
- [x] Release note makes sense to a user of the library.
- [x] Reviewer has explicitly acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment.
- [x] Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
- [x] If this PR touches code that signs or publishes builds or
packages, or handles credentials of any kind, I've requested a review
from `@DataDog/security-design-and-guidance`.
- [x] This PR doesn't touch any of that.

Co-authored-by: Emmett Butler <[email protected]>

Author: github-actions[bot]

ddtrace/contrib/aioredis/patch.py

@@ -23,8 +23,8 @@
 from ...internal.utils.formats import CMD_MAX_LEN
 from ...internal.utils.formats import stringify_cache_args
 from .. import trace_utils
-from ..redis.asyncio_patch import _run_redis_command_async
 from ..trace_utils_redis import ROW_RETURNING_COMMANDS
+from ..trace_utils_redis import _run_redis_command_async
 from ..trace_utils_redis import _trace_redis_cmd
 from ..trace_utils_redis import _trace_redis_execute_pipeline
 from ..trace_utils_redis import determine_row_count

ddtrace/contrib/aredis/patch.py

@@ -10,7 +10,7 @@
 from ...internal.utils.formats import stringify_cache_args
 from ...internal.utils.wrappers import unwrap
 from ...pin import Pin
-from ..redis.asyncio_patch import _run_redis_command_async
+from ..trace_utils_redis import _run_redis_command_async
 from ..trace_utils_redis import _trace_redis_cmd
 from ..trace_utils_redis import _trace_redis_execute_pipeline
 

ddtrace/contrib/redis/asyncio_patch.py

@@ -1,13 +1,11 @@
 from ddtrace import config
 
-from ...ext import db
 from ...internal.utils.formats import stringify_cache_args
 from ...pin import Pin
-from ..trace_utils_redis import ROW_RETURNING_COMMANDS
+from ..trace_utils_redis import _run_redis_command_async
 from ..trace_utils_redis import _trace_redis_cmd
 from ..trace_utils_redis import _trace_redis_execute_async_cluster_pipeline
 from ..trace_utils_redis import _trace_redis_execute_pipeline
-from ..trace_utils_redis import determine_row_count
 
 
 #
@@ -33,20 +31,6 @@ async def traced_async_execute_pipeline(func, instance, args, kwargs):
         return await func(*args, **kwargs)
 
 
-async def _run_redis_command_async(span, func, args, kwargs):
-    parsed_command = stringify_cache_args(args)
-    redis_command = parsed_command.split(" ")[0]
-    try:
-        result = await func(*args, **kwargs)
-        if redis_command in ROW_RETURNING_COMMANDS:
-            determine_row_count(redis_command=redis_command, span=span, result=result)
-        return result
-    except Exception:
-        if redis_command in ROW_RETURNING_COMMANDS:
-            span.set_metric(db.ROWCOUNT, 0)
-        raise
-
-
 async def traced_async_execute_cluster_pipeline(func, instance, args, kwargs):
     pin = Pin.get_from(instance)
     if not pin or not pin.enabled():

ddtrace/contrib/trace_utils_redis.py

@@ -160,3 +160,17 @@ def _trace_redis_execute_async_cluster_pipeline(pin, config_integration, resourc
         span.set_tag(ANALYTICS_SAMPLE_RATE_KEY, config_integration.get_analytics_sample_rate())
         # yield the span in case the caller wants to build on span
         yield span
+
+
+async def _run_redis_command_async(span, func, args, kwargs):
+    parsed_command = stringify_cache_args(args)
+    redis_command = parsed_command.split(" ")[0]
+    try:
+        result = await func(*args, **kwargs)
+        if redis_command in ROW_RETURNING_COMMANDS:
+            determine_row_count(redis_command=redis_command, span=span, result=result)
+        return result
+    except Exception:
+        if redis_command in ROW_RETURNING_COMMANDS:
+            span.set_metric(db.ROWCOUNT, 0)
+        raise

ddtrace/contrib/yaaredis/patch.py

@@ -10,7 +10,7 @@
 from ...internal.utils.formats import stringify_cache_args
 from ...internal.utils.wrappers import unwrap
 from ...pin import Pin
-from ..redis.asyncio_patch import _run_redis_command_async
+from ..trace_utils_redis import _run_redis_command_async
 from ..trace_utils_redis import _trace_redis_cmd
 from ..trace_utils_redis import _trace_redis_execute_pipeline
 

releasenotes/notes/redis-circular-2d53f27a7f6f413d.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    redis: This fix resolves an issue where the yaaredis and aredis integrations imported
+    code from the redis integration, causing a circular import error.