Fix type compatibility

Author: OlegZv

instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/__init__.py

@@ -152,7 +152,7 @@ def response_hook(span, instance, response):
     import redis.cluster
     import redis.connection
 
-    from opentelemetry.instrumentation.redis.types import (
+    from opentelemetry.instrumentation.redis.custom_types import (
         AsyncPipelineInstance,
         AsyncRedisInstance,
         PipelineInstance,

instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/custom_types.py

@@ -0,0 +1,35 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Callable, TypeVar
+
+import redis.asyncio.client
+import redis.asyncio.cluster
+import redis.client
+import redis.cluster
+import redis.connection
+
+from opentelemetry.trace import Span
+
+if TYPE_CHECKING:
+    RequestHook = Callable[
+        [Span, redis.connection.Connection, list[Any], dict[str, Any]], None
+    ]
+    ResponseHook = Callable[[Span, redis.connection.Connection, Any], None]
+
+    AsyncPipelineInstance = TypeVar(
+        "AsyncPipelineInstance",
+        redis.asyncio.client.Pipeline,
+        redis.asyncio.cluster.ClusterPipeline,
+    )
+    AsyncRedisInstance = TypeVar(
+        "AsyncRedisInstance", redis.asyncio.Redis, redis.asyncio.RedisCluster
+    )
+    PipelineInstance = TypeVar(
+        "PipelineInstance",
+        redis.client.Pipeline,
+        redis.cluster.ClusterPipeline,
+    )
+    RedisInstance = TypeVar(
+        "RedisInstance", redis.client.Redis, redis.cluster.RedisCluster
+    )
+    R = TypeVar("R")

instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/types.py

@@ -16,14 +16,17 @@
 Some utils used by the redis integration
 """
 
-from typing import Any
+from __future__ import annotations
 
-from opentelemetry.instrumentation.redis.types import (
-    AsyncPipelineInstance,
-    AsyncRedisInstance,
-    PipelineInstance,
-    RedisInstance,
-)
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from opentelemetry.instrumentation.redis.custom_types import (
+        AsyncPipelineInstance,
+        AsyncRedisInstance,
+        PipelineInstance,
+        RedisInstance,
+    )
 from opentelemetry.semconv.trace import (
     DbSystemValues,
     NetTransportValues,
@@ -60,7 +63,7 @@ def _extract_conn_attributes(conn_kwargs):
     return attributes
 
 
-def _format_command_args(args):
+def _format_command_args(args: list[str]):
     """Format and sanitize command arguments, and trim them as needed"""
     cmd_max_len = 1000
     value_too_long_mark = "..."