Compare commits

...

2 Commits

Author SHA1 Message Date
Jon Häggblad c87410dbdd Fix variable name 2024-09-23 16:02:54 +02:00
Jon Häggblad ed8c700d00 Extendd UserAgent with system information collected at runtime 2024-09-23 11:08:49 +02:00
+6 -2
View File
@@ -10,6 +10,7 @@ use nym_bin_common::build_information::{BinaryBuildInformation, BinaryBuildInfor
pub struct UserAgent {
pub application: String,
pub version: String,
pub system: Option<String>,
pub platform: String,
pub git_commit: String,
}
@@ -17,10 +18,11 @@ pub struct UserAgent {
impl fmt::Display for UserAgent {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let abbreviated_commit = self.git_commit.chars().take(7).collect::<String>();
let system = self.system.clone().unwrap_or_else(|| "unknown".to_string());
write!(
f,
"{}/{}/{}/{}",
self.application, self.version, self.platform, abbreviated_commit
"{}/{}/{}/{}/{}",
self.application, self.version, system, self.platform, abbreviated_commit
)
}
}
@@ -38,6 +40,7 @@ impl From<BinaryBuildInformation> for UserAgent {
UserAgent {
application: build_info.binary_name.to_string(),
version: build_info.build_version.to_string(),
system: None,
platform: build_info.cargo_triple.to_string(),
git_commit: build_info.commit_sha.to_string(),
}
@@ -49,6 +52,7 @@ impl From<BinaryBuildInformationOwned> for UserAgent {
UserAgent {
application: build_info.binary_name,
version: build_info.build_version,
system: None,
platform: build_info.cargo_triple,
git_commit: build_info.commit_sha,
}