Linting

Author: antonpirker

sentry_sdk/integrations/redis/_async_common.py

@@ -26,7 +26,7 @@
 def patch_redis_async_pipeline(
     pipeline_cls, is_cluster, get_command_args_fn, get_db_data_fn
 ):
-    # type: (Union[type[Pipeline[Any]], type[ClusterPipeline[Any]]], bool, Any, Callable[[Span, Any], None]) -> None
+    # type: (Union[type[Pipeline[Any]], type[ClusterPipeline[Any]]], bool, Any, Callable[[Any], dict[str, Any]]) -> None
     old_execute = pipeline_cls.execute
 
     from sentry_sdk.integrations.redis import RedisIntegration
@@ -47,7 +47,9 @@ async def _sentry_execute(self, *args, **kwargs):
                     is_cluster=is_cluster,
                     get_command_args_fn=get_command_args_fn,
                     is_transaction=False if is_cluster else self.is_transaction,
-                    command_stack=self._command_stack if is_cluster else self.command_stack,
+                    command_stack=(
+                        self._command_stack if is_cluster else self.command_stack
+                    ),
                 )
                 _update_span(span, span_data, pipeline_data)
 
@@ -57,7 +59,7 @@ async def _sentry_execute(self, *args, **kwargs):
 
 
 def patch_redis_async_client(cls, is_cluster, get_db_data_fn):
-    # type: (Union[type[StrictRedis[Any]], type[RedisCluster[Any]]], bool, Callable[[Span, Any], None]) -> None
+    # type: (Union[type[StrictRedis[Any]], type[RedisCluster[Any]]], bool, Callable[[Any], dict[str, Any]]) -> None
     old_execute_command = cls.execute_command
 
     from sentry_sdk.integrations.redis import RedisIntegration

sentry_sdk/integrations/redis/_sync_common.py

@@ -27,7 +27,7 @@ def patch_redis_pipeline(
     get_command_args_fn,
     get_db_data_fn,
 ):
-    # type: (Any, bool, Any, Callable[[Span, Any], None]) -> None
+    # type: (Any, bool, Any, Callable[[Any], dict[str, Any]]) -> None
     old_execute = pipeline_cls.execute
 
     from sentry_sdk.integrations.redis import RedisIntegration
@@ -37,7 +37,6 @@ def sentry_patched_execute(self, *args, **kwargs):
         if sentry_sdk.get_client().get_integration(RedisIntegration) is None:
             return old_execute(self, *args, **kwargs)
 
-
         with sentry_sdk.start_span(
             op=OP.DB_REDIS,
             name="redis.pipeline.execute",
@@ -59,7 +58,7 @@ def sentry_patched_execute(self, *args, **kwargs):
 
 
 def patch_redis_client(cls, is_cluster, get_db_data_fn):
-    # type: (Any, bool, Callable[[Span, Any], None]) -> None
+    # type: (Any, bool, Callable[[Any], dict[str, Any]]) -> None
     """
     This function can be used to instrument custom redis client classes or
     subclasses.
@@ -100,7 +99,7 @@ def sentry_patched_execute_command(self, name, *args, **kwargs):
         db_span.__enter__()
 
         db_span_data = get_db_data_fn(self)
-        db_client_span_data = _get_client_data(db_span, is_cluster, name, *args)
+        db_client_span_data = _get_client_data(is_cluster, name, *args)
         _update_span(db_span, db_span_data, db_client_span_data)
 
         value = old_execute_command(self, name, *args, **kwargs)

sentry_sdk/integrations/redis/utils.py

@@ -124,14 +124,12 @@ def _parse_rediscluster_command(command):
     return command.args
 
 
-def _get_pipeline_data(
-    is_cluster, get_command_args_fn, is_transaction, command_stack
-):
+def _get_pipeline_data(is_cluster, get_command_args_fn, is_transaction, command_stack):
     # type: (bool, Any, bool, Sequence[Any]) -> dict[str, Any]
     data = {
         "redis.is_cluster": is_cluster,
         "redis.transaction": is_transaction,
-    }
+    }  # type: dict[str, Any]
 
     commands = []
     for i, arg in enumerate(command_stack):
@@ -151,7 +149,8 @@ def _get_client_data(is_cluster, name, *args):
     # type: (bool, str, *Any) -> dict[str, Any]
     data = {
         "redis.is_cluster": is_cluster,
-    }
+    }  # type: dict[str, Any]
+
     if name:
         data["redis.command"] = name
         data[SPANDATA.DB_OPERATION] = name
@@ -163,4 +162,4 @@ def _get_client_data(is_cluster, name, *args):
         ):
             data["redis.key"] = args[0]
 
-    return data
+    return data