Add support for db cursors and connections in context managers

instrumentation/opentelemetry-instrumentation-dbapi/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- bugfix: cursors and connections now produce spans when used with context managers
+  ([#1028](https://github.com/open-telemetry/opentelemetry-python/pull/1028))
+
 ## Version 0.12b0
 
 Released 2020-08-14
@@ -19,4 +22,4 @@ Released 2020-05-12
 
 Released 2020-02-21
 
-- Initial release
+- Initial release

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

@@ -294,6 +294,13 @@ def cursor(self, *args, **kwargs):
                 self.__wrapped__.cursor(*args, **kwargs), db_api_integration
             )
 
+        def __enter__(self):
+            self.__wrapped__.__enter__()
+            return self
+
+        def __exit__(self, *args, **kwargs):
+            self.__wrapped__.__exit__(*args, **kwargs)
+
     return TracedConnectionProxy(connection, *args, **kwargs)
 
 
@@ -366,4 +373,11 @@ def callproc(self, *args, **kwargs):
                 self.__wrapped__.callproc, *args, **kwargs
             )
 
+        def __enter__(self):
+            self.__wrapped__.__enter__()
+            return self
+
+        def __exit__(self, *args, **kwargs):
+            self.__wrapped__.__exit__(*args, **kwargs)
+
     return TracedCursorProxy(cursor, *args, **kwargs)

tests/opentelemetry-docker-tests/tests/asyncpg/test_asyncpg_functional.py

@@ -14,7 +14,7 @@
 POSTGRES_USER = os.getenv("POSTGRESQL_HOST ", "testuser")
 
 
-def _await(coro):
+def async_call(coro):
     loop = asyncio.get_event_loop()
     return loop.run_until_complete(coro)
 
@@ -27,7 +27,7 @@ def setUpClass(cls):
         cls._cursor = None
         cls._tracer = cls.tracer_provider.get_tracer(__name__)
         AsyncPGInstrumentor().instrument(tracer_provider=cls.tracer_provider)
-        cls._connection = _await(
+        cls._connection = async_call(
             asyncpg.connect(
                 database=POSTGRES_DB_NAME,
                 user=POSTGRES_USER,
@@ -42,7 +42,7 @@ def tearDownClass(cls):
         AsyncPGInstrumentor().uninstrument()
 
     def test_instrumented_execute_method_without_arguments(self, *_, **__):
-        _await(self._connection.execute("SELECT 42;"))
+        async_call(self._connection.execute("SELECT 42;"))
         spans = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(spans), 1)
         self.assertEqual(
@@ -59,7 +59,7 @@ def test_instrumented_execute_method_without_arguments(self, *_, **__):
         )
 
     def test_instrumented_fetch_method_without_arguments(self, *_, **__):
-        _await(self._connection.fetch("SELECT 42;"))
+        async_call(self._connection.fetch("SELECT 42;"))
         spans = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(spans), 1)
         self.assertEqual(
@@ -77,7 +77,7 @@ async def _transaction_execute():
             async with self._connection.transaction():
                 await self._connection.execute("SELECT 42;")
 
-        _await(_transaction_execute())
+        async_call(_transaction_execute())
 
         spans = self.memory_exporter.get_finished_spans()
         self.assertEqual(3, len(spans))
@@ -124,7 +124,7 @@ async def _transaction_execute():
                 await self._connection.execute("SELECT 42::uuid;")
 
         with self.assertRaises(asyncpg.CannotCoerceError):
-            _await(_transaction_execute())
+            async_call(_transaction_execute())
 
         spans = self.memory_exporter.get_finished_spans()
         self.assertEqual(3, len(spans))
@@ -167,7 +167,7 @@ async def _transaction_execute():
         )
 
     def test_instrumented_method_doesnt_capture_parameters(self, *_, **__):
-        _await(self._connection.execute("SELECT $1;", "1"))
+        async_call(self._connection.execute("SELECT $1;", "1"))
         spans = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(spans), 1)
         self.assertEqual(
@@ -198,7 +198,7 @@ def setUpClass(cls):
         AsyncPGInstrumentor(capture_parameters=True).instrument(
             tracer_provider=cls.tracer_provider
         )
-        cls._connection = _await(
+        cls._connection = async_call(
             asyncpg.connect(
                 database=POSTGRES_DB_NAME,
                 user=POSTGRES_USER,
@@ -213,7 +213,7 @@ def tearDownClass(cls):
         AsyncPGInstrumentor().uninstrument()
 
     def test_instrumented_execute_method_with_arguments(self, *_, **__):
-        _await(self._connection.execute("SELECT $1;", "1"))
+        async_call(self._connection.execute("SELECT $1;", "1"))
         spans = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(spans), 1)
         self.assertEqual(
@@ -231,7 +231,7 @@ def test_instrumented_execute_method_with_arguments(self, *_, **__):
         )
 
     def test_instrumented_fetch_method_with_arguments(self, *_, **__):
-        _await(self._connection.fetch("SELECT $1;", "1"))
+        async_call(self._connection.fetch("SELECT $1;", "1"))
         spans = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(spans), 1)
         self.assertEqual(
@@ -246,7 +246,7 @@ def test_instrumented_fetch_method_with_arguments(self, *_, **__):
         )
 
     def test_instrumented_executemany_method_with_arguments(self, *_, **__):
-        _await(self._connection.executemany("SELECT $1;", [["1"], ["2"]]))
+        async_call(self._connection.executemany("SELECT $1;", [["1"], ["2"]]))
         spans = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(spans), 1)
         self.assertEqual(
@@ -262,7 +262,7 @@ def test_instrumented_executemany_method_with_arguments(self, *_, **__):
 
     def test_instrumented_execute_interface_error_method(self, *_, **__):
         with self.assertRaises(asyncpg.InterfaceError):
-            _await(self._connection.execute("SELECT 42;", 1, 2, 3))
+            async_call(self._connection.execute("SELECT 42;", 1, 2, 3))
         spans = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(spans), 1)
         self.assertEqual(

tests/opentelemetry-docker-tests/tests/celery/test_celery_functional.py

@@ -13,11 +13,8 @@
 # limitations under the License.
 
 
-import time
-
 import celery
 import pytest
-from celery import signals
 from celery.exceptions import Retry
 
 import opentelemetry.instrumentation.celery

tests/opentelemetry-docker-tests/tests/mysql/test_mysql_functional.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import os
-import time
 
 import mysql.connector
 
@@ -36,21 +35,24 @@ def setUpClass(cls):
         cls._cursor = None
         cls._tracer = cls.tracer_provider.get_tracer(__name__)
         MySQLInstrumentor().instrument()
-        cls._connection = mysql.connector.connect(
-            user=MYSQL_USER,
-            password=MYSQL_PASSWORD,
-            host=MYSQL_HOST,
-            port=MYSQL_PORT,
-            database=MYSQL_DB_NAME,
-        )
-        cls._cursor = cls._connection.cursor()
 
     @classmethod
     def tearDownClass(cls):
         if cls._connection:
             cls._connection.close()
         MySQLInstrumentor().uninstrument()
 
+    def setUp(self):
+        super().setUp()
+        self._connection = mysql.connector.connect(
+            user=MYSQL_USER,
+            password=MYSQL_PASSWORD,
+            host=MYSQL_HOST,
+            port=MYSQL_PORT,
+            database=MYSQL_DB_NAME,
+        )
+        self._cursor = self._connection.cursor()
+
     def validate_spans(self):
         spans = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(spans), 2)
@@ -79,6 +81,23 @@ def test_execute(self):
             self._cursor.execute("CREATE TABLE IF NOT EXISTS test (id INT)")
         self.validate_spans()
 
+    def test_execute_with_connection_context_manager(self):
+        """Should create a child span for execute with connection context
+        """
+        with self._tracer.start_as_current_span("rootSpan"):
+            with self._connection as conn:
+                cursor = conn.cursor()
+                cursor.execute("CREATE TABLE IF NOT EXISTS test (id INT)")
+        self.validate_spans()
+
+    def test_execute_with_cursor_context_manager(self):
+        """Should create a child span for execute with cursor context
+        """
+        with self._tracer.start_as_current_span("rootSpan"):
+            with self._connection.cursor() as cursor:
+                cursor.execute("CREATE TABLE IF NOT EXISTS test (id INT)")
+        self.validate_spans()
+
     def test_executemany(self):
         """Should create a child span for executemany
         """

tests/opentelemetry-docker-tests/tests/postgres/test_aiopg_functional.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 import asyncio
 import os
-import time
 
 import aiopg
 import psycopg2

tests/opentelemetry-docker-tests/tests/postgres/test_psycopg_functional.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import os
-import time
 
 import psycopg2
 
@@ -86,6 +85,24 @@ def test_execute(self):
             )
         self.validate_spans()
 
+    def test_execute_with_connection_context_manager(self):
+        """Should create a child span for execute with connection context
+        """
+        with self._tracer.start_as_current_span("rootSpan"):
+            with self._connection as conn:
+                cursor = conn.cursor()
+                cursor.execute("CREATE TABLE IF NOT EXISTS test (id INT)")
+        self.validate_spans()
+
+    def test_execute_with_cursor_context_manager(self):
+        """Should create a child span for execute with cursor context
+        """
+        with self._tracer.start_as_current_span("rootSpan"):
+            with self._connection.cursor() as cursor:
+                cursor.execute("CREATE TABLE IF NOT EXISTS test (id INT)")
+        self.validate_spans()
+        self.assertTrue(cursor.closed)
+
     def test_executemany(self):
         """Should create a child span for executemany
         """

tests/opentelemetry-docker-tests/tests/pymysql/test_pymysql_functional.py

@@ -78,6 +78,14 @@ def test_execute(self):
             self._cursor.execute("CREATE TABLE IF NOT EXISTS test (id INT)")
         self.validate_spans()
 
+    def test_execute_with_cursor_context_manager(self):
+        """Should create a child span for execute with cursor context
+        """
+        with self._tracer.start_as_current_span("rootSpan"):
+            with self._connection.cursor() as cursor:
+                cursor.execute("CREATE TABLE IF NOT EXISTS test (id INT)")
+        self.validate_spans()
+
     def test_executemany(self):
         """Should create a child span for executemany
         """

tox.ini

@@ -430,4 +430,4 @@ commands =
   pytest {posargs}
 
 commands_post =
-  docker-compose down
+  docker-compose down -v