diff --git a/.gitignore b/.gitignore index 155e4cbd8a8..bdb781253ec 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ test_results/* /resources/linux /resources/x86_64 /resources/aarch64 +/src/check_metrics.py diff --git a/src/vmm/src/devices/virtio/net/metrics.rs b/src/vmm/src/devices/virtio/net/metrics.rs index 60e03f224de..a2d18c8412b 100644 --- a/src/vmm/src/devices/virtio/net/metrics.rs +++ b/src/vmm/src/devices/virtio/net/metrics.rs @@ -161,8 +161,6 @@ pub struct NetDeviceMetrics { pub rx_queue_event_count: SharedIncMetric, /// Number of events associated with the rate limiter installed on the receiving path. pub rx_event_rate_limiter_count: SharedIncMetric, - /// Number of RX partial writes to guest. - pub rx_partial_writes: SharedIncMetric, /// Number of RX rate limiter throttling events. pub rx_rate_limiter_throttled: SharedIncMetric, /// Number of events received on the associated tap. @@ -191,8 +189,6 @@ pub struct NetDeviceMetrics { pub tx_count: SharedIncMetric, /// Number of transmitted packets. pub tx_packets_count: SharedIncMetric, - /// Number of TX partial reads from guest. - pub tx_partial_reads: SharedIncMetric, /// Number of events associated with the transmitting queue. pub tx_queue_event_count: SharedIncMetric, /// Number of events associated with the rate limiter installed on the transmitting path. @@ -233,8 +229,6 @@ impl NetDeviceMetrics { .add(other.rx_queue_event_count.fetch_diff()); self.rx_event_rate_limiter_count .add(other.rx_event_rate_limiter_count.fetch_diff()); - self.rx_partial_writes - .add(other.rx_partial_writes.fetch_diff()); self.rx_rate_limiter_throttled .add(other.rx_rate_limiter_throttled.fetch_diff()); self.rx_tap_event_count @@ -256,8 +250,6 @@ impl NetDeviceMetrics { self.tx_count.add(other.tx_count.fetch_diff()); self.tx_packets_count .add(other.tx_packets_count.fetch_diff()); - self.tx_partial_reads - .add(other.tx_partial_reads.fetch_diff()); self.tx_queue_event_count .add(other.tx_queue_event_count.fetch_diff()); self.tx_rate_limiter_event_count diff --git a/src/vmm/src/logger/metrics.rs b/src/vmm/src/logger/metrics.rs index e793495e1f1..6b9f5a17699 100644 --- a/src/vmm/src/logger/metrics.rs +++ b/src/vmm/src/logger/metrics.rs @@ -354,10 +354,6 @@ pub struct ApiServerMetrics { pub process_startup_time_us: SharedStoreMetric, /// Measures the cpu's startup time in microseconds. pub process_startup_time_cpu_us: SharedStoreMetric, - /// Number of failures on API requests triggered by internal errors. - pub sync_response_fails: SharedIncMetric, - /// Number of timeouts during communication with the VMM. - pub sync_vmm_send_timeout_count: SharedIncMetric, } impl ApiServerMetrics { /// Const default construction. @@ -365,8 +361,6 @@ impl ApiServerMetrics { Self { process_startup_time_us: SharedStoreMetric::new(), process_startup_time_cpu_us: SharedStoreMetric::new(), - sync_response_fails: SharedIncMetric::new(), - sync_vmm_send_timeout_count: SharedIncMetric::new(), } } } @@ -508,15 +502,12 @@ impl PatchRequestsMetrics { pub struct DeprecatedApiMetrics { /// Total number of calls to deprecated HTTP endpoints. pub deprecated_http_api_calls: SharedIncMetric, - /// Total number of calls to deprecated CMD line parameters. - pub deprecated_cmd_line_api_calls: SharedIncMetric, } impl DeprecatedApiMetrics { /// Const default construction. pub const fn new() -> Self { Self { deprecated_http_api_calls: SharedIncMetric::new(), - deprecated_cmd_line_api_calls: SharedIncMetric::new(), } } } @@ -530,8 +521,6 @@ pub struct LoggerSystemMetrics { pub metrics_fails: SharedIncMetric, /// Number of misses on logging human readable content. pub missed_log_count: SharedIncMetric, - /// Number of errors while trying to log human readable content. - pub log_fails: SharedIncMetric, } impl LoggerSystemMetrics { /// Const default construction. @@ -540,7 +529,6 @@ impl LoggerSystemMetrics { missed_metrics_count: SharedIncMetric::new(), metrics_fails: SharedIncMetric::new(), missed_log_count: SharedIncMetric::new(), - log_fails: SharedIncMetric::new(), } } } @@ -811,8 +799,6 @@ impl VcpuMetrics { /// Metrics specific to the machine manager as a whole. #[derive(Debug, Default, Serialize)] pub struct VmmMetrics { - /// Number of device related events received for a VM. - pub device_events: SharedIncMetric, /// Metric for signaling a panic has occurred. pub panic_count: SharedStoreMetric, } @@ -820,7 +806,6 @@ impl VmmMetrics { /// Const default construction. pub const fn new() -> Self { Self { - device_events: SharedIncMetric::new(), panic_count: SharedStoreMetric::new(), } } diff --git a/tests/host_tools/fcmetrics.py b/tests/host_tools/fcmetrics.py index 47661d5b27d..9ca8630e751 100644 --- a/tests/host_tools/fcmetrics.py +++ b/tests/host_tools/fcmetrics.py @@ -104,7 +104,6 @@ def validate_fc_metrics(metrics): "event_fails", "rx_queue_event_count", "rx_event_rate_limiter_count", - "rx_partial_writes", "rx_rate_limiter_throttled", "rx_tap_event_count", "rx_bytes_count", @@ -118,7 +117,6 @@ def validate_fc_metrics(metrics): "tx_fails", "tx_count", "tx_packets_count", - "tx_partial_reads", "tx_queue_event_count", "tx_rate_limiter_event_count", "tx_rate_limiter_throttled", @@ -131,8 +129,6 @@ def validate_fc_metrics(metrics): "api_server": [ "process_startup_time_us", "process_startup_time_cpu_us", - "sync_response_fails", - "sync_vmm_send_timeout_count", ], "balloon": [ "activate_fails", @@ -145,7 +141,6 @@ def validate_fc_metrics(metrics): "block": block_metrics, "deprecated_api": [ "deprecated_http_api_calls", - "deprecated_cmd_line_api_calls", ], "get_api_requests": [ "instance_info_count", @@ -177,7 +172,6 @@ def validate_fc_metrics(metrics): "missed_metrics_count", "metrics_fails", "missed_log_count", - "log_fails", ], "mmds": [ "rx_accepted", @@ -241,7 +235,6 @@ def validate_fc_metrics(metrics): {"exit_mmio_write_agg": latency_agg_metrics_fields}, ], "vmm": [ - "device_events", "panic_count", ], "uart": [ diff --git a/tests/integration_tests/functional/test_pause_resume.py b/tests/integration_tests/functional/test_pause_resume.py index ca2bb6936b3..d27e21f3103 100644 --- a/tests/integration_tests/functional/test_pause_resume.py +++ b/tests/integration_tests/functional/test_pause_resume.py @@ -13,7 +13,6 @@ def verify_net_emulation_paused(metrics): """Verify net emulation is paused based on provided metrics.""" net_metrics = metrics["net"] assert net_metrics["rx_queue_event_count"] == 0 - assert net_metrics["rx_partial_writes"] == 0 assert net_metrics["rx_tap_event_count"] == 0 assert net_metrics["rx_bytes_count"] == 0 assert net_metrics["rx_packets_count"] == 0