Refactor: move metrics for checkAndUpdateResource

Putting this in the function itself means that the function could be
called from multiple places, and the metrics would still be recorded.

Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com>
(cherry picked from commit 406ccf7)

controllers/configurationpolicy_controller.go

@@ -1738,8 +1738,6 @@ func (r *ConfigurationPolicyReconciler) handleSingleObj(
 		compType := strings.ToLower(string(objectT.ComplianceType))
 		mdCompType := strings.ToLower(string(objectT.MetadataComplianceType))
 
-		before := time.Now().UTC()
-
 		throwSpecViolation, msg, triedUpdate, updatedObj := r.checkAndUpdateResource(
 			obj, compType, mdCompType, remediation,
 		)
@@ -1749,19 +1747,6 @@ func (r *ConfigurationPolicyReconciler) handleSingleObj(
 			result.events = append(result.events, objectTmplEvalEvent{false, reasonWantFoundNoMatch, ""})
 		}
 
-		duration := time.Now().UTC().Sub(before)
-		seconds := float64(duration) / float64(time.Second)
-		compareObjSecondsCounter.WithLabelValues(
-			obj.policy.Name,
-			obj.namespace,
-			fmt.Sprintf("%s.%s", obj.gvr.Resource, obj.name),
-		).Add(seconds)
-		compareObjEvalCounter.WithLabelValues(
-			obj.policy.Name,
-			obj.namespace,
-			fmt.Sprintf("%s.%s", obj.gvr.Resource, obj.name),
-		).Inc()
-
 		if throwSpecViolation {
 			var resultReason, resultMsg string
 
@@ -2524,6 +2509,23 @@ func (r *ConfigurationPolicyReconciler) checkAndUpdateResource(
 		"policy", obj.policy.Name, "name", obj.name, "namespace", obj.namespace, "resource", obj.gvr.Resource,
 	)
 
+	// Time the function, and record it in a metric
+	before := time.Now().UTC()
+	defer func() {
+		duration := time.Now().UTC().Sub(before)
+		seconds := float64(duration) / float64(time.Second)
+		compareObjSecondsCounter.WithLabelValues(
+			obj.policy.Name,
+			obj.namespace,
+			fmt.Sprintf("%s.%s", obj.gvr.Resource, obj.name),
+		).Add(seconds)
+		compareObjEvalCounter.WithLabelValues(
+			obj.policy.Name,
+			obj.namespace,
+			fmt.Sprintf("%s.%s", obj.gvr.Resource, obj.name),
+		).Inc()
+	}()
+
 	if obj.existingObj == nil {
 		log.Info("Skipping update: Previous object retrieval from the API server failed")