Skip to content

Commit

Permalink
new net-stats require a new table (#21996)
Browse files Browse the repository at this point in the history
(cherry picked from commit 3fe942a)

# Conflicts:
#	core/src/system_monitor_service.rs
  • Loading branch information
jbiseda authored and mergify-bot committed Dec 18, 2021
1 parent 33cd3a1 commit 70752d6
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion core/src/system_monitor_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@ use std::{
#[cfg(target_os = "linux")]
use std::{fs::File, io::BufReader, path::Path};

<<<<<<< HEAD
const SAMPLE_INTERVAL: Duration = Duration::from_secs(60);
=======
const MS_PER_S: u64 = 1_000;
const SAMPLE_INTERVAL_UDP_MS: u64 = 2 * MS_PER_S;
const SAMPLE_INTERVAL_MEM_MS: u64 = MS_PER_S;
>>>>>>> 3fe942ab3 (new net-stats require a new table (#21996))
const SLEEP_INTERVAL: Duration = Duration::from_millis(500);

#[cfg(target_os = "linux")]
Expand Down Expand Up @@ -125,7 +131,7 @@ impl SystemMonitorService {
#[cfg(target_os = "linux")]
fn report_udp_stats(old_stats: &UdpStats, new_stats: &UdpStats) {
datapoint_info!(
"net-stats",
"net-stats-validator",
(
"in_datagrams_delta",
new_stats.in_datagrams - old_stats.in_datagrams,
Expand Down

0 comments on commit 70752d6

Please sign in to comment.