overwork labels

Author: aawsome

src/commands/backup.rs

@@ -343,8 +343,22 @@ impl BackupCmd {
 
         #[cfg(feature = "prometheus")]
         if config.global.is_prometheus_configured() {
-            if let Err(err) = publish_metrics(&snap, self.prometheus_job, self.prometheus_labels) {
-                warn!("error pushing prometheus metrics: {err}");
+            #[cfg(feature = "prometheus")]
+            {
+                // Merge global prometheus labels
+                conflate::btreemap::append_or_ignore(
+                    &mut self.prometheus_labels,
+                    config.global.prometheus_labels.clone(),
+                );
+                if let Err(err) =
+                    publish_metrics(&snap, self.prometheus_job, self.prometheus_labels)
+                {
+                    warn!("error pushing prometheus metrics: {err}");
+                }
+            }
+            #[cfg(not(feature = "prometheus"))]
+            {
+                warn!("not pushing prometheus metrics - this rustic version is compiled without prometheus support");
             }
         }
 
@@ -357,7 +371,7 @@ impl BackupCmd {
 fn publish_metrics(
     snap: &SnapshotFile,
     job_name: Option<String>,
-    extra_labels: BTreeMap<String, String>,
+    mut labels: BTreeMap<String, String>,
 ) -> Result<()> {
     use prometheus::register_gauge;
 
@@ -498,12 +512,18 @@ fn publish_metrics(
     .context("registering prometheus gauge")?;
     metric_total_duration.set(summary.total_duration);
 
-    let mut labels = Vec::new();
-    labels.push(("paths".to_owned(), format!("{}", snap.paths)));
-    labels.push(("hostname".to_owned(), snap.hostname.clone()));
-    labels.push(("snapshot_label".to_string(), snap.label.clone()));
-    labels.push(("tags".to_string(), format!("{}", snap.tags)));
-    labels.extend(extra_labels);
+    _ = labels
+        .entry("paths".to_string())
+        .or_insert_with(|| format!("{}", snap.paths));
+    _ = labels
+        .entry("hostname".to_owned())
+        .or_insert_with(|| snap.hostname.clone());
+    _ = labels
+        .entry("snapshot_label".to_string())
+        .or_insert_with(|| snap.label.clone());
+    _ = labels
+        .entry("tags".to_string())
+        .or_insert_with(|| format!("{}", snap.tags));
 
     let job_name = job_name.as_deref().unwrap_or("rustic_backup");
     RUSTIC_APP.config().global.push_metrics(job_name, labels)

src/config.rs

@@ -213,7 +213,7 @@ pub struct GlobalOptions {
     /// Additional labels to set to generated Prometheus metrics
     #[clap(skip)]
     #[merge(strategy=conflate::btreemap::append_or_ignore)]
-    prometheus_labels: BTreeMap<String, String>,
+    pub prometheus_labels: BTreeMap<String, String>,
 }
 
 pub fn parse_labels(s: &str) -> Result<BTreeMap<String, String>> {
@@ -237,7 +237,7 @@ impl GlobalOptions {
         self.prometheus.is_some()
     }
 
-    pub fn push_metrics(&self, job_name: &str, extra_labels: Vec<(String, String)>) -> Result<()> {
+    pub fn push_metrics(&self, job_name: &str, labels: BTreeMap<String, String>) -> Result<()> {
         use prometheus::{Encoder, ProtobufEncoder};
         use reqwest::{blocking::Client, header::CONTENT_TYPE, StatusCode};
 
@@ -246,14 +246,6 @@ impl GlobalOptions {
             return Ok(());
         };
 
-        // Merge labels and extra labels
-        let labels = self
-            .prometheus_labels
-            .iter()
-            .map(|x| (x.0.as_str(), x.1.as_str()))
-            .chain(extra_labels.iter().map(|(a, b)| (a.as_str(), b.as_str())))
-            .collect();
-
         let (full_url, encoded_metrics) = make_url_and_encoded_metrics(url, job_name, labels)?;
         debug!("using url: {full_url}");
 
@@ -289,7 +281,7 @@ impl GlobalOptions {
 fn make_url_and_encoded_metrics(
     url: &Url,
     job: &str,
-    grouping: BTreeMap<&str, &str>,
+    grouping: BTreeMap<String, String>,
 ) -> Result<(Url, Vec<u8>)> {
     use base64::prelude::*;
     use prometheus::{Encoder, ProtobufEncoder};
@@ -441,6 +433,7 @@ mod tests {
             ("nogroup", ""),
         ]
         .into_iter()
+        .map(|(a, b)| (a.to_string(), b.to_string()))
         .collect();
         let (url, _) =
             make_url_and_encoded_metrics(&Url::from_str("http://host")?, "test_job", grouping)?;