opentelemetry-instrumentation-aiopg 0.44b0__tar.gz → 0.46b0__tar.gz

{opentelemetry_instrumentation_aiopg-0.44b0 → opentelemetry_instrumentation_aiopg-0.46b0}/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright The OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

{opentelemetry_instrumentation_aiopg-0.44b0 → opentelemetry_instrumentation_aiopg-0.46b0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: opentelemetry-instrumentation-aiopg
-Version: 0.44b0
+Version: 0.46b0
 Summary: OpenTelemetry aiopg instrumentation
 Project-URL: Homepage, https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aiopg
 Author-email: OpenTelemetry Authors <cncf-opentelemetry-contributors@lists.cncf.io>
@@ -17,15 +17,11 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Requires-Dist: opentelemetry-api~=1.12
-Requires-Dist: opentelemetry-instrumentation-dbapi==0.44b0
-Requires-Dist: opentelemetry-instrumentation==0.44b0
+Requires-Dist: opentelemetry-instrumentation-dbapi==0.46b0
+Requires-Dist: opentelemetry-instrumentation==0.46b0
 Requires-Dist: wrapt<2.0.0,>=1.0.0
 Provides-Extra: instruments
 Requires-Dist: aiopg<2.0.0,>=0.13.0; extra == 'instruments'
-Provides-Extra: test
-Requires-Dist: opentelemetry-instrumentation-aiopg[instruments]; extra == 'test'
-Requires-Dist: opentelemetry-semantic-conventions==0.44b0; extra == 'test'
-Requires-Dist: opentelemetry-test-utils==0.44b0; extra == 'test'
 Description-Content-Type: text/x-rst
 
 OpenTelemetry aiopg instrumentation

{opentelemetry_instrumentation_aiopg-0.44b0 → opentelemetry_instrumentation_aiopg-0.46b0}/pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.44b0",
-  "opentelemetry-instrumentation-dbapi == 0.44b0",
+  "opentelemetry-instrumentation == 0.46b0",
+  "opentelemetry-instrumentation-dbapi == 0.46b0",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
@@ -34,11 +34,6 @@ dependencies = [
 instruments = [
   "aiopg >= 0.13.0, < 2.0.0",
 ]
-test = [
-  "opentelemetry-instrumentation-aiopg[instruments]",
-  "opentelemetry-semantic-conventions == 0.44b0",
-  "opentelemetry-test-utils == 0.44b0",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 aiopg = "opentelemetry.instrumentation.aiopg:AiopgInstrumentor"

{opentelemetry_instrumentation_aiopg-0.44b0 → opentelemetry_instrumentation_aiopg-0.46b0}/src/opentelemetry/instrumentation/aiopg/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.44b0"
+__version__ = "0.46b0"

{opentelemetry_instrumentation_aiopg-0.44b0 → opentelemetry_instrumentation_aiopg-0.46b0}/tests/test_aiopg_integration.py

@@ -17,6 +17,7 @@ from unittest import mock
 from unittest.mock import MagicMock
 
 import aiopg
+import psycopg2
 
 import opentelemetry.instrumentation.aiopg
 from opentelemetry import trace as trace_api
@@ -76,7 +77,7 @@ class TestAiopgInstrumentor(TestBase):
         cnx = async_call(aiopg.connect(database="test"))
         cursor = async_call(cnx.cursor())
         query = "SELECT * FROM test"
-        cursor.execute(query)
+        async_call(cursor.execute(query))
 
         spans_list = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(spans_list), 1)
@@ -127,7 +128,7 @@ class TestAiopgInstrumentor(TestBase):
         cnx = async_call(pool.acquire())
         cursor = async_call(cnx.cursor())
         query = "SELECT * FROM test"
-        cursor.execute(query)
+        async_call(cursor.execute(query))
 
         spans_list = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(spans_list), 1)
@@ -384,7 +385,9 @@ class TestAiopgIntegration(TestBase):
             span.attributes[SpanAttributes.DB_STATEMENT], "Test query"
         )
         self.assertIs(span.status.status_code, trace_api.StatusCode.ERROR)
-        self.assertEqual(span.status.description, "Exception: Test Exception")
+        self.assertEqual(
+            span.status.description, "ProgrammingError: Test Exception"
+        )
 
     def test_executemany(self):
         db_integration = AiopgIntegration(self.tracer, "testcomponent")
@@ -570,17 +573,17 @@ class MockCursor:
     # pylint: disable=unused-argument, no-self-use
     async def execute(self, query, params=None, throw_exception=False):
         if throw_exception:
-            raise Exception("Test Exception")
+            raise psycopg2.ProgrammingError("Test Exception")
 
     # pylint: disable=unused-argument, no-self-use
     async def executemany(self, query, params=None, throw_exception=False):
         if throw_exception:
-            raise Exception("Test Exception")
+            raise psycopg2.ProgrammingError("Test Exception")
 
     # pylint: disable=unused-argument, no-self-use
     async def callproc(self, query, params=None, throw_exception=False):
         if throw_exception:
-            raise Exception("Test Exception")
+            raise psycopg2.ProgrammingError("Test Exception")
 
     def close(self):
         pass