Skip to content

Commit fa2dc77

Browse files
Update sysinfo requirement from 0.27 to 0.33 (#157)
* Update sysinfo requirement from 0.27 to 0.33 Updates the requirements on [sysinfo](https://github.com/GuillaumeGomez/sysinfo) to permit the latest version. - [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md) - [Commits](GuillaumeGomez/sysinfo@v0.27.0...v0.33.1) --- updated-dependencies: - dependency-name: sysinfo dependency-type: direct:production ... * Fix build issues with sysinfo >= 0.30. * Replace `refresh_system()` with `refresh_memory()` followed by `refresh_cpu_usage()` * Replace `uptime()` with `System::uptime()` * Replace `kernel_version()` with `System::kernel_version()` * Replace `os_version()` with `System::os_version()` See also GuillaumeGomez/sysinfo#1152. --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Dongsu Park <[email protected]>
1 parent 795ba29 commit fa2dc77

File tree

3 files changed

+14
-17
lines changed

3 files changed

+14
-17
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ anyhow = "1.0.81"
1616
tokio = { version = "1", features = ["full"] }
1717
tracing = "0.1.40"
1818
clap = { version = "4.5.21", features = ["derive", "cargo", "env"] }
19-
sysinfo = "0.27"
19+
sysinfo = "0.33"
2020
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
2121
opentelemetry = "0.26"
2222
opentelemetry_sdk = "0.26"

src/kvp.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use tracing_subscriber::{
2929
layer::Context as TracingContext, registry::LookupSpan, Layer,
3030
};
3131

32-
use sysinfo::{System, SystemExt};
32+
use sysinfo::System;
3333

3434
use tokio::sync::{mpsc::UnboundedReceiver, mpsc::UnboundedSender};
3535

@@ -478,9 +478,10 @@ fn truncate_guest_pool_file(kvp_file: &Path) -> Result<(), anyhow::Error> {
478478
/// such as determining whether data is stale or calculating the approximate boot time.
479479
fn get_uptime() -> Duration {
480480
let mut system = System::new();
481-
system.refresh_system();
481+
system.refresh_memory();
482+
system.refresh_cpu_usage();
482483

483-
let uptime_seconds = system.uptime();
484+
let uptime_seconds = System::uptime();
484485
Duration::from_secs(uptime_seconds)
485486
}
486487

@@ -505,14 +506,13 @@ mod tests {
505506
#[instrument]
506507
async fn mock_provision() -> Result<(), anyhow::Error> {
507508
let mut system = System::new();
508-
system.refresh_system();
509+
system.refresh_memory();
510+
system.refresh_cpu_usage();
509511

510-
let kernel_version = system
511-
.kernel_version()
512+
let kernel_version = System::kernel_version()
512513
.unwrap_or("Unknown Kernel Version".to_string());
513-
let os_version = system
514-
.os_version()
515-
.unwrap_or("Unknown OS Version".to_string());
514+
let os_version =
515+
System::os_version().unwrap_or("Unknown OS Version".to_string());
516516
let azure_init_version = env!("CARGO_PKG_VERSION");
517517

518518
event!(

src/main.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use libazureinit::{
1919
};
2020
use std::process::ExitCode;
2121
use std::time::Duration;
22-
use sysinfo::{System, SystemExt};
22+
use sysinfo::System;
2323
use tracing::instrument;
2424

2525
// These should be set during the build process
@@ -136,13 +136,10 @@ async fn main() -> ExitCode {
136136

137137
#[instrument(name = "root", skip_all)]
138138
async fn provision(config: Config, opts: Cli) -> Result<(), anyhow::Error> {
139-
let system = System::new();
140-
let kernel_version = system
141-
.kernel_version()
139+
let kernel_version = System::kernel_version()
142140
.unwrap_or("Unknown Kernel Version".to_string());
143-
let os_version = system
144-
.os_version()
145-
.unwrap_or("Unknown OS Version".to_string());
141+
let os_version =
142+
System::os_version().unwrap_or("Unknown OS Version".to_string());
146143

147144
tracing::info!(
148145
"Kernel Version: {}, OS Version: {}, Azure-Init Version: {}",

0 commit comments

Comments
 (0)