controller: properly record object metrics

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
fluxcd · Nov 3, 2023 · 63e428a · 63e428a
1 parent 3f9ed3b
commit 63e428a
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/internal/controller/helmrelease_controller.go b/internal/controller/helmrelease_controller.go
@@ -151,13 +151,6 @@ func (r *HelmReleaseReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
-	defer func() {
-		// Always record metrics.
-		r.Metrics.RecordSuspend(ctx, obj, obj.Spec.Suspend)
-		r.Metrics.RecordReadiness(ctx, obj)
-		r.Metrics.RecordDuration(ctx, obj, start)
-	}()
-
 	// Initialize the patch helper with the current version of the object.
 	patchHelper := patch.NewSerialPatcher(obj, r.Client)
 
@@ -180,9 +173,10 @@ func (r *HelmReleaseReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 			}
 		}
 
-		// Always record readiness and duration metrics.
-		defer r.Metrics.RecordDuration(ctx, obj, start)
-		defer r.Metrics.RecordReadiness(ctx, obj)
+		// Always record suspend, readiness and duration metrics.
+		r.Metrics.RecordSuspend(ctx, obj, obj.Spec.Suspend)
+		r.Metrics.RecordReadiness(ctx, obj)
+		r.Metrics.RecordDuration(ctx, obj, start)
 	}()
 
 	// Examine if the object is under deletion.