From 3a6945964595ddb4bebf31217e239e355da23c25 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 22 Jul 2019 16:08:21 -0700
Subject: [PATCH] Surface validator pubkey in metrics (#5227)

---
 metrics/src/metrics.rs     | 25 ++++++++-----------------
 multinode-demo/fullnode.sh |  1 +
 net/remote/remote-node.sh  |  1 -
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/metrics/src/metrics.rs b/metrics/src/metrics.rs
index 73b5f10f65..e3631893cd 100644
--- a/metrics/src/metrics.rs
+++ b/metrics/src/metrics.rs
@@ -125,20 +125,11 @@ macro_rules! datapoint_debug {
 }
 
 lazy_static! {
-    static ref HOST_INFO: String = {
-        let v = env::var("SOLANA_METRICS_DISPLAY_HOSTNAME")
-            .map(|x| {
-                x.parse()
-                    .expect("Failed to parse SOLANA_METRICS_DISPLAY_HOSTNAME")
-            })
-            .unwrap_or(0);
-
-        let name: String = hostname().unwrap_or_else(|_| "".to_string());
-        if v == 0 {
-            hash(name.as_bytes()).to_string()
-        } else {
-            name
-        }
+    static ref HOST_ID: String = {
+        env::var("SOLANA_METRICS_HOST_ID").unwrap_or_else(|_| {
+            let hostname: String = hostname().unwrap_or_else(|_| "".to_string());
+            format!("host-{}", hash(hostname.as_bytes())).to_string()
+        })
     };
 }
 
@@ -254,7 +245,7 @@ impl MetricsAgent {
 
         let extra = influxdb::Point::new("metrics")
             .add_timestamp(timing::timestamp() as i64)
-            .add_field("host_id", influxdb::Value::String(HOST_INFO.to_string()))
+            .add_field("host_id", influxdb::Value::String(HOST_ID.to_string()))
             .add_field(
                 "points_written",
                 influxdb::Value::Integer(points_written as i64),
@@ -351,7 +342,7 @@ impl MetricsAgent {
     }
 
     pub fn submit(&self, mut point: influxdb::Point, level: log::Level) {
-        point.add_field("host_id", influxdb::Value::String(HOST_INFO.to_string()));
+        point.add_field("host_id", influxdb::Value::String(HOST_ID.to_string()));
         if point.timestamp.is_none() {
             point.timestamp = Some(timing::timestamp() as i64);
         }
@@ -461,7 +452,7 @@ pub fn set_panic_hook(program: &'static str) {
                             None => "?".to_string(),
                         }),
                     )
-                    .add_field("host_id", influxdb::Value::String(HOST_INFO.to_string()))
+                    .add_field("host_id", influxdb::Value::String(HOST_ID.to_string()))
                     .to_owned(),
                 Level::Error,
             );
diff --git a/multinode-demo/fullnode.sh b/multinode-demo/fullnode.sh
index 86605546f7..4055dbb394 100755
--- a/multinode-demo/fullnode.sh
+++ b/multinode-demo/fullnode.sh
@@ -361,6 +361,7 @@ else
 fi
 
 identity_pubkey=$($solana_keygen pubkey "$identity_keypair_path")
+export SOLANA_METRICS_HOST_ID="$identity_pubkey"
 
 if [[ $node_type != replicator ]]; then
   accounts_config_dir="$state_dir"/accounts
diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh
index ea8559fe03..d7bcb72845 100755
--- a/net/remote/remote-node.sh
+++ b/net/remote/remote-node.sh
@@ -81,7 +81,6 @@ case $deployMethod in
 local|tar)
   PATH="$HOME"/.cargo/bin:"$PATH"
   export USE_INSTALL=1
-  export SOLANA_METRICS_DISPLAY_HOSTNAME=1
 
   # Setup `/var/snap/solana/current` symlink so rsyncing the genesis
   # ledger works (reference: `net/scripts/install-rsync.sh`)