chore: remove uneeded From implementation

Author: sigilioso

agent-control/src/event.rs

@@ -54,9 +54,3 @@ pub enum SubAgentInternalEvent {
     AgentHealthInfo(HealthWithStartTime),
     AgentVersionInfo(AgentVersion),
 }
-
-impl From<HealthWithStartTime> for SubAgentInternalEvent {
-    fn from(health: HealthWithStartTime) -> Self {
-        Self::AgentHealthInfo(health)
-    }
-}

agent-control/src/sub_agent/on_host/supervisor.rs

@@ -398,7 +398,6 @@ pub mod tests {
     use crate::health::health_checker::Healthy;
     use crate::sub_agent::on_host::command::executable_data::ExecutableData;
     use crate::sub_agent::on_host::command::restart_policy::{Backoff, RestartPolicy};
-    use crate::sub_agent::version::version_checker::AgentVersion;
     use std::thread;
     use std::time::{Duration, Instant};
     use tracing_test::traced_test;
@@ -626,37 +625,36 @@ pub mod tests {
         let start_time = SystemTime::now();
 
         // It starts once and restarts 3 times, hence 4 healthy events and a final unhealthy one
-        let expected_ordered_events: Vec<SubAgentInternalEvent> = {
-            vec![
-                HealthWithStartTime::new(Healthy::default().into(), start_time).into(),
-                HealthWithStartTime::new(Healthy::default().into(), start_time).into(),
-                HealthWithStartTime::new(Healthy::default().into(), start_time).into(),
-                HealthWithStartTime::new(Healthy::default().into(), start_time).into(),
-                HealthWithStartTime::new(
-                    Unhealthy::new(
-                        String::default(),
-                        "supervisor exceeded its defined restart policy".to_string(),
-                    )
-                    .into(),
-                    start_time,
+        let expected_ordered_events: Vec<SubAgentInternalEvent> = [
+            HealthWithStartTime::new(Healthy::default().into(), start_time),
+            HealthWithStartTime::new(Healthy::default().into(), start_time),
+            HealthWithStartTime::new(Healthy::default().into(), start_time),
+            HealthWithStartTime::new(Healthy::default().into(), start_time),
+            HealthWithStartTime::new(
+                Unhealthy::new(
+                    String::default(),
+                    "supervisor exceeded its defined restart policy".to_string(),
                 )
                 .into(),
-            ]
-        };
+                start_time,
+            ),
+        ]
+        .into_iter()
+        .map(SubAgentInternalEvent::AgentHealthInfo)
+        .collect();
 
         let actual_ordered_events = sub_agent_internal_consumer
             .as_ref()
             .iter()
-            .map(|event| match event {
-                SubAgentInternalEvent::AgentHealthInfo(health) => {
-                    HealthWithStartTime::new(health.into(), start_time).into()
-                }
-                SubAgentInternalEvent::StopRequested => SubAgentInternalEvent::StopRequested,
-                SubAgentInternalEvent::AgentVersionInfo(agent_id) => {
-                    SubAgentInternalEvent::AgentVersionInfo(AgentVersion::new(
-                        agent_id.version().to_string(),
-                        agent_id.opamp_field().to_string(),
+            .map(|event| {
+                // Patch start_time for health events to allow comparison
+                if let SubAgentInternalEvent::AgentHealthInfo(health) = event {
+                    SubAgentInternalEvent::AgentHealthInfo(HealthWithStartTime::new(
+                        health.into(),
+                        start_time,
                     ))
+                } else {
+                    event
                 }
             })
             .collect::<Vec<_>>();