refactor: move health module outside sub_agent [NR-420261] (#1324)

Author: sigilioso

agent-control/src/agent_control/agent_control.rs

@@ -12,15 +12,15 @@ use crate::event::broadcaster::unbounded::UnboundedBroadcast;
 use crate::event::{
     AgentControlEvent, ApplicationEvent, OpAMPEvent, SubAgentEvent, channel::EventConsumer,
 };
+use crate::health::health_checker::{Health, Healthy, Unhealthy};
+use crate::health::with_start_time::HealthWithStartTime;
 use crate::opamp::remote_config::report::OpampRemoteConfigStatus;
 use crate::opamp::{
     hash_repository::HashRepository,
     remote_config::hash::Hash,
     remote_config::{RemoteConfig, RemoteConfigError},
 };
 use crate::sub_agent::collection::StartedSubAgents;
-use crate::sub_agent::health::health_checker::{Health, Healthy, Unhealthy};
-use crate::sub_agent::health::with_start_time::HealthWithStartTime;
 use crate::sub_agent::identity::AgentIdentity;
 use crate::sub_agent::{NotStartedSubAgent, SubAgentBuilder};
 use crate::values::yaml_config::YAMLConfig;
@@ -434,12 +434,12 @@ mod tests {
     use crate::event::broadcaster::unbounded::UnboundedBroadcast;
     use crate::event::channel::{EventConsumer, pub_sub};
     use crate::event::{AgentControlEvent, ApplicationEvent, OpAMPEvent};
+    use crate::health::health_checker::{Healthy, Unhealthy};
     use crate::opamp::client_builder::tests::MockStartedOpAMPClient;
     use crate::opamp::hash_repository::repository::tests::MockHashRepository;
     use crate::opamp::remote_config::hash::Hash;
     use crate::opamp::remote_config::{ConfigurationMap, RemoteConfig};
     use crate::sub_agent::collection::StartedSubAgents;
-    use crate::sub_agent::health::health_checker::{Healthy, Unhealthy};
     use crate::sub_agent::tests::MockStartedSubAgent;
     use crate::sub_agent::tests::MockSubAgentBuilder;
     use mockall::{Sequence, predicate};

agent-control/src/agent_control/event_handler/opamp/remote_config.rs

@@ -4,8 +4,8 @@ use crate::agent_control::config_storer::loader_storer::{
 };
 use crate::agent_control::config_validator::DynamicConfigValidator;
 use crate::agent_control::resource_cleaner::ResourceCleaner;
+use crate::health::health_checker::{Healthy, Unhealthy};
 use crate::opamp::remote_config::report::OpampRemoteConfigStatus;
-use crate::sub_agent::health::health_checker::{Healthy, Unhealthy};
 use crate::{
     agent_control::{agent_control::AgentControl, error::AgentError},
     opamp::{hash_repository::HashRepository, remote_config::RemoteConfig},

agent-control/src/agent_control/http_server/status.rs

@@ -1,9 +1,9 @@
 use crate::agent_control::agent_id::AgentID;
 
 use crate::agent_type::agent_type_id::AgentTypeID;
+use crate::health::health_checker::{Healthy, Unhealthy};
+use crate::health::with_start_time::HealthWithStartTime;
 use crate::opamp::{LastErrorCode, LastErrorMessage};
-use crate::sub_agent::health::health_checker::{Healthy, Unhealthy};
-use crate::sub_agent::health::with_start_time::HealthWithStartTime;
 use crate::sub_agent::identity::AgentIdentity;
 use serde::Serialize;
 use std::collections::HashMap;

agent-control/src/agent_control/http_server/status_handler.rs

@@ -21,8 +21,8 @@ mod tests {
     use crate::agent_control::http_server::status::{Status, SubAgentStatus};
     use crate::agent_control::http_server::status_handler::status_handler;
     use crate::agent_type::agent_type_id::AgentTypeID;
-    use crate::sub_agent::health::health_checker::{Healthy, Unhealthy};
-    use crate::sub_agent::health::with_start_time::HealthWithStartTime;
+    use crate::health::health_checker::{Healthy, Unhealthy};
+    use crate::health::with_start_time::HealthWithStartTime;
     use crate::sub_agent::identity::AgentIdentity;
     use actix_web::Responder;
     use actix_web::body::MessageBody;

agent-control/src/agent_control/http_server/status_updater.rs

@@ -145,8 +145,8 @@ mod tests {
     };
     use crate::event::SubAgentEvent;
     use crate::event::SubAgentEvent::SubAgentHealthInfo;
-    use crate::sub_agent::health::health_checker::{Healthy, Unhealthy};
-    use crate::sub_agent::health::with_start_time::HealthWithStartTime;
+    use crate::health::health_checker::{Healthy, Unhealthy};
+    use crate::health::with_start_time::HealthWithStartTime;
     use crate::sub_agent::identity::AgentIdentity;
 
     #[tokio::test(flavor = "multi_thread")]

agent-control/src/cli/install_agent_control.rs

@@ -1,13 +1,13 @@
 use crate::agent_control::config::{helmrelease_v2_type_meta, helmrepository_type_meta};
 use crate::cli::errors::CliError;
 use crate::cli::utils::*;
+use crate::health::health_checker::HealthChecker;
+use crate::health::k8s::health_checker::K8sHealthChecker;
+use crate::health::with_start_time::StartTime;
 use crate::k8s::annotations::Annotations;
 #[cfg_attr(test, mockall_double::double)]
 use crate::k8s::client::SyncK8sClient;
 use crate::k8s::labels::Labels;
-use crate::sub_agent::health::health_checker::HealthChecker;
-use crate::sub_agent::health::k8s::health_checker::SubAgentHealthChecker;
-use crate::sub_agent::health::with_start_time::StartTime;
 use crate::sub_agent::identity::AgentIdentity;
 use clap::Parser;
 use kube::{
@@ -235,7 +235,7 @@ fn check_installation(
     objects: Vec<DynamicObject>,
 ) -> Result<(), CliError> {
     let health_checker =
-        SubAgentHealthChecker::try_new(Arc::new(k8s_client), Arc::new(objects), StartTime::now())
+        K8sHealthChecker::try_new(Arc::new(k8s_client), Arc::new(objects), StartTime::now())
             .map_err(|err| {
                 CliError::InstallationCheck(format!("could not build health-checker: {err}"))
             })?

agent-control/src/event.rs

@@ -2,9 +2,9 @@ pub mod broadcaster;
 pub mod cancellation;
 pub mod channel;
 
+use crate::health::health_checker::{Healthy, Unhealthy};
+use crate::health::with_start_time::HealthWithStartTime;
 use crate::opamp::{LastErrorCode, LastErrorMessage};
-use crate::sub_agent::health::health_checker::{Healthy, Unhealthy};
-use crate::sub_agent::health::with_start_time::HealthWithStartTime;
 use crate::sub_agent::identity::AgentIdentity;
 use crate::sub_agent::version::version_checker::AgentVersion;
 use crate::{agent_control::agent_id::AgentID, opamp::remote_config::RemoteConfig};

agent-control/src/sub_agent/health.rs agent-control/src/health.rsagent-control/src/sub_agent/health.rs renamed to agent-control/src/health.rs

@@ -5,8 +5,8 @@ use crate::event::SubAgentInternalEvent;
 use crate::event::cancellation::CancellationMessage;
 use crate::event::channel::{EventConsumer, EventPublisher};
 
+use crate::health::with_start_time::HealthWithStartTime;
 use crate::k8s;
-use crate::sub_agent::health::with_start_time::HealthWithStartTime;
 use crate::sub_agent::identity::ID_ATTRIBUTE_NAME;
 use crate::sub_agent::supervisor::starter::SupervisorStarterError;
 use crate::utils::thread_context::{NotStartedThreadContext, StartedThreadContext};

…l/src/sub_agent/health/health_checker.rs …ent-control/src/health/health_checker.rsagent-control/src/sub_agent/health/health_checker.rs renamed to agent-control/src/health/health_checker.rs agent-control/src/sub_agent/health/health_checker.rs renamed to agent-control/src/health/health_checker.rs

@@ -0,0 +1 @@
+pub mod health_checker;