comments

open-telemetry · Jul 8, 2021 · 6959f22 · 6959f22
1 parent 28183d5
commit 6959f22
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/...emetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/aiopg_integration.py b/...emetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/aiopg_integration.py
@@ -1,10 +1,7 @@
 import typing
 
 import wrapt
-from aiopg.utils import (  # pylint: disable=no-name-in-module
-    _ContextManager,
-    _PoolAcquireContextManager,
-)
+from aiopg.utils import _ContextManager, _PoolAcquireContextManager
 
 from opentelemetry.instrumentation.dbapi import (
     CursorTracer,
@@ -64,9 +61,7 @@ def __init__(self, connection, *args, **kwargs):
 
         def cursor(self, *args, **kwargs):
             coro = self._cursor(*args, **kwargs)
-            return _ContextManager(  # pylint: disable=no-value-for-parameter
-                coro
-            )
+            return _ContextManager(coro)
 
         async def _cursor(self, *args, **kwargs):
             # pylint: disable=protected-access

diff --git a/...n/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/wrappers.py b/...n/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/wrappers.py
@@ -41,6 +41,7 @@
 
 from opentelemetry.instrumentation.aiopg.aiopg_integration import (
     AiopgIntegration,
+    AsyncProxyObject,
     get_traced_connection_proxy,
 )
 from opentelemetry.instrumentation.aiopg.version import __version__
@@ -153,7 +154,7 @@ def instrument_connection(
     Returns:
         An instrumented connection.
     """
-    if isinstance(connection, wrapt.ObjectProxy):
+    if isinstance(connection, AsyncProxyObject):
         logger.warning("Connection already instrumented")
         return connection
 
@@ -177,7 +178,7 @@ def uninstrument_connection(connection):
     Returns:
         An uninstrumented connection.
     """
-    if isinstance(connection, wrapt.ObjectProxy):
+    if isinstance(connection, AsyncProxyObject):
         return connection.__wrapped__
 
     logger.warning("Connection is not instrumented")

diff --git a/...entelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/__init__.py b/...entelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/__init__.py
@@ -79,7 +79,6 @@
 """
 
 import typing
-from os import stat
 from typing import Collection
 
 from pyramid.config import Configurator