Merge branch 'main' into lx-perf-improvements

src/util/Cargo.toml

@@ -26,6 +26,7 @@ hex = "0.4"
 tracing = "0.1.30"
 rand = "0.8"
 sha2 = "0.10"
+git-version = "0.3.4"
 
 chrono = "0.4"
 rmp-serde = "0.15"
@@ -45,5 +46,6 @@ hyper = "0.14"
 
 opentelemetry = { version = "0.17", features = [ "rt-tokio", "metrics", "trace" ] }
 
+
 [features]
 k2v = []

src/util/lib.rs

@@ -15,3 +15,4 @@ pub mod persister;
 pub mod time;
 pub mod token_bucket;
 pub mod tranquilizer;
+pub mod version;

src/util/version.rs

@@ -0,0 +1,7 @@
+pub fn garage() -> &'static str {
+	option_env!("GIT_VERSION").unwrap_or(git_version::git_version!(
+		prefix = "git:",
+		cargo_prefix = "cargo:",
+		fallback = "unknown"
+	))
+}