Export gossip with macro

core/src/validator.rs

@@ -173,6 +173,7 @@ pub struct ValidatorConfig {
     pub wait_to_vote_slot: Option<Slot>,
     pub ledger_column_options: LedgerColumnOptions,
     pub enable_quic_servers: bool,
+    pub vote_accounts_to_monitor: Arc<HashSet<Pubkey>>,
 }
 
 impl Default for ValidatorConfig {
@@ -237,6 +238,7 @@ impl Default for ValidatorConfig {
             wait_to_vote_slot: None,
             ledger_column_options: LedgerColumnOptions::default(),
             enable_quic_servers: true,
+            vote_accounts_to_monitor: Arc::new(HashSet::new()),
         }
     }
 }
@@ -736,6 +738,7 @@ impl Validator {
                     leader_schedule_cache.clone(),
                     connection_cache.clone(),
                     max_complete_transaction_status_slot,
+                    config.vote_accounts_to_monitor.clone(),
                 )),
                 if !config.rpc_config.full_api {
                     None

gossip/Cargo.toml

@@ -46,6 +46,8 @@ solana-streamer = { path = "../streamer", version = "=1.10.32" }
 solana-version = { path = "../version", version = "=1.10.32" }
 solana-vote-program = { path = "../programs/vote", version = "=1.10.32" }
 thiserror = "1.0"
+solana-prometheus-macro = { path = "../prometheus/macros", version = "=1.0.0" }
+solana-prometheus-utils = { path = "../prometheus/utils", version = "=1.0.0" }
 
 [dev-dependencies]
 num_cpus = "1.13.1"

gossip/src/cluster_info.rs

@@ -160,7 +160,7 @@ pub struct ClusterInfo {
     outbound_budget: DataBudget,
     my_contact_info: RwLock<ContactInfo>,
     ping_cache: Mutex<PingCache>,
-    stats: GossipStats,
+    pub stats: GossipStats,
     socket: UdpSocket,
     local_message_pending_push_queue: Mutex<Vec<CrdsValue>>,
     contact_debug_interval: u64, // milliseconds, 0 = disabled
@@ -2527,8 +2527,8 @@ impl ClusterInfo {
             should_check_duplicate_instance,
         )?;
         if last_print.elapsed() > SUBMIT_GOSSIP_STATS_INTERVAL {
-            submit_gossip_stats(&self.stats, &self.gossip, &stakes);
-            *last_print = Instant::now();
+            // submit_gossip_stats(&self.stats, &self.gossip, &stakes);
+            // *last_print = Instant::now();
         }
         Ok(())
     }

gossip/src/cluster_info_metrics.rs

@@ -1,3 +1,5 @@
+use solana_prometheus_macro::ExportPrometheus;
+
 use {
     crate::crds_gossip::CrdsGossip,
     itertools::Itertools,
@@ -87,7 +89,7 @@ impl<'a, T> Drop for TimedGuard<'a, T> {
     }
 }
 
-#[derive(Default)]
+#[derive(Default, ExportPrometheus)]
 pub struct GossipStats {
     pub(crate) all_tvu_peers: Counter,
     pub(crate) bad_prune_destination: Counter,

local-cluster/src/validator_configs.rs

@@ -66,6 +66,7 @@ pub fn safe_clone_config(config: &ValidatorConfig) -> ValidatorConfig {
         wait_to_vote_slot: config.wait_to_vote_slot,
         ledger_column_options: config.ledger_column_options.clone(),
         enable_quic_servers: config.enable_quic_servers,
+        vote_accounts_to_monitor: config.vote_accounts_to_monitor.clone(),
     }
 }
 

prometheus/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "solana-prometheus"
+version = "1.10.28"
+description = "Solana Prometheus"
+authors = ["ChorusOne <[email protected]>"]
+repository = "https://github.com/ChorusOne/solana"
+license = "Apache-2.0"
+edition = "2021"
+
+[dependencies]
+jsonrpc-http-server = "18.0.0"
+solana-gossip = { path = "../gossip" }
+solana-runtime = { path = "../runtime" }
+solana-sdk = { path = "../sdk" }
+solana-vote-program = { path = "../programs/vote" }
+solana-prometheus-utils = { path = "utils" }
+
+[lib]
+crate-type = ["lib"]
+name = "solana_prometheus"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]

prometheus/macros/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "solana-prometheus-macro"
+version = "1.0.0"
+description = "Solana Prometheus"
+authors = ["ChorusOne <[email protected]>"]
+repository = "https://github.com/ChorusOne/solana"
+license = "Apache-2.0"
+edition = "2021"
+
+
+[lib]
+proc-macro = true
+
+[dependencies]
+bs58 = "0.4.0"
+proc-macro2 = "1.0.19"
+quote = "1.0"
+syn = { version = "1.0", features = ["full", "extra-traits"] }
+rustversion = "1.0.3"
+solana-prometheus-utils = { path = "../utils" }
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]

prometheus/macros/src/lib.rs

@@ -0,0 +1,45 @@
+extern crate proc_macro2;
+
+use proc_macro::TokenStream;
+#[macro_use]
+extern crate quote;
+
+#[proc_macro_derive(ExportPrometheus)]
+pub fn derive_field_count(input: TokenStream) -> TokenStream {
+    // Parse the input tokens into a syntax tree
+    let ast = syn::parse(input).unwrap();
+    parse(&ast)
+}
+
+fn parse(ast: &syn::DeriveInput) -> TokenStream {
+    let name = &ast.ident;
+    let data = &ast.data;
+
+    let idents: Vec<_> = match data {
+        syn::Data::Struct(struct_data) => struct_data
+            .fields
+            .iter()
+            .filter_map(|field| field.ident.as_ref().map(|ident| ident))
+            .collect(),
+        _ => panic!("Should be derived from struct"),
+    };
+
+    let expanded = quote! {
+        impl #name {
+            pub fn write_prometheus<W: std::io::Write>(&self, out: &mut W) -> std::io::Result<()> {
+                use core::sync::atomic::Ordering;
+                #(solana_prometheus_utils::write_metric(
+                    out,
+                    &solana_prometheus_utils::MetricFamily {
+                        name: &format!("solana_gossip_{}", stringify!(#idents)),
+                        help: "Auto generated with Prometheus macro",
+                        type_: "counter",
+                        metrics: vec![solana_prometheus_utils::Metric::new(self.#idents.0.load(Ordering::Relaxed))],
+                    },
+                )?;)*
+                Ok(())
+            }
+        }
+    };
+    expanded.into()
+}

prometheus/src/bank_metrics.rs

@@ -0,0 +1,83 @@
+use crate::banks_with_commitments::BanksWithCommitments;
+use solana_prometheus_utils::{write_metric, Metric, MetricFamily};
+use solana_sdk::sysvar;
+use solana_sdk::sysvar::epoch_schedule::EpochSchedule;
+use std::io;
+
+pub fn write_bank_metrics<W: io::Write>(
+    banks_with_commitments: &BanksWithCommitments,
+    out: &mut W,
+) -> io::Result<()> {
+    write_metric(
+        out,
+        &MetricFamily {
+            name: "solana_block_slot",
+            help: "Block Slot",
+            type_: "gauge",
+            metrics: banks_with_commitments
+                .for_each_commitment(|bank| Some(Metric::new(bank.clock().slot))),
+        },
+    )?;
+    write_metric(
+        out,
+        &MetricFamily {
+            name: "solana_block_epoch",
+            help: "Block Epoch",
+            type_: "gauge",
+            metrics: banks_with_commitments
+                .for_each_commitment(|bank| Some(Metric::new(bank.clock().epoch))),
+        },
+    )?;
+    write_metric(
+        out,
+        &MetricFamily {
+            name: "solana_block_epoch_start_slot",
+            help: "The first slot in the current epoch",
+            type_: "gauge",
+            metrics: banks_with_commitments
+                .for_each_commitment(|bank| {
+                    // Note, the bank actually has a field that holds the EpochSchedule,
+                    // but it is not public, so we can't easily access it  here. We could
+                    // make it public, but to make our patches less invasive, load the
+                    // epoch schedule from the sysvar instead. It should always exist.
+                    let epoch_schedule: EpochSchedule = bank
+                        .get_account(&sysvar::epoch_schedule::id())?
+                        .deserialize_data().ok()?;
+                    let clock = bank.clock();
+                    Some(Metric::new(epoch_schedule.get_first_slot_in_epoch(clock.epoch)))
+                }),
+        },
+    )?;
+    write_metric(
+        out,
+        &MetricFamily {
+            name: "solana_block_epoch_slots_total",
+            help: "The duration of the current epoch, in slots.",
+            type_: "gauge",
+            metrics: banks_with_commitments
+                .for_each_commitment(|bank| {
+                    // Note, the bank actually has a field that holds the EpochSchedule,
+                    // but it is not public, so we can't easily access it  here. We could
+                    // make it public, but to make our patches less invasive, load the
+                    // epoch schedule from the sysvar instead. It should always exist.
+                    let epoch_schedule: EpochSchedule = bank
+                        .get_account(&sysvar::epoch_schedule::id())?
+                        .deserialize_data().ok()?;
+                    let clock = bank.clock();
+                    Some(Metric::new(epoch_schedule.get_slots_in_epoch(clock.epoch)))
+                }),
+        },
+    )?;
+    write_metric(
+        out,
+        &MetricFamily {
+            name: "solana_block_timestamp_seconds",
+            help: "The block's UNIX timestamp, in seconds since epoch, UTC",
+            type_: "gauge",
+            metrics: banks_with_commitments
+                .for_each_commitment(|bank| Some(Metric::new(bank.clock().unix_timestamp as u64))),
+        },
+    )?;
+
+    Ok(())
+}