* linting + black

Author: reiktar

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

@@ -105,9 +105,11 @@
 import typing
 from typing import Collection
 
-import psycopg
-from psycopg import AsyncCursor as pg_async_cursor
-from psycopg import Cursor as pg_cursor  # pylint: disable=no-name-in-module
+import psycopg  # pylint: disable=import-self
+from psycopg import (  # pylint: disable=import-self,no-name-in-module
+    AsyncCursor as pg_async_cursor,
+)
+from psycopg import Cursor as pg_cursor  # pylint: disable=no-name-in-module,import-self
 from psycopg.sql import Composed  # pylint: disable=no-name-in-module
 
 from opentelemetry.instrumentation import dbapi
@@ -154,7 +156,7 @@ def _instrument(self, **kwargs):
 
         dbapi.wrap_connect(
             __name__,
-            psycopg.Connection,
+            psycopg.Connection,  # pylint: disable=no-member
             "connect",
             self._DATABASE_SYSTEM,
             self._CONNECTION_ATTRIBUTES,
@@ -166,7 +168,7 @@ def _instrument(self, **kwargs):
         )
         dbapi.wrap_connect(
             __name__,
-            psycopg.AsyncConnection,
+            psycopg.AsyncConnection,  # pylint: disable=no-member
             "connect",
             self._DATABASE_SYSTEM,
             self._CONNECTION_ATTRIBUTES,
@@ -179,9 +181,11 @@ def _instrument(self, **kwargs):
 
     def _uninstrument(self, **kwargs):
         """ "Disable Psycopg instrumentation"""
-        dbapi.unwrap_connect(psycopg, "connect")
-        dbapi.unwrap_connect(psycopg.Connection, "connect")
-        dbapi.unwrap_connect(psycopg.AsyncConnection, "connect")
+        dbapi.unwrap_connect(psycopg, "connect")  # pylint: disable=no-member
+        dbapi.unwrap_connect(psycopg.Connection, "connect")  # pylint: disable=no-member
+        dbapi.unwrap_connect(
+            psycopg.AsyncConnection, "connect"  # pylint: disable=no-member
+        )
 
     # TODO(owais): check if core dbapi can do this for all dbapi implementations e.g, pymysql and mysql
     @staticmethod
@@ -190,9 +194,7 @@ def instrument_connection(connection, tracer_provider=None):
             connection._is_instrumented_by_opentelemetry = False
 
         if not connection._is_instrumented_by_opentelemetry:
-            setattr(
-                connection, _OTEL_CURSOR_FACTORY_KEY, connection.cursor_factory
-            )
+            setattr(connection, _OTEL_CURSOR_FACTORY_KEY, connection.cursor_factory)
             connection.cursor_factory = _new_cursor_factory(
                 tracer_provider=tracer_provider
             )
@@ -206,9 +208,7 @@ def instrument_connection(connection, tracer_provider=None):
     # TODO(owais): check if core dbapi can do this for all dbapi implementations e.g, pymysql and mysql
     @staticmethod
     def uninstrument_connection(connection):
-        connection.cursor_factory = getattr(
-            connection, _OTEL_CURSOR_FACTORY_KEY, None
-        )
+        connection.cursor_factory = getattr(connection, _OTEL_CURSOR_FACTORY_KEY, None)
 
         return connection
 
@@ -244,9 +244,7 @@ async def wrapped_connection(
         new_factory_kwargs = {"db_api": self}
         if base_cursor_factory:
             new_factory_kwargs["base_factory"] = base_cursor_factory
-        kwargs["cursor_factory"] = _new_cursor_async_factory(
-            **new_factory_kwargs
-        )
+        kwargs["cursor_factory"] = _new_cursor_async_factory(**new_factory_kwargs)
         connection = await connect_method(*args, **kwargs)
         self.get_connection_attributes(connection)
         return connection
@@ -309,9 +307,7 @@ def callproc(self, *args, **kwargs):
     return TracedCursorFactory
 
 
-def _new_cursor_async_factory(
-    db_api=None, base_factory=None, tracer_provider=None
-):
+def _new_cursor_async_factory(db_api=None, base_factory=None, tracer_provider=None):
     if not db_api:
         db_api = DatabaseApiAsyncIntegration(
             __name__,

instrumentation/opentelemetry-instrumentation-psycopg/tests/test_psycopg_integration.py

@@ -103,9 +103,8 @@ class MockAsyncConnection:
 
     def __init__(self, *args, **kwargs):
         self.cursor_factory = kwargs.pop("cursor_factory", None)
-        pass
 
-    @classmethod
+    @staticmethod
     async def connect(*args, **kwargs):
         return MockAsyncConnection(**kwargs)
 
@@ -305,21 +304,18 @@ def test_span_name(self):
     async def test_span_name_async(self):
         PsycopgInstrumentor().instrument()
 
-        acnx = psycopg.AsyncConnection.connect(database="test")
-        async with acnx as cnx:
-            async with cnx.cursor() as cursor:
-                await cursor.execute("Test query", ("param1Value", False))
-                await cursor.execute(
-                    """multi
-        line
-        query"""
-                )
-                await cursor.execute("tab\tseparated query")
-                await cursor.execute("/* leading comment */ query")
-                await cursor.execute(
-                    "/* leading comment */ query /* trailing comment */"
-                )
-                await cursor.execute("query /* trailing comment */")
+        cnx = psycopg.AsyncConnection.connect(database="test")
+        async with cnx.cursor() as cursor:
+            await cursor.execute("Test query", ("param1Value", False))
+            await cursor.execute(
+                """multi
+    line
+    query"""
+            )
+            await cursor.execute("tab\tseparated query")
+            await cursor.execute("/* leading comment */ query")
+            await cursor.execute("/* leading comment */ query /* trailing comment */")
+            await cursor.execute("query /* trailing comment */")
 
         spans_list = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(spans_list), 6)
@@ -359,11 +355,10 @@ async def test_not_recording_async(self):
         PsycopgInstrumentor().instrument()
         with mock.patch("opentelemetry.trace.get_tracer") as tracer:
             tracer.return_value = mock_tracer
-            acnx = psycopg.AsyncConnection.connect(database="test")
-            async with acnx as cnx:
-                async with cnx.cursor() as cursor:
-                    query = "SELECT * FROM test"
-                    cursor.execute(query)
+            cnx = psycopg.AsyncConnection.connect(database="test")
+            async with cnx.cursor() as cursor:
+                query = "SELECT * FROM test"
+                cursor.execute(query)
             self.assertFalse(mock_span.is_recording())
             self.assertTrue(mock_span.is_recording.called)
             self.assertFalse(mock_span.set_attribute.called)