From 70752d61c24b98f0f495bf12394c69e5cee3d67c Mon Sep 17 00:00:00 2001 From: Jeff Biseda Date: Sat, 18 Dec 2021 00:13:16 -0800 Subject: [PATCH 1/2] new net-stats require a new table (#21996) (cherry picked from commit 3fe942ab301912b6c02caf04465d8e4f4535004a) # Conflicts: # core/src/system_monitor_service.rs --- core/src/system_monitor_service.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/system_monitor_service.rs b/core/src/system_monitor_service.rs index d7c9066329cd2d..1bec37a629afb4 100644 --- a/core/src/system_monitor_service.rs +++ b/core/src/system_monitor_service.rs @@ -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")] @@ -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, From e6f1e7c90f12ddff20babe26644b8a765f8d5d0c Mon Sep 17 00:00:00 2001 From: Jeff Biseda Date: Sat, 18 Dec 2021 00:36:47 -0800 Subject: [PATCH 2/2] merge --- core/src/system_monitor_service.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/core/src/system_monitor_service.rs b/core/src/system_monitor_service.rs index 1bec37a629afb4..93f5461fba2435 100644 --- a/core/src/system_monitor_service.rs +++ b/core/src/system_monitor_service.rs @@ -11,13 +11,7 @@ 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 SAMPLE_INTERVAL: Duration = Duration::from_secs(2); const SLEEP_INTERVAL: Duration = Duration::from_millis(500); #[cfg(target_os = "linux")]