consistency between impls

Signed-off-by: clux <[email protected]>

src/controller.rs

@@ -60,7 +60,7 @@ pub struct Context {
 async fn reconcile(doc: Arc<Document>, ctx: Arc<Context>) -> Result<Action> {
     let trace_id = telemetry::get_trace_id();
     Span::current().record("trace_id", &field::display(&trace_id));
-    let _timer = ctx.metrics.app.reconciler.count_and_measure();
+    let _timer = ctx.metrics.app.reconcile.count_and_measure();
     ctx.diagnostics.write().await.last_event = Utc::now();
     let ns = doc.namespace().unwrap(); // doc is namespace scoped
     let docs: Api<Document> = Api::namespaced(ctx.client.clone(), &ns);
@@ -78,7 +78,7 @@ async fn reconcile(doc: Arc<Document>, ctx: Arc<Context>) -> Result<Action> {
 
 fn error_policy(doc: Arc<Document>, error: &Error, ctx: Arc<Context>) -> Action {
     warn!("reconcile failed: {:?}", error);
-    ctx.metrics.app.reconciler.set_failure(&doc, error);
+    ctx.metrics.app.reconcile.set_failure(&doc, error);
     Action::requeue(Duration::from_secs(5 * 60))
 }
 
@@ -270,7 +270,7 @@ mod test {
         assert!(err.to_string().contains("IllegalDocument"));
         // calling error policy with the reconciler error should cause the correct metric to be set
         error_policy(doc.clone(), &err, testctx.clone());
-        let metrics = &testctx.metrics.app.reconciler;
+        let metrics = &testctx.metrics.app.reconcile;
         let failures = metrics.get_failures("illegal", "finalizererror(applyfailed(illegaldocument))");
         assert_eq!(failures, 1);
     }

src/metrics.rs

@@ -17,21 +17,18 @@ pub struct Metrics {
 /// All metrics
 #[derive(MetricGroup, Default)]
 pub struct AppMetrics {
-    #[metric(namespace = "doc_ctrl")]
-    pub reconciler: ReconcilerMetrics,
+    #[metric(namespace = "doc_ctrl_reconcile")]
+    pub reconcile: ReconcileMetrics,
 }
 
 /// Metrics related to the reconciler
 #[derive(MetricGroup)]
 #[metric(new())]
-pub struct ReconcilerMetrics {
-    /// reconciliations
-    pub reconciliations: Counter,
-    /// reconciliation errors
+pub struct ReconcileMetrics {
+    pub runs: Counter,
     pub failures: CounterVec<ErrorLabelSet>,
-    /// duration of reconcile to complete in seconds
-    #[metric(metadata = Thresholds::with_buckets([0.01, 0.1, 0.25, 0.5, 1., 5., 15., 60.]))]
-    pub reconcile_duration: Histogram<8>,
+    #[metric(metadata = Thresholds::with_buckets([0.01, 0.1, 0.25, 0.5, 1., 5., 15., 60.]), rename = "duration_seconds")]
+    pub duration: Histogram<8>,
 }
 
 #[derive(LabelGroup)]
@@ -43,13 +40,13 @@ pub struct ErrorLabels<'a> {
     error: &'a str,
 }
 
-impl Default for ReconcilerMetrics {
+impl Default for ReconcileMetrics {
     fn default() -> Self {
-        ReconcilerMetrics::new()
+        ReconcileMetrics::new()
     }
 }
 
-impl ReconcilerMetrics {
+impl ReconcileMetrics {
     pub fn set_failure(&self, doc: &Document, e: &Error) {
         self.failures.inc(ErrorLabels {
             instance: doc.name_any().as_ref(),
@@ -58,8 +55,8 @@ impl ReconcilerMetrics {
     }
 
     pub fn count_and_measure(&self) -> HistogramTimer<'_, 8> {
-        self.reconciliations.inc();
-        self.reconcile_duration.start_timer()
+        self.runs.inc();
+        self.duration.start_timer()
     }
 
     #[cfg(test)]