add tests for async. fix black issues

Author: mnbbrown

Diff for: instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/engine.py

@@ -113,7 +113,10 @@ def _handle_error(self, context):
         try:
             if span.is_recording():
                 span.set_status(
-                    Status(StatusCode.ERROR, str(context.original_exception),)
+                    Status(
+                        StatusCode.ERROR,
+                        str(context.original_exception),
+                    )
                 )
         finally:
             span.end()

Diff for: instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/package.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-_instruments = ("sqlalchemy",)
+_instruments = ("sqlalchemy >= 1.3",)

Diff for: instrumentation/opentelemetry-instrumentation-sqlalchemy/tests/test_sqlalchemy.py

@@ -11,13 +11,19 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+from typing import Coroutine
 from unittest import mock
 
 from sqlalchemy import create_engine
-
+import sqlalchemy
 from opentelemetry import trace
 from opentelemetry.instrumentation.sqlalchemy import SQLAlchemyInstrumentor
 from opentelemetry.test.test_base import TestBase
+import asyncio
+
+
+def _call_async(coro: Coroutine):
+    return asyncio.get_event_loop().run_until_complete(coro)
 
 
 class TestSqlalchemyInstrumentation(TestBase):
@@ -28,7 +34,8 @@ def tearDown(self):
     def test_trace_integration(self):
         engine = create_engine("sqlite:///:memory:")
         SQLAlchemyInstrumentor().instrument(
-            engine=engine, tracer_provider=self.tracer_provider,
+            engine=engine,
+            tracer_provider=self.tracer_provider,
         )
         cnx = engine.connect()
         cnx.execute("SELECT	1 + 1;").fetchall()
@@ -38,6 +45,25 @@ def test_trace_integration(self):
         self.assertEqual(spans[0].name, "SELECT :memory:")
         self.assertEqual(spans[0].kind, trace.SpanKind.CLIENT)
 
+    def test_async_trace_integration(self):
+        if sqlalchemy.__version__.startswith("1.3"):
+            return
+        from sqlalchemy.ext.asyncio import (
+            create_async_engine,
+        )  # pylint: disable-all
+
+        engine = create_async_engine("sqlite+aiosqlite:///:memory:")
+        SQLAlchemyInstrumentor().instrument(
+            engine=engine.sync_engine, tracer_provider=self.tracer_provider
+        )
+        cnx = _call_async(engine.connect())
+        _call_async(cnx.execute(sqlalchemy.text("SELECT	1 + 1;"))).fetchall()
+        _call_async(cnx.close())
+        spans = self.memory_exporter.get_finished_spans()
+        self.assertEqual(len(spans), 1)
+        self.assertEqual(spans[0].name, "SELECT :memory:")
+        self.assertEqual(spans[0].kind, trace.SpanKind.CLIENT)
+
     def test_not_recording(self):
         mock_tracer = mock.Mock()
         mock_span = mock.Mock()
@@ -47,7 +73,8 @@ def test_not_recording(self):
             tracer.return_value = mock_tracer
             engine = create_engine("sqlite:///:memory:")
             SQLAlchemyInstrumentor().instrument(
-                engine=engine, tracer_provider=self.tracer_provider,
+                engine=engine,
+                tracer_provider=self.tracer_provider,
             )
             cnx = engine.connect()
             cnx.execute("SELECT	1 + 1;").fetchall()

Diff for: tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_mssql.py

@@ -85,7 +85,8 @@ def test_engine_execute_errors(self):
         self.assertTrue(span.end_time - span.start_time > 0)
         # check the error
         self.assertIs(
-            span.status.status_code, trace.StatusCode.ERROR,
+            span.status.status_code,
+            trace.StatusCode.ERROR,
         )
         self.assertIn("a_wrong_table", span.status.description)
 

Diff for: tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_mysql.py

@@ -84,6 +84,7 @@ def test_engine_execute_errors(self):
         self.assertTrue(span.end_time - span.start_time > 0)
         # check the error
         self.assertIs(
-            span.status.status_code, trace.StatusCode.ERROR,
+            span.status.status_code,
+            trace.StatusCode.ERROR,
         )
         self.assertIn("a_wrong_table", span.status.description)

Diff for: tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_postgres.py

@@ -78,7 +78,8 @@ def test_engine_execute_errors(self):
         self.assertTrue(span.end_time - span.start_time > 0)
         # check the error
         self.assertIs(
-            span.status.status_code, trace.StatusCode.ERROR,
+            span.status.status_code,
+            trace.StatusCode.ERROR,
         )
         self.assertIn("a_wrong_table", span.status.description)
 

Diff for: tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_sqlite.py

@@ -54,7 +54,8 @@ def test_engine_execute_errors(self):
         self.assertTrue((span.end_time - span.start_time) > 0)
         # check the error
         self.assertIs(
-            span.status.status_code, trace.StatusCode.ERROR,
+            span.status.status_code,
+            trace.StatusCode.ERROR,
         )
         self.assertEqual(
             span.status.description, "no such table: a_wrong_table"

Diff for: tox.ini

@@ -126,8 +126,8 @@ envlist =
     py3{6,7,8,9}-test-instrumentation-grpc
 
     ; opentelemetry-instrumentation-sqlalchemy
-    py3{6,7,8,9}-test-instrumentation-sqlalchemy
-    pypy3-test-instrumentation-sqlalchemy
+    py3{6,7,8,9}-test-instrumentation-sqlalchemy{13,14}
+    pypy3-test-instrumentation-sqlalchemy{13,14}
 
     ; opentelemetry-instrumentation-redis
     py3{6,7,8,9}-test-instrumentation-redis
@@ -177,6 +177,9 @@ deps =
   elasticsearch6: elasticsearch>=6.0,<7.0
   elasticsearch7: elasticsearch-dsl>=7.0,<8.0
   elasticsearch7: elasticsearch>=7.0,<8.0
+  sqlalchemy13: sqlalchemy~=1.3,<1.4
+  sqlalchemy14: aiosqlite
+  sqlalchemy14: sqlalchemy~=1.4
 
   ; FIXME: add coverage testing
   ; FIXME: add mypy testing
@@ -295,7 +298,7 @@ commands_pre =
 
   sklearn: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test]
 
-  sqlalchemy: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
+  sqlalchemy{13,14}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
 
   elasticsearch{2,5,6,7}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch[test]