Update health watcher if there is an instance update (#1204)

Author: dhurley

internal/watcher/health/health_watcher_service.go

@@ -54,6 +54,7 @@ func NewHealthWatcherService(agentConfig *config.Config) *HealthWatcherService {
 func (hw *HealthWatcherService) AddHealthWatcher(instances []*mpi.Instance) {
 	hw.healthWatcherMutex.Lock()
 	defer hw.healthWatcherMutex.Unlock()
+
 	for _, instance := range instances {
 		switch instance.GetInstanceMeta().GetInstanceType() {
 		case mpi.InstanceMeta_INSTANCE_TYPE_NGINX, mpi.InstanceMeta_INSTANCE_TYPE_NGINX_PLUS:
@@ -73,12 +74,18 @@ func (hw *HealthWatcherService) AddHealthWatcher(instances []*mpi.Instance) {
 }
 
 func (hw *HealthWatcherService) UpdateHealthWatcher(instances []*mpi.Instance) {
+	hw.healthWatcherMutex.Lock()
+	defer hw.healthWatcherMutex.Unlock()
+
 	for _, instance := range instances {
 		hw.instances[instance.GetInstanceMeta().GetInstanceId()] = instance
 	}
 }
 
 func (hw *HealthWatcherService) DeleteHealthWatcher(instances []*mpi.Instance) {
+	hw.healthWatcherMutex.Lock()
+	defer hw.healthWatcherMutex.Unlock()
+
 	for _, instance := range instances {
 		delete(hw.watchers, instance.GetInstanceMeta().GetInstanceId())
 		delete(hw.instances, instance.GetInstanceMeta().GetInstanceId())

internal/watcher/watcher_plugin.go

@@ -328,6 +328,7 @@ func (w *Watcher) handleInstanceUpdates(newCtx context.Context, message instance
 	}
 	if len(message.InstanceUpdates.UpdatedInstances) > 0 {
 		slog.DebugContext(newCtx, "Instances updated", "instances", message.InstanceUpdates.UpdatedInstances)
+		w.healthWatcherService.UpdateHealthWatcher(message.InstanceUpdates.UpdatedInstances)
 		w.messagePipe.Process(
 			newCtx,
 			&bus.Message{Topic: bus.UpdatedInstancesTopic, Data: message.InstanceUpdates.UpdatedInstances},