Skip to content

Commit 553dc31

Browse files
committed
PYTHON-5846 Drop publish param from _HeartbeatTelemetry, derive from listeners
1 parent 4ea5205 commit 553dc31

3 files changed

Lines changed: 4 additions & 12 deletions

File tree

pymongo/_telemetry.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,25 +351,23 @@ class _HeartbeatTelemetry:
351351
context, then :meth:`succeeded` or :meth:`failed` when the outcome is known.
352352
"""
353353

354-
__slots__ = ("_address", "_awaited", "_listeners", "_publish", "_start", "_topology_id")
354+
__slots__ = ("_address", "_awaited", "_listeners", "_start", "_topology_id")
355355

356356
def __init__(
357357
self,
358358
topology_id: ObjectId,
359359
address: _Address,
360360
listeners: Optional[_EventListeners],
361-
publish: bool,
362361
awaited: bool,
363362
) -> None:
364363
self._topology_id = topology_id
365364
self._address = address
366365
self._listeners = listeners
367-
self._publish = publish
368366
self._awaited = awaited
369367

370368
@property
371369
def _should_publish(self) -> bool:
372-
return self._publish and self._listeners is not None
370+
return self._listeners is not None and self._listeners.enabled_for_server_heartbeat
373371

374372
@property
375373
def _should_log(self) -> bool:

pymongo/asynchronous/monitor.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ def __init__(
151151
self._pool = pool
152152
self._settings = topology_settings
153153
self._listeners = self._settings._pool_options._event_listeners
154-
self._publish = self._listeners is not None and self._listeners.enabled_for_server_heartbeat
155154
self._cancel_context: Optional[_CancellationContext] = None
156155
self._conn_id: Optional[int] = None
157156
self._current_hb: Optional[_HeartbeatTelemetry] = None
@@ -288,9 +287,7 @@ async def _check_once(self) -> ServerDescription:
288287
awaited = bool(
289288
self._pool.conns and self._stream and sd.is_server_type_known and sd.topology_version
290289
)
291-
hb = _HeartbeatTelemetry(
292-
self._topology._topology_id, address, self._listeners, self._publish, awaited
293-
)
290+
hb = _HeartbeatTelemetry(self._topology._topology_id, address, self._listeners, awaited)
294291
self._current_hb = hb
295292
hb.started()
296293

pymongo/synchronous/monitor.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ def __init__(
151151
self._pool = pool
152152
self._settings = topology_settings
153153
self._listeners = self._settings._pool_options._event_listeners
154-
self._publish = self._listeners is not None and self._listeners.enabled_for_server_heartbeat
155154
self._cancel_context: Optional[_CancellationContext] = None
156155
self._conn_id: Optional[int] = None
157156
self._current_hb: Optional[_HeartbeatTelemetry] = None
@@ -286,9 +285,7 @@ def _check_once(self) -> ServerDescription:
286285
awaited = bool(
287286
self._pool.conns and self._stream and sd.is_server_type_known and sd.topology_version
288287
)
289-
hb = _HeartbeatTelemetry(
290-
self._topology._topology_id, address, self._listeners, self._publish, awaited
291-
)
288+
hb = _HeartbeatTelemetry(self._topology._topology_id, address, self._listeners, awaited)
292289
self._current_hb = hb
293290
hb.started()
294291

0 commit comments

Comments
 (0)