mirrors/krata
1
0
Fork 0
mirror of https://github.com/edera-dev/krata.git synced 2025-08-05 06:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

proto: move metrics into GuestMetrics for reusability

Browse Source
This commit is contained in:
Alex Zenla
2024-04-10 13:05:08 +00:00
parent 9b47cd648d
commit 3715b0b848
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
crates/ctl/src/cli/metrics.rs
View File

@ -4,8 +4,7 @@ use comfy_table::{presets::UTF8_FULL_CONDENSED, Table};
use krata::{ use krata::{
events::EventStream, events::EventStream,
v1::control::{ v1::control::{
control_service_client::ControlServiceClient, ReadGuestMetricsReply, control_service_client::ControlServiceClient, GuestMetrics, ReadGuestMetricsRequest,
ReadGuestMetricsRequest,
}, },
}; };
@ -40,17 +39,19 @@ impl MetricsCommand {
_events: EventStream, _events: EventStream,
) -> Result<()> { ) -> Result<()> {
let guest_id: String = resolve_guest(&mut client, &self.guest).await?; let guest_id: String = resolve_guest(&mut client, &self.guest).await?;
let reply = client let metrics = client
.read_guest_metrics(ReadGuestMetricsRequest { guest_id }) .read_guest_metrics(ReadGuestMetricsRequest { guest_id })
.await? .await?
.into_inner(); .into_inner()
.metrics
.unwrap_or_default();
match self.format { match self.format {
MetricsFormat::Table => { MetricsFormat::Table => {
self.print_metrics_table(reply)?; self.print_metrics_table(metrics)?;
} }
MetricsFormat::Json | MetricsFormat::JsonPretty | MetricsFormat::Yaml => { MetricsFormat::Json | MetricsFormat::JsonPretty | MetricsFormat::Yaml => {
let value = serde_json::to_value(proto2dynamic(reply)?)?; let value = serde_json::to_value(proto2dynamic(metrics)?)?;
let encoded = if self.format == MetricsFormat::JsonPretty { let encoded = if self.format == MetricsFormat::JsonPretty {
serde_json::to_string_pretty(&value)? serde_json::to_string_pretty(&value)?
} else if self.format == MetricsFormat::Yaml { } else if self.format == MetricsFormat::Yaml {
@ -62,19 +63,19 @@ impl MetricsCommand {
} }
MetricsFormat::KeyValue => { MetricsFormat::KeyValue => {
self.print_key_value(reply)?; self.print_key_value(metrics)?;
} }
} }
Ok(()) Ok(())
} }
fn print_metrics_table(&self, reply: ReadGuestMetricsReply) -> Result<()> { fn print_metrics_table(&self, metrics: GuestMetrics) -> Result<()> {
let mut table = Table::new(); let mut table = Table::new();
table.load_preset(UTF8_FULL_CONDENSED); table.load_preset(UTF8_FULL_CONDENSED);
table.set_content_arrangement(comfy_table::ContentArrangement::Dynamic); table.set_content_arrangement(comfy_table::ContentArrangement::Dynamic);
table.set_header(vec!["metric", "value"]); table.set_header(vec!["metric", "value"]);
let kvs = proto2kv(reply)?; let kvs = proto2kv(metrics)?;
for (key, value) in kvs { for (key, value) in kvs {
table.add_row(vec![key, value]); table.add_row(vec![key, value]);
} }
@ -82,7 +83,7 @@ impl MetricsCommand {
Ok(()) Ok(())
} }
fn print_key_value(&self, metrics: ReadGuestMetricsReply) -> Result<()> { fn print_key_value(&self, metrics: GuestMetrics) -> Result<()> {
let kvs = proto2kv(metrics)?; let kvs = proto2kv(metrics)?;
println!("{}", kv2line(kvs),); println!("{}", kv2line(kvs),);
Ok(()) Ok(())

11
crates/daemon/src/control.rs
View File

@ -12,8 +12,9 @@ use krata::{
control::{ control::{
control_service_server::ControlService, ConsoleDataReply, ConsoleDataRequest, control_service_server::ControlService, ConsoleDataReply, ConsoleDataRequest,
CreateGuestReply, CreateGuestRequest, DestroyGuestReply, DestroyGuestRequest, CreateGuestReply, CreateGuestRequest, DestroyGuestReply, DestroyGuestRequest,
ListGuestsReply, ListGuestsRequest, ReadGuestMetricsReply, ReadGuestMetricsRequest, GuestMetrics, ListGuestsReply, ListGuestsRequest, ReadGuestMetricsReply,
ResolveGuestReply, ResolveGuestRequest, WatchEventsReply, WatchEventsRequest, ReadGuestMetricsRequest, ResolveGuestReply, ResolveGuestRequest, WatchEventsReply,
WatchEventsRequest,
}, },
}, },
}; };
@ -327,8 +328,10 @@ impl ControlService for RuntimeControlService {
let mut reply = ReadGuestMetricsReply::default(); let mut reply = ReadGuestMetricsReply::default();
if let IdmResponseType::Metrics(metrics) = response { if let IdmResponseType::Metrics(metrics) = response {
reply.total_memory_bytes = metrics.total_memory_bytes; reply.metrics = Some(GuestMetrics {
reply.used_memory_bytes = metrics.used_memory_bytes; total_memory_bytes: metrics.total_memory_bytes,
used_memory_bytes: metrics.used_memory_bytes,
});
} }
Ok(Response::new(reply)) Ok(Response::new(reply))
} }

4
crates/krata/proto/krata/v1/control.proto
View File

@ -73,6 +73,10 @@ message ReadGuestMetricsRequest {
} }
message ReadGuestMetricsReply { message ReadGuestMetricsReply {
GuestMetrics metrics = 1;
}
message GuestMetrics {
uint64 total_memory_bytes = 1; uint64 total_memory_bytes = 1;
uint64 used_memory_bytes = 2; uint64 used_memory_bytes = 2;
} }