psycopg2: fix cursor execute and executemany signatures (#2331)

* psycopg2: fix cursor execute and executemany signatures The sql parameter is called query and the parameters are called vars and vars_list. * Fix execute test

Author: xrmx

elasticapm/instrumentation/packages/psycopg2.py

@@ -59,6 +59,12 @@ def _bake_sql(self, sql):
  def extract_signature(self, sql):
  return extract_signature(sql)
 
+ def execute(self, query, vars=None):
+ return self._trace_sql(self.__wrapped__.execute, query, vars)
+
+ def executemany(self, query, vars_list):
+ return self._trace_sql(self.__wrapped__.executemany, query, vars_list)
+
  def __enter__(self):
  return PGCursorProxy(self.__wrapped__.__enter__(), destination_info=self._self_destination_info)
 

tests/instrumentation/psycopg2_tests.py

@@ -266,6 +266,27 @@ def test_fully_qualified_table_name():
  assert "SELECT FROM db.schema.mytable" == actual
 
 
+@pytest.mark.integrationtest
+@pytest.mark.skipif(not has_postgres_configured, reason="PostgresSQL not configured")
+def test_cursor_execute_signature(instrument, postgres_connection, elasticapm_client):
+ cursor = postgres_connection.cursor()
+ cursor.execute(query="SELECT 1", vars=None)
+ row = cursor.fetchone()
+
+ assert row
+
+
+@pytest.mark.integrationtest
+@pytest.mark.skipif(not has_postgres_configured, reason="PostgresSQL not configured")
+def test_cursor_executemany_signature(instrument, postgres_connection, elasticapm_client):
+ cursor = postgres_connection.cursor()
+ res = cursor.executemany(
+ query="INSERT INTO test VALUES (%s, %s)",
+ vars_list=((4, "four"),),
+ )
+ assert res is None
+
+
 @pytest.mark.integrationtest
 @pytest.mark.skipif(not has_postgres_configured, reason="PostgresSQL not configured")
 def test_destination(instrument, postgres_connection, elasticapm_client):