Move health logic to transport

Author: sl0thentr0py

sentry_sdk/monitor.py

@@ -59,21 +59,9 @@ def _thread():
     def run(self):
         # type: () -> None
         self.check_health()
-        self._set_downsample_factor()
+        self.set_downsample_factor()
 
-    def _is_transport_rate_limited(self):
-        # type: () -> bool
-        if self.transport and hasattr(self.transport, "is_rate_limited"):
-            return self.transport.is_rate_limited()
-        return False
-
-    def _is_transport_worker_full(self):
-        # type: () -> bool
-        if self.transport and hasattr(self.transport, "is_worker_full"):
-            return self.transport.is_worker_full()
-        return False
-
-    def _set_downsample_factor(self):
+    def set_downsample_factor(self):
         # type: () -> None
         if self._healthy:
             if self._downsample_factor > 1:
@@ -95,10 +83,7 @@ def check_health(self):
         currently only checks if the transport is rate-limited.
         TODO: augment in the future with more checks.
         """
-        if self._is_transport_worker_full() or self._is_transport_rate_limited():
-            self._healthy = False
-        else:
-            self._healthy = True
+        self._healthy = self.transport.is_healthy()
 
     def is_healthy(self):
         # type: () -> bool

sentry_sdk/transport.py

@@ -107,6 +107,10 @@ def record_lost_event(
         """
         return None
 
+    def is_healthy(self):
+        # type: () -> bool
+        return True
+
     def __del__(self):
         # type: () -> None
         try:
@@ -311,14 +315,18 @@ def _disabled(bucket):
 
         return _disabled(category) or _disabled(None)
 
-    def is_rate_limited(self):
+    def _is_rate_limited(self):
         # type: () -> bool
         return any(ts > datetime.utcnow() for ts in self._disabled_until.values())
 
-    def is_worker_full(self):
+    def _is_worker_full(self):
         # type: () -> bool
         return self._worker.full()
 
+    def is_healthy(self):
+        # type: () -> bool
+        return not (self._is_worker_full() or self._is_rate_limited())
+
     def _send_event(
         self, event  # type: Event
     ):

tests/test_monitor.py

@@ -11,13 +11,13 @@ def _send_event(self, event):
     def _send_envelope(self, envelope):
         pass
 
-    def is_worker_full(self):
-        return False
+    def is_healthy(self):
+        return True
 
 
 class UnhealthyTestTransport(HealthyTestTransport):
-    def is_worker_full(self):
-        return True
+    def is_healthy(self):
+        return False
 
 
 def test_no_monitor_if_disabled(sentry_init):