Skip to content

Commit e6eba02

Browse files
committed
fix metrics reconcilation
1 parent 46c90d1 commit e6eba02

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

pkg/patterns/declarative/options.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,20 +191,20 @@ func WithApplyValidation() reconcilerOption {
191191
// argument, largest metricsDuration is set against that ot.
192192
func WithReconcileMetrics(metricsDuration int, ot *ObjectTracker) reconcilerOption {
193193
return func(p reconcilerParams) reconcilerParams {
194-
var err *error
194+
var err error
195195

196196
p.metrics = true
197197
metricsRegisterOnce.Do(func() {
198198
for _, m := range metricsList {
199-
*err = metrics.Registry.Register(m)
200-
if *err != nil {
199+
err = metrics.Registry.Register(m)
200+
if err != nil {
201201
break
202202
}
203203
}
204204
})
205205

206-
if *err != nil {
207-
panic(*err)
206+
if err != nil {
207+
panic(err)
208208
}
209209

210210
if ot == nil {

pkg/patterns/declarative/reconciler.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ type Reconciler struct {
5454
config *rest.Config
5555
kubectl kubectlClient
5656

57-
rm reconcileMetrics
58-
mgr manager.Manager
57+
metrics reconcileMetrics
58+
mgr manager.Manager
5959

6060
// recorder is the EventRecorder for creating k8s events
6161
recorder recorder.EventRecorder
@@ -114,7 +114,7 @@ func (r *Reconciler) Init(mgr manager.Manager, prototype DeclarativeObject, opts
114114
if gvk, err := apiutil.GVKForObject(prototype, r.mgr.GetScheme()); err != nil {
115115
return err
116116
} else {
117-
reconcileMetricsFor(gvk)
117+
r.metrics = reconcileMetricsFor(gvk)
118118
}
119119
}
120120

@@ -495,8 +495,8 @@ func (r *Reconciler) injectOwnerRef(ctx context.Context, instance DeclarativeObj
495495

496496
func (r *Reconciler) collectMetrics(request reconcile.Request, result reconcile.Result, err error) {
497497
if r.options.metrics {
498-
r.rm.reconcileWith(request)
499-
r.rm.reconcileFailedWith(request, result, err)
498+
r.metrics.reconcileWith(request)
499+
r.metrics.reconcileFailedWith(request, result, err)
500500
}
501501
}
502502

0 commit comments

Comments
 (0)