metrics: set metrics if not nil

Signed-off-by: rakeshgm <[email protected]>
(cherry picked from commit e024cce)

controllers/drplacementcontrol_controller.go

@@ -778,20 +778,7 @@ func (r *DRPlacementControlReconciler) createDRPCInstance(
 		return nil, fmt.Errorf("configmap get: %w", err)
 	}
 
-	syncMetricLabels := SyncMetricLabels(drPolicy, drpc)
-	syncMetrics := NewSyncMetrics(syncMetricLabels)
-
-	syncDurationMetricLabels := SyncDurationMetricLabels(drPolicy, drpc)
-	syncDurationMetrics := NewSyncDurationMetric(syncDurationMetricLabels)
-
-	syncDataBytesLabels := SyncDataBytesMetricLabels(drPolicy, drpc)
-	syncDataMetrics := NewSyncDataBytesMetric(syncDataBytesLabels)
-
-	drpcMetrics := DRPCMetrics{
-		SyncMetrics:          syncMetrics,
-		SyncDurationMetrics:  syncDurationMetrics,
-		SyncDataBytesMetrics: syncDataMetrics,
-	}
+	drpcMetrics := r.createDRPCMetrics(drPolicy, drpc)
 
 	d := &DRPCInstance{
 		reconciler:      r,
@@ -804,7 +791,7 @@ func (r *DRPlacementControlReconciler) createDRPCInstance(
 		vrgs:            vrgs,
 		vrgNamespace:    vrgNamespace,
 		volSyncDisabled: ramenConfig.VolSync.Disabled,
-		metrics:         &drpcMetrics,
+		metrics:         drpcMetrics,
 		mwu: rmnutil.MWUtil{
 			Client:          r.Client,
 			APIReader:       r.APIReader,
@@ -828,6 +815,25 @@ func (r *DRPlacementControlReconciler) createDRPCInstance(
 	return d, nil
 }
 
+func (r *DRPlacementControlReconciler) createDRPCMetrics(
+	drPolicy *rmn.DRPolicy, drpc *rmn.DRPlacementControl,
+) *DRPCMetrics {
+	syncMetricLabels := SyncMetricLabels(drPolicy, drpc)
+	syncMetrics := NewSyncMetrics(syncMetricLabels)
+
+	syncDurationMetricLabels := SyncDurationMetricLabels(drPolicy, drpc)
+	syncDurationMetrics := NewSyncDurationMetric(syncDurationMetricLabels)
+
+	syncDataBytesLabels := SyncDataBytesMetricLabels(drPolicy, drpc)
+	syncDataMetrics := NewSyncDataBytesMetric(syncDataBytesLabels)
+
+	return &DRPCMetrics{
+		SyncMetrics:          syncMetrics,
+		SyncDurationMetrics:  syncDurationMetrics,
+		SyncDataBytesMetrics: syncDataMetrics,
+	}
+}
+
 // isBeingDeleted returns true if either DRPC, user placement, or both are being deleted
 func isBeingDeleted(drpc *rmn.DRPlacementControl, usrPl client.Object) bool {
 	return !drpc.GetDeletionTimestamp().IsZero() ||
@@ -1568,9 +1574,11 @@ func (r *DRPlacementControlReconciler) updateResourceCondition(
 		drpc.Status.LastGroupSyncDuration = nil
 		drpc.Status.LastGroupSyncBytes = nil
 
-		r.setLastSyncTimeMetric(&drpcMetrics.SyncMetrics, nil, log)
-		r.setLastSyncDurationMetric(&drpcMetrics.SyncDurationMetrics, nil, log)
-		r.setLastSyncBytesMetric(&drpcMetrics.SyncDataBytesMetrics, nil, log)
+		if drpcMetrics != nil {
+			r.setLastSyncTimeMetric(&drpcMetrics.SyncMetrics, nil, log)
+			r.setLastSyncDurationMetric(&drpcMetrics.SyncDurationMetrics, nil, log)
+			r.setLastSyncBytesMetric(&drpcMetrics.SyncDataBytesMetrics, nil, log)
+		}
 	} else {
 		drpc.Status.ResourceConditions.ResourceMeta.Kind = vrg.Kind
 		drpc.Status.ResourceConditions.ResourceMeta.Name = vrg.Name
@@ -1588,9 +1596,11 @@ func (r *DRPlacementControlReconciler) updateResourceCondition(
 		drpc.Status.LastGroupSyncDuration = vrg.Status.LastGroupSyncDuration
 		drpc.Status.LastGroupSyncBytes = vrg.Status.LastGroupSyncBytes
 
-		r.setLastSyncTimeMetric(&drpcMetrics.SyncMetrics, vrg.Status.LastGroupSyncTime, log)
-		r.setLastSyncDurationMetric(&drpcMetrics.SyncDurationMetrics, vrg.Status.LastGroupSyncDuration, log)
-		r.setLastSyncBytesMetric(&drpcMetrics.SyncDataBytesMetrics, vrg.Status.LastGroupSyncBytes, log)
+		if drpcMetrics != nil {
+			r.setLastSyncTimeMetric(&drpcMetrics.SyncMetrics, vrg.Status.LastGroupSyncTime, log)
+			r.setLastSyncDurationMetric(&drpcMetrics.SyncDurationMetrics, vrg.Status.LastGroupSyncDuration, log)
+			r.setLastSyncBytesMetric(&drpcMetrics.SyncDataBytesMetrics, vrg.Status.LastGroupSyncBytes, log)
+		}
 	}
 }