@@ -30,9 +30,9 @@ import (
3030 utilruntime "k8s.io/apimachinery/pkg/util/runtime"
3131 "k8s.io/apimachinery/pkg/util/uuid"
3232 "k8s.io/client-go/util/workqueue"
33+ ctrlmetrics "sigs.k8s.io/controller-runtime/pkg/metrics"
3334
3435 "sigs.k8s.io/controller-runtime/pkg/controller/priorityqueue"
35- ctrlmetrics "sigs.k8s.io/controller-runtime/pkg/internal/controller/metrics"
3636 logf "sigs.k8s.io/controller-runtime/pkg/log"
3737 "sigs.k8s.io/controller-runtime/pkg/reconcile"
3838 "sigs.k8s.io/controller-runtime/pkg/source"
@@ -101,7 +101,7 @@ type Controller[request comparable] struct {
101101func (c * Controller [request ]) Reconcile (ctx context.Context , req request ) (_ reconcile.Result , err error ) {
102102 defer func () {
103103 if r := recover (); r != nil {
104- ctrlmetrics .ReconcilePanics .WithLabelValues ( c .Name ). Inc ( )
104+ ctrlmetrics .ReconcilePanics .Inc ( map [ string ] string { "controller" : c .Name } )
105105
106106 if c .RecoverPanic == nil || * c .RecoverPanic {
107107 for _ , fn := range utilruntime .PanicHandlers {
@@ -288,8 +288,8 @@ func (c *Controller[request]) processNextWorkItem(ctx context.Context) bool {
288288 // period.
289289 defer c .Queue .Done (obj )
290290
291- ctrlmetrics .ActiveWorkers .WithLabelValues ( c .Name ). Add ( 1 )
292- defer ctrlmetrics .ActiveWorkers .WithLabelValues ( c .Name ). Add ( - 1 )
291+ ctrlmetrics .ActiveWorkers .Set ( 1 , map [ string ] string { "controller" : c .Name } )
292+ defer ctrlmetrics .ActiveWorkers .Set ( 0 , map [ string ] string { "controller" : c .Name } )
293293
294294 c .reconcileHandler (ctx , obj , priority )
295295 return true
@@ -303,15 +303,15 @@ const (
303303)
304304
305305func (c * Controller [request ]) initMetrics () {
306- ctrlmetrics .ReconcileTotal .WithLabelValues ( c .Name , labelError ). Add ( 0 )
307- ctrlmetrics .ReconcileTotal .WithLabelValues ( c .Name , labelRequeueAfter ). Add ( 0 )
308- ctrlmetrics .ReconcileTotal .WithLabelValues ( c .Name , labelRequeue ). Add ( 0 )
309- ctrlmetrics .ReconcileTotal .WithLabelValues ( c .Name , labelSuccess ). Add ( 0 )
310- ctrlmetrics .ReconcileErrors .WithLabelValues ( c .Name ). Add ( 0 )
311- ctrlmetrics .TerminalReconcileErrors .WithLabelValues ( c .Name ). Add ( 0 )
312- ctrlmetrics .ReconcilePanics .WithLabelValues ( c .Name ). Add ( 0 )
313- ctrlmetrics .WorkerCount .WithLabelValues ( c . Name ). Set (float64 (c .MaxConcurrentReconciles ))
314- ctrlmetrics .ActiveWorkers .WithLabelValues ( c .Name ). Set ( 0 )
306+ ctrlmetrics .ReconcileTotal .Add ( 0 , map [ string ] string { "controller" : c .Name , "result" : labelError } )
307+ ctrlmetrics .ReconcileTotal .Add ( 0 , map [ string ] string { "controller" : c .Name , "result" : labelRequeueAfter } )
308+ ctrlmetrics .ReconcileTotal .Add ( 0 , map [ string ] string { "controller" : c .Name , "result" : labelRequeue } )
309+ ctrlmetrics .ReconcileTotal .Add ( 0 , map [ string ] string { "controller" : c .Name , "result" : labelSuccess } )
310+ ctrlmetrics .ReconcileErrors .Add ( 0 , map [ string ] string { "controller" : c .Name } )
311+ ctrlmetrics .TerminalReconcileErrors .Add ( 0 , map [ string ] string { "controller" : c .Name } )
312+ ctrlmetrics .ReconcilePanics .Add ( 0 , map [ string ] string { "controller" : c .Name } )
313+ ctrlmetrics .WorkerCount .Set (float64 (c .MaxConcurrentReconciles ), map [ string ] string { "controller" : c . Name } )
314+ ctrlmetrics .ActiveWorkers .Set ( 0 , map [ string ] string { "controller" : c .Name } )
315315}
316316
317317func (c * Controller [request ]) reconcileHandler (ctx context.Context , req request , priority int ) {
@@ -335,12 +335,12 @@ func (c *Controller[request]) reconcileHandler(ctx context.Context, req request,
335335 switch {
336336 case err != nil :
337337 if errors .Is (err , reconcile .TerminalError (nil )) {
338- ctrlmetrics .TerminalReconcileErrors .WithLabelValues ( c .Name ). Inc ( )
338+ ctrlmetrics .TerminalReconcileErrors .Inc ( map [ string ] string { "controller" : c .Name } )
339339 } else {
340340 c .Queue .AddWithOpts (priorityqueue.AddOpts {RateLimited : true , Priority : priority }, req )
341341 }
342- ctrlmetrics .ReconcileErrors .WithLabelValues ( c .Name ). Inc ( )
343- ctrlmetrics .ReconcileTotal .WithLabelValues ( c .Name , labelError ). Inc ( )
342+ ctrlmetrics .ReconcileErrors .Inc ( map [ string ] string { "controller" : c .Name } )
343+ ctrlmetrics .ReconcileTotal .Inc ( map [ string ] string { "controller" : c .Name , "result" : labelError } )
344344 if ! result .IsZero () {
345345 log .Info ("Warning: Reconciler returned both a non-zero result and a non-nil error. The result will always be ignored if the error is non-nil and the non-nil error causes requeuing with exponential backoff. For more details, see: https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/reconcile#Reconciler" )
346346 }
@@ -353,17 +353,17 @@ func (c *Controller[request]) reconcileHandler(ctx context.Context, req request,
353353 // to result.RequestAfter
354354 c .Queue .Forget (req )
355355 c .Queue .AddWithOpts (priorityqueue.AddOpts {After : result .RequeueAfter , Priority : priority }, req )
356- ctrlmetrics .ReconcileTotal .WithLabelValues ( c .Name , labelRequeueAfter ). Inc ( )
356+ ctrlmetrics .ReconcileTotal .Inc ( map [ string ] string { "controller" : c .Name , "result" : labelRequeueAfter } )
357357 case result .Requeue :
358358 log .V (5 ).Info ("Reconcile done, requeueing" )
359359 c .Queue .AddWithOpts (priorityqueue.AddOpts {RateLimited : true , Priority : priority }, req )
360- ctrlmetrics .ReconcileTotal .WithLabelValues ( c .Name , labelRequeue ). Inc ( )
360+ ctrlmetrics .ReconcileTotal .Inc ( map [ string ] string { "controller" : c .Name , "result" : labelRequeue } )
361361 default :
362362 log .V (5 ).Info ("Reconcile successful" )
363363 // Finally, if no error occurs we Forget this item so it does not
364364 // get queued again until another change happens.
365365 c .Queue .Forget (req )
366- ctrlmetrics .ReconcileTotal .WithLabelValues ( c .Name , labelSuccess ). Inc ( )
366+ ctrlmetrics .ReconcileTotal .Inc ( map [ string ] string { "controller" : c .Name , "result" : labelSuccess } )
367367 }
368368}
369369
@@ -374,7 +374,7 @@ func (c *Controller[request]) GetLogger() logr.Logger {
374374
375375// updateMetrics updates prometheus metrics within the controller.
376376func (c * Controller [request ]) updateMetrics (reconcileTime time.Duration ) {
377- ctrlmetrics .ReconcileTime .WithLabelValues ( c . Name ). Observe (reconcileTime .Seconds ())
377+ ctrlmetrics .ReconcileTime .Observe (reconcileTime .Seconds (), map [ string ] string { "controller" : c . Name } )
378378}
379379
380380// ReconcileIDFromContext gets the reconcileID from the current context.
0 commit comments