From a206f2570d0e5d4ce6688c219ea65a1c7d1119d6 Mon Sep 17 00:00:00 2001 From: Stephen Akridge Date: Fri, 10 Aug 2018 15:59:41 -0700 Subject: [PATCH] Add hostname to metrics on panic --- Cargo.toml | 1 + src/bin/fullnode.rs | 1 - src/lib.rs | 1 + src/metrics.rs | 7 +++++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a545d5825d..ef466d5713 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,6 +89,7 @@ sha2 = "0.7.0" serde = "1.0.27" serde_derive = "1.0.27" serde_json = "1.0.10" +sys-info = "0.5.6" tokio = "0.1" tokio-codec = "0.1" tokio-core = "0.1.17" diff --git a/src/bin/fullnode.rs b/src/bin/fullnode.rs index 434baab116..e5aef2d6f8 100644 --- a/src/bin/fullnode.rs +++ b/src/bin/fullnode.rs @@ -18,7 +18,6 @@ use solana::wallet::request_airdrop; use std::fs::File; use std::net::{IpAddr, Ipv4Addr, SocketAddr}; use std::process::exit; -//use std::time::Duration; fn main() -> () { logger::setup(); diff --git a/src/lib.rs b/src/lib.rs index f81ce846c4..554159f7fb 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -72,6 +72,7 @@ extern crate serde_derive; extern crate pnet_datalink; extern crate serde_json; extern crate sha2; +extern crate sys_info; extern crate untrusted; #[cfg(test)] diff --git a/src/metrics.rs b/src/metrics.rs index b750fd1969..21beceb3a1 100644 --- a/src/metrics.rs +++ b/src/metrics.rs @@ -6,6 +6,7 @@ use std::sync::mpsc::{channel, Receiver, RecvTimeoutError, Sender}; use std::sync::{Arc, Barrier, Mutex, Once, ONCE_INIT}; use std::thread; use std::time::{Duration, Instant}; +use sys_info::hostname; use timing; #[derive(Debug)] @@ -219,6 +220,12 @@ pub fn set_panic_hook(program: &'static str) { None => "?".to_string(), }), ) + .add_field( + "host", + influxdb::Value::String( + hostname().unwrap_or_else(|_| "?".to_string()) + ), + ) .to_owned(), ); // Flush metrics immediately in case the process exits immediately