Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix exposing version as a metric #1009

Merged
merged 1 commit into from
Feb 4, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions utils/compile-time-utils/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use git_version::git_version;
use metrics::value;
use metrics::gauge;
use semver::Version;

/// Returns latest tag (via `git describe --tag --abbrev=0`) or version from Cargo.toml`.
Expand All @@ -25,7 +25,7 @@ pub fn build_number_str() -> Option<&'static str> {
option_env!("GITHUB_RUN_NUMBER")
}

pub fn build_number() -> Option<u64> {
pub fn build_number() -> Option<i64> {
build_number_str().map(|s| s.parse().ok()).flatten()
}

Expand All @@ -50,15 +50,15 @@ pub fn semver() -> std::result::Result<Version, semver::SemVerError> {

pub fn report_version_to_metrics() {
if let Ok(version) = semver() {
value!("yagna.version.major", version.major);
value!("yagna.version.minor", version.minor);
value!("yagna.version.patch", version.patch);
value!(
gauge!("yagna.version.major", version.major as i64);
gauge!("yagna.version.minor", version.minor as i64);
gauge!("yagna.version.patch", version.patch as i64);
gauge!(
"yagna.version.is_prerelease",
(!version.pre.is_empty()) as u64
(!version.pre.is_empty()) as i64
);
if let Some(build_number) = build_number() {
value!("yagna.version.build_number", build_number);
gauge!("yagna.version.build_number", build_number);
}
}
}
Expand Down