Advertise node software version in gossip (solana-labs#9981)

* Advertise node version in gossip * Remove solana_clap_utils::version! macro
davpal71 · May 11, 2020 · 2521f75 · 2521f75
1 parent 965204b
commit 2521f75
Show file tree

Hide file tree

Showing 50 changed files with 223 additions and 66 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -59,6 +59,7 @@ members = [
     "transaction-status",
     "upload-perf",
     "net-utils",
+    "version",
     "vote-signer",
     "cli",
     "rayon-threadlimit",

diff --git a/archiver/Cargo.toml b/archiver/Cargo.toml
@@ -17,7 +17,7 @@ solana-metrics = { path = "../metrics", version = "1.2.0" }
 solana-archiver-lib = { path = "../archiver-lib", version = "1.2.0" }
 solana-net-utils = { path = "../net-utils", version = "1.2.0" }
 solana-sdk = { path = "../sdk", version = "1.2.0" }
-
+solana-version = { path = "../version", version = "1.2.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/archiver/src/main.rs b/archiver/src/main.rs
@@ -24,7 +24,7 @@ fn main() {
 
     let matches = App::new(crate_name!())
         .about(crate_description!())
-        .version(solana_clap_utils::version!())
+        .version(solana_version::version!())
         .arg(
             Arg::with_name("identity_keypair")
                 .short("i")
@@ -105,7 +105,7 @@ fn main() {
     println!(
         "{} version {} (branch={}, commit={})",
         style(crate_name!()).bold(),
-        solana_clap_utils::version!(),
+        solana_version::version!(),
         option_env!("CI_BRANCH").unwrap_or("unknown"),
         option_env!("CI_COMMIT").unwrap_or("unknown")
     );

diff --git a/bench-exchange/Cargo.toml b/bench-exchange/Cargo.toml
@@ -29,6 +29,7 @@ solana-metrics = { path = "../metrics", version = "1.2.0" }
 solana-net-utils = { path = "../net-utils", version = "1.2.0" }
 solana-runtime = { path = "../runtime", version = "1.2.0" }
 solana-sdk = { path = "../sdk", version = "1.2.0" }
+solana-version = { path = "../version", version = "1.2.0" }
 
 [dev-dependencies]
 solana-local-cluster = { path = "../local-cluster", version = "1.2.0" }

diff --git a/bench-exchange/src/main.rs b/bench-exchange/src/main.rs
@@ -11,7 +11,7 @@ fn main() {
     solana_logger::setup();
     solana_metrics::set_panic_hook("bench-exchange");
 
-    let matches = cli::build_args(solana_clap_utils::version!()).get_matches();
+    let matches = cli::build_args(solana_version::version!()).get_matches();
     let cli_config = cli::extract_args(&matches);
 
     let cli::Config {

diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml
@@ -13,6 +13,7 @@ solana-clap-utils = { path = "../clap-utils", version = "1.2.0" }
 solana-streamer = { path = "../streamer", version = "1.2.0" }
 solana-logger = { path = "../logger", version = "1.2.0" }
 solana-net-utils = { path = "../net-utils", version = "1.2.0" }
+solana-version = { path = "../version", version = "1.2.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/bench-streamer/src/main.rs b/bench-streamer/src/main.rs
@@ -52,7 +52,7 @@ fn main() -> Result<()> {
 
     let matches = App::new(crate_name!())
         .about(crate_description!())
-        .version(solana_clap_utils::version!())
+        .version(solana_version::version!())
         .arg(
             Arg::with_name("num-recv-sockets")
                 .long("num-recv-sockets")

diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
@@ -27,6 +27,7 @@ solana-net-utils = { path = "../net-utils", version = "1.2.0" }
 solana-runtime = { path = "../runtime", version = "1.2.0" }
 solana-sdk = { path = "../sdk", version = "1.2.0" }
 solana-move-loader-program = { path = "../programs/move_loader", version = "1.2.0", optional = true }
+solana-version = { path = "../version", version = "1.2.0" }
 
 [dev-dependencies]
 serial_test = "0.4.0"

diff --git a/bench-tps/src/main.rs b/bench-tps/src/main.rs
@@ -15,7 +15,7 @@ fn main() {
     solana_logger::setup_with_default("solana=info");
     solana_metrics::set_panic_hook("bench-tps");
 
-    let matches = cli::build_args(solana_clap_utils::version!()).get_matches();
+    let matches = cli::build_args(solana_version::version!()).get_matches();
     let cli_config = cli::extract_args(&matches);
 
     let cli::Config {

diff --git a/clap-utils/src/lib.rs b/clap-utils/src/lib.rs
@@ -1,24 +1,5 @@
 use thiserror::Error;
 
-#[macro_export]
-macro_rules! version {
-    () => {
-        &*format!(
-            "{}{}",
-            env!("CARGO_PKG_VERSION"),
-            if option_env!("CI_TAG").unwrap_or("").is_empty() {
-                format!(
-                    " [channel={} commit={}]",
-                    option_env!("CHANNEL").unwrap_or("unknown"),
-                    option_env!("CI_COMMIT").unwrap_or("unknown"),
-                )
-            } else {
-                "".to_string()
-            },
-        )
-    };
-}
-
 pub struct ArgConstant<'a> {
     pub long: &'a str,
     pub name: &'a str,

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -41,6 +41,7 @@ solana-sdk = { path = "../sdk", version = "1.2.0" }
 solana-stake-program = { path = "../programs/stake", version = "1.2.0" }
 solana-storage-program = { path = "../programs/storage", version = "1.2.0" }
 solana-transaction-status = { path = "../transaction-status", version = "1.2.0" }
+solana-version = { path = "../version", version = "1.2.0" }
 solana-vote-program = { path = "../programs/vote", version = "1.2.0" }
 solana-vote-signer = { path = "../vote-signer", version = "1.2.0" }
 thiserror = "1.0.15"

diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -156,7 +156,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
     let matches = app(
         crate_name!(),
         crate_description!(),
-        solana_clap_utils::version!(),
+        solana_version::version!(),
     )
     .arg({
         let arg = Arg::with_name("config_file")

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -61,6 +61,7 @@ solana-sdk = { path = "../sdk", version = "1.2.0" }
 solana-stake-program = { path = "../programs/stake", version = "1.2.0" }
 solana-storage-program = { path = "../programs/storage", version = "1.2.0" }
 solana-streamer = { path = "../streamer", version = "1.2.0" }
+solana-version = { path = "../version", version = "1.2.0" }
 solana-vote-program = { path = "../programs/vote", version = "1.2.0" }
 solana-vote-signer = { path = "../vote-signer", version = "1.2.0" }
 solana-sys-tuner = { path = "../sys-tuner", version = "1.2.0" }