Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: make system metric as f64 #2575

Open
wants to merge 1 commit into
base: rc-2024.12.1-hotfix3
Choose a base branch
from
Open

chore: make system metric as f64 #2575

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions ant-networking/src/metrics/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ pub mod service;
#[cfg(feature = "upnp")]
mod upnp;

use std::sync::atomic::AtomicU64;

use crate::MetricsRegistries;
use crate::{log_markers::Marker, target_arch::sleep};
use bad_node::{BadNodeMetrics, BadNodeMetricsMsg, TimeFrame};
Expand Down Expand Up @@ -62,8 +64,8 @@ pub(crate) struct NetworkMetricsRecorder {
shunned_by_old_close_group: Gauge,

// system info
process_memory_used_mb: Gauge,
process_cpu_usage_percentage: Gauge,
process_memory_used_mb: Gauge<f64, AtomicU64>,
process_cpu_usage_percentage: Gauge<f64, AtomicU64>,

// helpers
bad_nodes_notifier: tokio::sync::mpsc::Sender<BadNodeMetricsMsg>,
Expand Down Expand Up @@ -134,14 +136,14 @@ impl NetworkMetricsRecorder {
upnp_events.clone(),
);

let process_memory_used_mb = Gauge::default();
let process_memory_used_mb = Gauge::<f64, AtomicU64>::default();
sub_registry.register(
"process_memory_used_mb",
"Memory used by the process in MegaBytes",
process_memory_used_mb.clone(),
);

let process_cpu_usage_percentage = Gauge::default();
let process_cpu_usage_percentage = Gauge::<f64, AtomicU64>::default();
sub_registry.register(
"process_cpu_usage_percentage",
"The percentage of CPU used by the process. Value is from 0-100",
Expand Down Expand Up @@ -253,12 +255,14 @@ impl NetworkMetricsRecorder {
if let (Some(process), Some(core_count)) =
(system.process(pid), physical_core_count)
{
let mem_used = process.memory() / TO_MB;
let _ = process_memory_used_mb.set(mem_used as i64);

let mem_used =
((process.memory() as f64 / TO_MB as f64) * 10000.0).round() / 10000.0;
let _ = process_memory_used_mb.set(mem_used);
// divide by core_count to get value between 0-100
let cpu_usage = process.cpu_usage() / core_count as f32;
let _ = process_cpu_usage_percentage.set(cpu_usage as i64);
let cpu_usage = ((process.cpu_usage() as f64 / core_count as f64) * 10000.0)
.round()
/ 10000.0;
let _ = process_cpu_usage_percentage.set(cpu_usage);
}
sleep(UPDATE_INTERVAL).await;
}
Expand Down
Loading