Skip to content

psycopg2: fix cursor execute and executemany signatures #2331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 7, 2025
Merged

psycopg2: fix cursor execute and executemany signatures #2331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05a69e6
psycopg2: fix cursor execute and executemany signatures
xrmx Jul 3, 2025
1756304
Fix execute test
xrmx Jul 4, 2025
3dd83b5
Merge branch 'main' into cursor-execute-vars-argument
xrmx Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions elasticapm/instrumentation/packages/psycopg2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
21 changes: 21 additions & 0 deletions tests/instrumentation/psycopg2_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Loading