fix imports order for ruff

Author: sightseeker

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

@@ -101,6 +101,7 @@ def response_hook(span, instance, response):
 
 from opentelemetry import trace
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.instrumentation.utils import unwrap
 from opentelemetry.instrumentation.valkey.package import _instruments
 from opentelemetry.instrumentation.valkey.util import (
     _extract_conn_attributes,
@@ -109,7 +110,6 @@ def response_hook(span, instance, response):
     _value_or_none,
 )
 from opentelemetry.instrumentation.valkey.version import __version__
-from opentelemetry.instrumentation.utils import unwrap
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace import Span, StatusCode, Tracer
 
@@ -133,7 +133,9 @@ def response_hook(span, instance, response):
         valkey.asyncio.cluster.ClusterPipeline,
     )
     AsyncValkeyInstance = TypeVar(
-        "AsyncValkeyInstance", valkey.asyncio.Valkey, valkey.asyncio.ValkeyCluster
+        "AsyncValkeyInstance",
+        valkey.asyncio.Valkey,
+        valkey.asyncio.ValkeyCluster,
     )
     PipelineInstance = TypeVar(
         "PipelineInstance",

instrumentation/opentelemetry-instrumentation-valkey/tests/test_valkey.py

@@ -243,11 +243,9 @@ def test_attributes_default(self):
         span = spans[0]
         self.assertEqual(
             span.attributes[SpanAttributes.DB_SYSTEM],
-            'valkey',
-        )
-        self.assertEqual(
-            span.attributes['db.valkey.database_index'], 0
+            "valkey",
         )
+        self.assertEqual(span.attributes["db.valkey.database_index"], 0)
         self.assertEqual(
             span.attributes[SpanAttributes.NET_PEER_NAME], "localhost"
         )
@@ -269,11 +267,9 @@ def test_attributes_tcp(self):
         span = spans[0]
         self.assertEqual(
             span.attributes[SpanAttributes.DB_SYSTEM],
-            'valkey',
-        )
-        self.assertEqual(
-            span.attributes['db.valkey.database_index'], 1
+            "valkey",
         )
+        self.assertEqual(span.attributes["db.valkey.database_index"], 1)
         self.assertEqual(
             span.attributes[SpanAttributes.NET_PEER_NAME], "1.1.1.1"
         )
@@ -299,9 +295,7 @@ def test_attributes_unix_socket(self):
             span.attributes[SpanAttributes.DB_SYSTEM],
             "valkey",
         )
-        self.assertEqual(
-            span.attributes['db.valkey.database_index'], 3
-        )
+        self.assertEqual(span.attributes["db.valkey.database_index"], 3)
         self.assertEqual(
             span.attributes[SpanAttributes.NET_PEER_NAME],
             "/path/to/socket.sock",

tests/opentelemetry-docker-tests/tests/check_availability.py

@@ -111,7 +111,8 @@ def check_postgres_connection():
 def check_redis_connection():
     connection = redis.Redis(host=REDIS_HOST, port=REDIS_PORT)
     connection.hgetall("*")
-    
+
+
 @retryable
 def check_valkey_connection():
     connection = valkey.Valkey(host=VALKEY_HOST, port=VALKEY_PORT)

tests/opentelemetry-docker-tests/tests/valkey/test_valkey_functional.py

@@ -17,9 +17,6 @@
 
 import valkey
 import valkey.asyncio
-from valkey.commands.search.indexDefinition import IndexDefinition, IndexType
-from valkey.commands.search.query import Query
-from valkey.exceptions import ResponseError
 
 from opentelemetry import trace
 from opentelemetry.instrumentation.valkey import ValkeyInstrumentor
@@ -41,9 +38,7 @@ def tearDown(self):
     def _check_span(self, span, name):
         self.assertEqual(span.name, name)
         self.assertIs(span.status.status_code, trace.StatusCode.UNSET)
-        self.assertEqual(
-            span.attributes.get("db.valkey.database_index"), 0
-        )
+        self.assertEqual(span.attributes.get("db.valkey.database_index"), 0)
         self.assertEqual(
             span.attributes[SpanAttributes.NET_PEER_NAME], "localhost"
         )
@@ -287,9 +282,7 @@ def tearDown(self):
     def _check_span(self, span, name):
         self.assertEqual(span.name, name)
         self.assertIs(span.status.status_code, trace.StatusCode.UNSET)
-        self.assertEqual(
-            span.attributes.get("db.valkey.database_index"), 0
-        )
+        self.assertEqual(span.attributes.get("db.valkey.database_index"), 0)
         self.assertEqual(
             span.attributes[SpanAttributes.NET_PEER_NAME], "localhost"
         )
@@ -604,9 +597,7 @@ def _check_span(self, span, name):
             span.attributes[SpanAttributes.NET_PEER_NAME], "localhost"
         )
         self.assertEqual(span.attributes[SpanAttributes.NET_PEER_PORT], 16379)
-        self.assertEqual(
-            span.attributes["db.valkey.database_index"], 10
-        )
+        self.assertEqual(span.attributes["db.valkey.database_index"], 10)
 
     def test_get(self):
         self.assertIsNone(self.valkey_client.get("foo"))