chore: cleanups

remove redundant function and assert rng metric values
on direct integers at the first test step rather than
after getting the variable value

Signed-off-by: aerosouund <aerosound161@gmail.com>

Author: aerosouund

Cargo.lock

@@ -41,6 +41,7 @@ log-instrument = { path = "../log-instrument", optional = true }
 memfd = "0.6.5"
 micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
 pci = { path = "../pci" }
+regex = "1.12.2"
 semver = { version = "1.0.27", features = ["serde"] }
 serde = { version = "1.0.228", features = ["derive", "rc"] }
 serde_json = "1.0.149"

src/vmm/Cargo.toml

@@ -7,7 +7,7 @@ use std::rc::Rc;
 use std::sync::Arc;
 
 use aws_lc_rs::rand;
-use log::info;
+use log::{info, warn};
 use vm_memory::GuestMemoryError;
 use vmm_sys_util::eventfd::EventFd;
 
@@ -76,7 +76,9 @@ impl Entropy {
             .map(|_| EventFd::new(libc::EFD_NONBLOCK))
             .collect::<Result<Vec<EventFd>, io::Error>>()?;
         let metrics = Arc::new(EntropyDeviceMetrics::default());
-        let _ = METRICS.set(metrics.clone()).inspect_err(|| warn!("Entropy metrics are already initialized!"));
+        let _ = METRICS
+            .set(metrics.clone())
+            .inspect_err(|_| warn!("Entropy metrics are already initialized!"));
 
         Ok(Self {
             avail_features: 1 << VIRTIO_F_VERSION_1,
@@ -453,19 +455,11 @@ mod tests {
         // Add a read-only descriptor (this should fail)
         th.add_desc_chain(RNG_QUEUE, 0, &[(0, 64, 0)]);
 
-        let entropy_event_fails = th.device().metrics.entropy_event_fails.count();
-        let entropy_event_count = th.device().metrics.entropy_event_count.count();
         let entropy_bytes = th.device().metrics.entropy_bytes.count();
         let host_rng_fails = th.device().metrics.host_rng_fails.count();
         assert_eq!(th.emulate_for_msec(100).unwrap(), 1);
-        assert_eq!(
-            th.device().metrics.entropy_event_fails.count(),
-            entropy_event_fails + 1
-        );
-        assert_eq!(
-            th.device().metrics.entropy_event_count.count(),
-            entropy_event_count + 1
-        );
+        assert_eq!(th.device().metrics.entropy_event_fails.count(), 1);
+        assert_eq!(th.device().metrics.entropy_event_count.count(), 1);
         assert_eq!(th.device().metrics.entropy_bytes.count(), entropy_bytes);
         assert_eq!(th.device().metrics.host_rng_fails.count(), host_rng_fails);
 
@@ -502,8 +496,6 @@ mod tests {
             ],
         );
 
-        let entropy_event_fails = th.device().metrics.entropy_event_fails.count();
-        let entropy_event_count = th.device().metrics.entropy_event_count.count();
         let entropy_bytes = th.device().metrics.entropy_bytes.count();
         let host_rng_fails = th.device().metrics.host_rng_fails.count();
         assert_eq!(th.emulate_for_msec(100).unwrap(), 1);

src/vmm/src/devices/virtio/rng/device.rs

@@ -79,20 +79,6 @@ impl EntropyDeviceMetrics {
             rate_limiter_event_count: SharedIncMetric::new(),
         }
     }
-
-    pub fn aggregate(&mut self, other: &Self) {
-        self.activate_fails.add(other.activate_fails.fetch_diff());
-        self.entropy_event_fails
-            .add(other.entropy_event_fails.fetch_diff());
-        self.entropy_event_count
-            .add(other.entropy_event_count.fetch_diff());
-        self.entropy_bytes.add(other.entropy_bytes.fetch_diff());
-        self.host_rng_fails.add(other.host_rng_fails.fetch_diff());
-        self.entropy_rate_limiter_throttled
-            .add(other.entropy_rate_limiter_throttled.fetch_diff());
-        self.rate_limiter_event_count
-            .add(other.rate_limiter_event_count.fetch_diff());
-    }
 }
 
 #[cfg(test)]