Add operation name and ID to message

Author: NoahStapp

pymongo/asynchronous/mongo_client.py

@@ -2837,7 +2837,7 @@ async def _write(self) -> T:
                 if self._retrying:
                     _debug_log(
                         _COMMAND_LOGGER,
-                        message=f"Retrying write attempt number {self._attempt_number}",
+                        message=f"Retrying write attempt number {self._attempt_number} for operation `{self._operation}` with id {self._operation_id}",
                     )
                 return await self._func(self._session, conn, self._retryable)  # type: ignore
         except PyMongoError as exc:
@@ -2863,7 +2863,7 @@ async def _read(self) -> T:
             if self._retrying:
                 _debug_log(
                     _COMMAND_LOGGER,
-                    message=f"Retrying read attempt number {self._attempt_number}",
+                    message=f"Retrying read attempt number {self._attempt_number} for operation `{self._operation}` with id {self._operation_id}",
                 )
             return await self._func(self._session, self._server, conn, read_pref)  # type: ignore
 

pymongo/synchronous/mongo_client.py

@@ -2823,7 +2823,7 @@ def _write(self) -> T:
                 if self._retrying:
                     _debug_log(
                         _COMMAND_LOGGER,
-                        message=f"Retrying write attempt number {self._attempt_number}",
+                        message=f"Retrying write attempt number {self._attempt_number} for operation `{self._operation}` with id {self._operation_id}",
                     )
                 return self._func(self._session, conn, self._retryable)  # type: ignore
         except PyMongoError as exc:
@@ -2849,7 +2849,7 @@ def _read(self) -> T:
             if self._retrying:
                 _debug_log(
                     _COMMAND_LOGGER,
-                    message=f"Retrying read attempt number {self._attempt_number}",
+                    message=f"Retrying read attempt number {self._attempt_number} for operation `{self._operation}` with id {self._operation_id}",
                 )
             return self._func(self._session, self._server, conn, read_pref)  # type: ignore
 

test/asynchronous/test_logger.py

@@ -110,6 +110,7 @@ async def test_logging_retry_read_attempts(self):
         retry_messages = [
             r.getMessage() for r in cm.records if "Retrying read attempt" in r.getMessage()
         ]
+        print(retry_messages)
         self.assertEqual(len(retry_messages), 1)
 
 

test/test_logger.py

@@ -109,6 +109,7 @@ def test_logging_retry_read_attempts(self):
         retry_messages = [
             r.getMessage() for r in cm.records if "Retrying read attempt" in r.getMessage()
         ]
+        print(retry_messages)
         self.assertEqual(len(retry_messages), 1)