diff --git a/Cargo.lock b/Cargo.lock index ba3889230..73a81b44e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2081,9 +2081,9 @@ dependencies = [ [[package]] name = "prometheus" -version = "0.13.4" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" +checksum = "3ca5326d8d0b950a9acd87e6a3f94745394f62e4dae1b1ee22b2bc0c394af43a" dependencies = [ "cfg-if", "fnv", @@ -2091,7 +2091,7 @@ dependencies = [ "memchr", "parking_lot", "protobuf", - "thiserror 1.0.69", + "thiserror 2.0.12", ] [[package]] @@ -2139,9 +2139,23 @@ dependencies = [ [[package]] name = "protobuf" -version = "2.28.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" +checksum = "d65a1d4ddae7d8b5de68153b48f6aa3bba8cb002b243dbdbc55a5afbc98f99f4" +dependencies = [ + "once_cell", + "protobuf-support", + "thiserror 1.0.69", +] + +[[package]] +name = "protobuf-support" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e36c2f31e0a47f9280fb347ef5e461ffcd2c52dd520d8e216b52f93b0b0d7d6" +dependencies = [ + "thiserror 1.0.69", +] [[package]] name = "quick-error" diff --git a/src/hyperlight_host/Cargo.toml b/src/hyperlight_host/Cargo.toml index 04bcda76b..64278e902 100644 --- a/src/hyperlight_host/Cargo.toml +++ b/src/hyperlight_host/Cargo.toml @@ -43,7 +43,7 @@ vmm-sys-util = "0.12.1" crossbeam = "0.8.0" crossbeam-channel = "0.5.14" thiserror = "2.0.12" -prometheus = "0.13.3" +prometheus = "0.14.0" strum = { version = "0.27", features = ["derive"] } tempfile = { version = "3.19", optional = true } serde_yaml = "0.9" diff --git a/src/hyperlight_host/examples/metrics/main.rs b/src/hyperlight_host/examples/metrics/main.rs index 2028c21f7..36817b546 100644 --- a/src/hyperlight_host/examples/metrics/main.rs +++ b/src/hyperlight_host/examples/metrics/main.rs @@ -139,34 +139,34 @@ fn get_metrics() { for metric in metrics.iter() { match metric.get_field_type() { prometheus::proto::MetricType::COUNTER => { - println!("Counter: {:?}", metric.get_help()); + println!("Counter: {:?}", metric.help()); metric.get_metric().iter().for_each(|metric| { let pair = metric.get_label(); for pair in pair.iter() { - println!("Label: {:?} Name: {:?}", pair.get_name(), pair.get_value()); + println!("Label: {:?} Name: {:?}", pair.name(), pair.value()); } - println!("Value: {:?}", metric.get_counter().get_value()); + println!("Value: {:?}", metric.get_counter().value()); }); } prometheus::proto::MetricType::GAUGE => { - println!("Gauge: {:?}", metric.get_help()); + println!("Gauge: {:?}", metric.help()); metric.get_metric().iter().for_each(|metric| { let pair = metric.get_label(); for pair in pair.iter() { - println!("Label: {:?} Name: {:?}", pair.get_name(), pair.get_value()); + println!("Label: {:?} Name: {:?}", pair.name(), pair.value()); } - println!("Value: {:?}", metric.get_gauge().get_value()); + println!("Value: {:?}", metric.get_gauge().value()); }); } prometheus::proto::MetricType::UNTYPED => { - println!("Metric: {:?}", metric.get_help()); + println!("Metric: {:?}", metric.help()); } prometheus::proto::MetricType::HISTOGRAM => { - println!("Histogram: {:?}", metric.get_help()); + println!("Histogram: {:?}", metric.help()); for metric in metric.get_metric() { let pair = metric.get_label(); for pair in pair.iter() { - println!("Label: {:?} Name: {:?}", pair.get_name(), pair.get_value()); + println!("Label: {:?} Name: {:?}", pair.name(), pair.value()); } let count = metric.get_histogram().get_sample_count(); println!("Number of observations: {:?}", count); @@ -179,14 +179,14 @@ fn get_metrics() { .for_each(|bucket| { println!( "Bucket: {:?} Count: {:?}", - bucket.get_upper_bound(), - bucket.get_cumulative_count() + bucket.upper_bound(), + bucket.cumulative_count() ) }); } } prometheus::proto::MetricType::SUMMARY => { - println!("Summary: {:?}", metric.get_help()); + println!("Summary: {:?}", metric.help()); } } }