Skip to content

Commit 3eefcf7

Browse files
committed
PYTHON-5846 Fix typing: use Hello type in _HeartbeatTelemetry.succeeded
1 parent 0f33a1c commit 3eefcf7

3 files changed

Lines changed: 6 additions & 18 deletions

File tree

pymongo/_telemetry.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737

3838
if TYPE_CHECKING:
3939
from bson.objectid import ObjectId
40+
from pymongo.hello import Hello
4041
from pymongo.monitoring import _EventListeners
4142
from pymongo.typings import _Address, _DocumentOut
4243

@@ -403,23 +404,22 @@ def emit_started_log(self, conn_id: int, server_conn_id: Optional[int]) -> None:
403404
def succeeded(
404405
self,
405406
round_trip_time: float,
406-
reply: _DocumentOut,
407-
awaited: bool,
407+
response: Hello[Any],
408408
conn_id: int,
409409
server_conn_id: Optional[int],
410410
) -> None:
411411
"""Emit the SUCCEEDED log entry and APM event."""
412412
if self._should_publish:
413413
assert self._listeners is not None
414414
self._listeners.publish_server_heartbeat_succeeded(
415-
self._address, round_trip_time, reply, awaited
415+
self._address, round_trip_time, response, response.awaitable
416416
)
417417
self._emit_log(
418418
_SDAMStatusMessage.HEARTBEAT_SUCCESS,
419419
driverConnectionId=conn_id,
420420
serverConnectionId=server_conn_id,
421421
durationMS=round_trip_time * 1000,
422-
reply=reply,
422+
reply=response.document,
423423
)
424424

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

pymongo/asynchronous/monitor.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -304,13 +304,7 @@ 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(
308-
round_trip_time,
309-
response.document,
310-
response.awaitable,
311-
conn.id,
312-
conn.server_connection_id,
313-
)
307+
hb.succeeded(round_trip_time, response, conn.id, conn.server_connection_id)
314308
return sd
315309

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

pymongo/synchronous/monitor.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -302,13 +302,7 @@ 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(
306-
round_trip_time,
307-
response.document,
308-
response.awaitable,
309-
conn.id,
310-
conn.server_connection_id,
311-
)
305+
hb.succeeded(round_trip_time, response, conn.id, conn.server_connection_id)
312306
return sd
313307

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

0 commit comments

Comments
 (0)