Add docker tests for psycopg

Author: xrmx

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

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import psycopg
 import psycopg2
 from test_psycopg_functional import (
     POSTGRES_DB_NAME,
@@ -21,11 +22,12 @@
     POSTGRES_USER,
 )
 
+from opentelemetry.instrumentation.psycopg import PsycopgInstrumentor
 from opentelemetry.instrumentation.psycopg2 import Psycopg2Instrumentor
 from opentelemetry.test.test_base import TestBase
 
 
-class TestFunctionalPsycopg(TestBase):
+class TestFunctionalPsycopg2(TestBase):
     def setUp(self):
         super().setUp()
         self._tracer = self.tracer_provider.get_tracer(__name__)
@@ -52,3 +54,49 @@ def test_commenter_enabled(self):
             self._cursor.query.decode("ascii"),
             r"SELECT  1 /\*db_driver='psycopg2(.*)',dbapi_level='\d.\d',dbapi_threadsafety=\d,driver_paramstyle=(.*),libpq_version=\d*,traceparent='\d{1,2}-[a-zA-Z0-9_]{32}-[a-zA-Z0-9_]{16}-\d{1,2}'\*/;",
         )
+
+
+class TestFunctionalPsycopg(TestBase):
+    def setUp(self):
+        super().setUp()
+        PsycopgInstrumentor().instrument(enable_commenter=True)
+
+    def tearDown(self):
+        PsycopgInstrumentor().uninstrument()
+        super().tearDown()
+
+    def test_commenter_enabled_root_module(self):
+        connection = psycopg.connect(
+            dbname=POSTGRES_DB_NAME,
+            user=POSTGRES_USER,
+            password=POSTGRES_PASSWORD,
+            host=POSTGRES_HOST,
+            port=POSTGRES_PORT,
+        )
+        cursor = connection.cursor()
+        cursor.execute("SELECT  1;")
+        self.assertRegex(
+            cursor._query.query.decode("ascii"),
+            r"SELECT  1 /\*db_driver='psycopg(.*)',dbapi_level='\d.\d',dbapi_threadsafety=\d,driver_paramstyle=(.*),libpq_version=\d*,traceparent='\d{1,2}-[a-zA-Z0-9_]{32}-[a-zA-Z0-9_]{16}-\d{1,2}'\*/;",
+        )
+
+        cursor.close()
+        connection.close()
+
+    def test_commenter_enabled_not_root_module(self):
+        connection = psycopg.Connection.connect(
+            dbname=POSTGRES_DB_NAME,
+            user=POSTGRES_USER,
+            password=POSTGRES_PASSWORD,
+            host=POSTGRES_HOST,
+            port=POSTGRES_PORT,
+        )
+        cursor = connection.cursor()
+        cursor.execute("SELECT  1;")
+        self.assertRegex(
+            cursor._query.query.decode("ascii"),
+            r"SELECT  1 /\*db_driver='psycopg(.*)',dbapi_level='\d.\d',dbapi_threadsafety=\d,driver_paramstyle=(.*),traceparent='\d{1,2}-[a-zA-Z0-9_]{32}-[a-zA-Z0-9_]{16}-\d{1,2}'\*/;",
+        )
+
+        cursor.close()
+        connection.close()