Skip to content

Commit 0f33a1c

Browse files
committed
PYTHON-5846 Decompose Hello response in _HeartbeatTelemetry.succeeded
1 parent 553dc31 commit 0f33a1c

3 files changed

Lines changed: 18 additions & 5 deletions

File tree

pymongo/_telemetry.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,22 +403,23 @@ def emit_started_log(self, conn_id: int, server_conn_id: Optional[int]) -> None:
403403
def succeeded(
404404
self,
405405
round_trip_time: float,
406-
response: Any,
406+
reply: _DocumentOut,
407+
awaited: bool,
407408
conn_id: int,
408409
server_conn_id: Optional[int],
409410
) -> None:
410411
"""Emit the SUCCEEDED log entry and APM event."""
411412
if self._should_publish:
412413
assert self._listeners is not None
413414
self._listeners.publish_server_heartbeat_succeeded(
414-
self._address, round_trip_time, response, response.awaitable
415+
self._address, round_trip_time, reply, awaited
415416
)
416417
self._emit_log(
417418
_SDAMStatusMessage.HEARTBEAT_SUCCESS,
418419
driverConnectionId=conn_id,
419420
serverConnectionId=server_conn_id,
420421
durationMS=round_trip_time * 1000,
421-
reply=response.document,
422+
reply=reply,
422423
)
423424

424425
def failed(self, error: Exception, conn_id: Optional[int]) -> None:

pymongo/asynchronous/monitor.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,13 @@ async def _check_once(self) -> ServerDescription:
304304

305305
avg_rtt, min_rtt = await self._rtt_monitor.get()
306306
sd = ServerDescription(address, response, avg_rtt, min_round_trip_time=min_rtt)
307-
hb.succeeded(round_trip_time, response, conn.id, conn.server_connection_id)
307+
hb.succeeded(
308+
round_trip_time,
309+
response.document,
310+
response.awaitable,
311+
conn.id,
312+
conn.server_connection_id,
313+
)
308314
return sd
309315

310316
async def _check_with_socket(self, conn: AsyncConnection) -> tuple[Hello, float]: # type: ignore[type-arg]

pymongo/synchronous/monitor.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,13 @@ def _check_once(self) -> ServerDescription:
302302

303303
avg_rtt, min_rtt = self._rtt_monitor.get()
304304
sd = ServerDescription(address, response, avg_rtt, min_round_trip_time=min_rtt)
305-
hb.succeeded(round_trip_time, response, conn.id, conn.server_connection_id)
305+
hb.succeeded(
306+
round_trip_time,
307+
response.document,
308+
response.awaitable,
309+
conn.id,
310+
conn.server_connection_id,
311+
)
306312
return sd
307313

308314
def _check_with_socket(self, conn: Connection) -> tuple[Hello, float]: # type: ignore[type-arg]

0 commit comments

Comments
 (0)