feat: Remove deprecated object metrics from controllers fluxcd/flux2#5083

hasithsen · hasithsen · commit 2b320409de06 · 2024-12-12T00:02:25.000+05:30
Signed-off-by: hasithsen &lt;sen.hasith@gmail.com&gt;
diff --git a/internal/controller/bucket_controller.go b/internal/controller/bucket_controller.go
@@ -212,9 +212,7 @@ func (r *BucketReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res
 		}
 		result, retErr = summarizeHelper.SummarizeAndPatch(ctx, obj, summarizeOpts...)
 
-		// Always record suspend, readiness and duration metrics.
-		r.Metrics.RecordSuspend(ctx, obj, obj.Spec.Suspend)
-		r.Metrics.RecordReadiness(ctx, obj)
+		// Always record duration metrics.
 		r.Metrics.RecordDuration(ctx, obj, start)
 	}()
 
diff --git a/internal/controller/gitrepository_controller.go b/internal/controller/gitrepository_controller.go
@@ -206,9 +206,7 @@ func (r *GitRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		}
 		result, retErr = summarizeHelper.SummarizeAndPatch(ctx, obj, summarizeOpts...)
 
-		// Always record suspend, readiness and duration metrics.
-		r.Metrics.RecordSuspend(ctx, obj, obj.Spec.Suspend)
-		r.Metrics.RecordReadiness(ctx, obj)
+		// Always record duration metrics.
 		r.Metrics.RecordDuration(ctx, obj, start)
 	}()
 
diff --git a/internal/controller/helmchart_controller.go b/internal/controller/helmchart_controller.go
@@ -237,9 +237,7 @@ func (r *HelmChartReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		}
 		result, retErr = summarizeHelper.SummarizeAndPatch(ctx, obj, summarizeOpts...)
 
-		// Always record suspend, readiness and duration metrics.
-		r.Metrics.RecordSuspend(ctx, obj, obj.Spec.Suspend)
-		r.Metrics.RecordReadiness(ctx, obj)
+		// Always record duration metrics.
 		r.Metrics.RecordDuration(ctx, obj, start)
 	}()
 
diff --git a/internal/controller/helmrepository_controller.go b/internal/controller/helmrepository_controller.go
@@ -191,9 +191,7 @@ func (r *HelmRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 		}
 		result, retErr = summarizeHelper.SummarizeAndPatch(ctx, obj, summarizeOpts...)
 
-		// Always record suspend, readiness and duration metrics.
-		r.Metrics.RecordSuspend(ctx, obj, obj.Spec.Suspend)
-		r.Metrics.RecordReadiness(ctx, obj)
+		// Always record duration metrics.
 		r.Metrics.RecordDuration(ctx, obj, start)
 	}()
 
diff --git a/internal/controller/ocirepository_controller.go b/internal/controller/ocirepository_controller.go
@@ -213,9 +213,7 @@ func (r *OCIRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		}
 		result, retErr = summarizeHelper.SummarizeAndPatch(ctx, obj, summarizeOpts...)
 
-		// Always record suspend, readiness and duration metrics.
-		r.Metrics.RecordSuspend(ctx, obj, obj.Spec.Suspend)
-		r.Metrics.RecordReadiness(ctx, obj)
+		// Always record duration metrics.
 		r.Metrics.RecordDuration(ctx, obj, start)
 	}()
 

Original file line number	Diff line number	Diff line change
`@@ -212,9 +212,7 @@ func (r *BucketReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res`
`212`	`212`	`}`
`213`	`213`	`result, retErr = summarizeHelper.SummarizeAndPatch(ctx, obj, summarizeOpts...)`
`214`	`214`
`215`		`- // Always record suspend, readiness and duration metrics.`
`216`		`- r.Metrics.RecordSuspend(ctx, obj, obj.Spec.Suspend)`
`217`		`- r.Metrics.RecordReadiness(ctx, obj)`
	`215`	`+ // Always record duration metrics.`
`218`	`216`	`r.Metrics.RecordDuration(ctx, obj, start)`
`219`	`217`	`}()`
`220`	`218`
Original file line number	Diff line number	Diff line change
`@@ -206,9 +206,7 @@ func (r *GitRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Reques`
`206`	`206`	`}`
`207`	`207`	`result, retErr = summarizeHelper.SummarizeAndPatch(ctx, obj, summarizeOpts...)`
`208`	`208`
`209`		`- // Always record suspend, readiness and duration metrics.`
`210`		`- r.Metrics.RecordSuspend(ctx, obj, obj.Spec.Suspend)`
`211`		`- r.Metrics.RecordReadiness(ctx, obj)`
	`209`	`+ // Always record duration metrics.`
`212`	`210`	`r.Metrics.RecordDuration(ctx, obj, start)`
`213`	`211`	`}()`
`214`	`212`
Original file line number	Diff line number	Diff line change
`@@ -237,9 +237,7 @@ func (r *HelmChartReconciler) Reconcile(ctx context.Context, req ctrl.Request) (`
`237`	`237`	`}`
`238`	`238`	`result, retErr = summarizeHelper.SummarizeAndPatch(ctx, obj, summarizeOpts...)`
`239`	`239`
`240`		`- // Always record suspend, readiness and duration metrics.`
`241`		`- r.Metrics.RecordSuspend(ctx, obj, obj.Spec.Suspend)`
`242`		`- r.Metrics.RecordReadiness(ctx, obj)`
	`240`	`+ // Always record duration metrics.`
`243`	`241`	`r.Metrics.RecordDuration(ctx, obj, start)`
`244`	`242`	`}()`
`245`	`243`
Original file line number	Diff line number	Diff line change
`@@ -191,9 +191,7 @@ func (r *HelmRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Reque`
`191`	`191`	`}`
`192`	`192`	`result, retErr = summarizeHelper.SummarizeAndPatch(ctx, obj, summarizeOpts...)`
`193`	`193`
`194`		`- // Always record suspend, readiness and duration metrics.`
`195`		`- r.Metrics.RecordSuspend(ctx, obj, obj.Spec.Suspend)`
`196`		`- r.Metrics.RecordReadiness(ctx, obj)`
	`194`	`+ // Always record duration metrics.`
`197`	`195`	`r.Metrics.RecordDuration(ctx, obj, start)`
`198`	`196`	`}()`
`199`	`197`
Original file line number	Diff line number	Diff line change
`@@ -213,9 +213,7 @@ func (r *OCIRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Reques`
`213`	`213`	`}`
`214`	`214`	`result, retErr = summarizeHelper.SummarizeAndPatch(ctx, obj, summarizeOpts...)`
`215`	`215`
`216`		`- // Always record suspend, readiness and duration metrics.`
`217`		`- r.Metrics.RecordSuspend(ctx, obj, obj.Spec.Suspend)`
`218`		`- r.Metrics.RecordReadiness(ctx, obj)`
	`216`	`+ // Always record duration metrics.`
`219`	`217`	`r.Metrics.RecordDuration(ctx, obj, start)`
`220`	`218`	`}()`
`221`	`219`