Fix compat with psycopg 3.0

Author: xrmx

elasticapm/instrumentation/packages/asyncio/psycopg_async.py

@@ -55,11 +55,11 @@ 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):
-        return await self._trace_sql(self.__wrapped__.execute, query, params, prepare=prepare, binary=binary)
+    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 executemany(self, query, params_seq, *, returning=False):
-        return await self._trace_sql(self.__wrapped__.executemany, query, params_seq, returning=returning)
+    async def executemany(self, query, params_seq, **kwargs):
+        return await self._trace_sql(self.__wrapped__.executemany, query, params_seq, **kwargs)
 
     async def __aenter__(self):
         return PGAsyncCursorProxy(await self.__wrapped__.__aenter__(), destination_info=self._self_destination_info)

elasticapm/instrumentation/packages/psycopg.py

@@ -55,11 +55,11 @@ def _bake_sql(self, sql):
     def extract_signature(self, sql):
         return extract_signature(sql)
 
-    def execute(self, query, params=None, *, prepare=None, binary=None):
-        return self._trace_sql(self.__wrapped__.execute, query, params, prepare=prepare, binary=binary)
+    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 executemany(self, query, params_seq, *, returning=False):
-        return self._trace_sql(self.__wrapped__.executemany, query, params_seq, returning=returning)
+    def executemany(self, query, params_seq, **kwargs):
+        return self._trace_sql(self.__wrapped__.executemany, query, params_seq, **kwargs)
 
     def __enter__(self):
         return PGCursorProxy(self.__wrapped__.__enter__(), destination_info=self._self_destination_info)