Skip to content

psycopg/psycopg_async: fix handling of ServerCursor / AsyncServerCursor #2489

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 1 commit into from
Nov 20, 2025
+20 −4
Merged

psycopg/psycopg_async: fix handling of ServerCursor / AsyncServerCursor #2489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions elasticapm/instrumentation/packages/asyncio/psycopg_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ def _bake_sql(self, sql):
def extract_signature(self, sql):
return extract_signature(sql)

async def execute(self, query, params=None, *, prepare=None, binary=None, **kwargs):
return await self._trace_sql(self.__wrapped__.execute, query, params, prepare=prepare, binary=binary, **kwargs)
async def execute(self, query, params=None, **kwargs):
return await self._trace_sql(self.__wrapped__.execute, query, params, **kwargs)

async def executemany(self, query, params_seq, **kwargs):
return await self._trace_sql(self.__wrapped__.executemany, query, params_seq, **kwargs)
Expand Down
4 changes: 2 additions & 2 deletions elasticapm/instrumentation/packages/psycopg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ def _bake_sql(self, sql):
def extract_signature(self, sql):
return extract_signature(sql)

def execute(self, query, params=None, *, prepare=None, binary=None, **kwargs):
return self._trace_sql(self.__wrapped__.execute, query, params, prepare=prepare, binary=binary, **kwargs)
def execute(self, query, params=None, **kwargs):
return self._trace_sql(self.__wrapped__.execute, query, params, **kwargs)

def executemany(self, query, params_seq, **kwargs):
return self._trace_sql(self.__wrapped__.executemany, query, params_seq, **kwargs)
Expand Down
7 changes: 7 additions & 0 deletions tests/instrumentation/asyncio_tests/psycopg_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,10 @@ async def test_executemany(instrument, postgres_connection, elasticapm_client):
assert span["action"] == "query"
assert span["sync"] == False
assert span["name"] == "INSERT INTO test"


async def test_server_cursor_execute(instrument, postgres_connection, elasticapm_client):
cursor = postgres_connection.cursor(name="async_server_cursor")
assert isinstance(cursor, psycopg.AsyncServerCursor)
record = await cursor.execute(query="SELECT 1", params=None, binary=None)
assert record
9 changes: 9 additions & 0 deletions tests/instrumentation/psycopg_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,3 +279,12 @@ def test_psycopg_connection(instrument, elasticapm_transaction, postgres_connect
host = os.environ.get("POSTGRES_HOST", "localhost")
assert span["name"] == f"psycopg.connect {host}:5432"
assert span["action"] == "connect"


@pytest.mark.integrationtest
@pytest.mark.skipif(not has_postgres_configured, reason="PostgresSQL not configured")
def test_server_cursor_execute(instrument, postgres_connection, elasticapm_client):
cursor = postgres_connection.cursor(name="server_cursor")
assert isinstance(cursor, psycopg.ServerCursor)
record = cursor.execute(query="SELECT 1", params=None, binary=True)
assert record
Loading