Health store integration

azurelinuxagent/ga/monitor.py

@@ -122,6 +122,11 @@ def run(self):
         self.init_protocols()
         self.start()
 
+    def stop(self):
+        self.should_run = False
+        if self.is_alive():
+            self.event_thread.join()
+
     def init_protocols(self):
         self.protocol = self.protocol_util.get_protocol()
         self.health_service = HealthService(self.protocol.endpoint)

tests/ga/test_monitor.py

@@ -90,14 +90,16 @@ def test_heartbeats(self, patch_hostplugin_heartbeat, patch_send_events, patch_t
         self.assertEqual(0, patch_hostplugin_heartbeat.call_count)
         self.assertEqual(0, patch_send_events.call_count)
         self.assertEqual(0, patch_telemetry_heartbeat.call_count)
+
         monitor_handler.start()
         time.sleep(1)
         self.assertTrue(monitor_handler.is_alive())
+
         self.assertNotEqual(0, patch_hostplugin_heartbeat.call_count)
         self.assertNotEqual(0, patch_send_events.call_count)
         self.assertNotEqual(0, patch_telemetry_heartbeat.call_count)
 
-        monitor_handler.should_run = False
+        monitor_handler.stop()
 
     def test_heartbeat_timings_updates_after_window(self, *args):
         monitor_handler = get_monitor_handler()
@@ -128,7 +130,7 @@ def test_heartbeat_timings_updates_after_window(self, *args):
         self.assertNotEqual(events_collection, monitor_handler.last_event_collection)
         self.assertNotEqual(heartbeat_telemetry, monitor_handler.last_telemetry_heartbeat)
 
-        monitor_handler.should_run = False
+        monitor_handler.stop()
 
     def test_heartbeat_timings_no_updates_within_window(self, *args):
         monitor_handler = get_monitor_handler()
@@ -159,7 +161,7 @@ def test_heartbeat_timings_no_updates_within_window(self, *args):
         self.assertEqual(events_collection, monitor_handler.last_event_collection)
         self.assertEqual(heartbeat_telemetry, monitor_handler.last_telemetry_heartbeat)
 
-        monitor_handler.should_run = False
+        monitor_handler.stop()
 
     @patch("azurelinuxagent.common.protocol.healthservice.HealthService.report_host_plugin_heartbeat")
     def test_heartbeat_creates_signal(self, patch_report_heartbeat, *args):
@@ -168,5 +170,4 @@ def test_heartbeat_creates_signal(self, patch_report_heartbeat, *args):
         monitor_handler.last_host_plugin_heartbeat = datetime.datetime.utcnow() - timedelta(hours=1)
         monitor_handler.send_host_plugin_heartbeat()
         self.assertEqual(1, patch_report_heartbeat.call_count)
-        monitor_handler.should_run = False
-
+        monitor_handler.stop()