Bug 1952576: csv_succeeded metric not present

Josef Karasek · Josef Karasek · commit b6e65106f48f · 2021-06-23T15:19:06.000+02:00
`csv_succeeded` metric is lost between pod restarts.
This is because this metric is only emitted when CSV.Status is changed.

Signed-off-by: Josef Karasek &lt;jkarasek@redhat.com&gt;
diff --git a/pkg/controller/operators/olm/operator.go b/pkg/controller/operators/olm/operator.go
@@ -1115,11 +1115,12 @@ func (a *Operator) syncClusterServiceVersion(obj interface{}) (syncError error)
 			} else {
 				syncError = fmt.Errorf("error transitioning ClusterServiceVersion: %s and error updating CSV status: %s", syncError, updateErr)
 			}
-		} else {
-			metrics.EmitCSVMetric(clusterServiceVersion, outCSV)
 		}
 	}
 
+	// always emit csv metrics
+	metrics.EmitCSVMetric(clusterServiceVersion, outCSV)
+
 	operatorGroup := a.operatorGroupFromAnnotations(logger, clusterServiceVersion)
 	if operatorGroup == nil {
 		logger.WithField("reason", "no operatorgroup found for active CSV").Debug("skipping potential RBAC creation in target namespaces")

Original file line number	Diff line number	Diff line change
`@@ -1115,11 +1115,12 @@ func (a *Operator) syncClusterServiceVersion(obj interface{}) (syncError error)`
`1115`	`1115`	`} else {`
`1116`	`1116`	`syncError = fmt.Errorf("error transitioning ClusterServiceVersion: %s and error updating CSV status: %s", syncError, updateErr)`
`1117`	`1117`	`}`
`1118`		`- } else {`
`1119`		`- metrics.EmitCSVMetric(clusterServiceVersion, outCSV)`
`1120`	`1118`	`}`
`1121`	`1119`	`}`
`1122`	`1120`
	`1121`	`+ // always emit csv metrics`
	`1122`	`+ metrics.EmitCSVMetric(clusterServiceVersion, outCSV)`
	`1123`	`+`
`1123`	`1124`	`operatorGroup := a.operatorGroupFromAnnotations(logger, clusterServiceVersion)`
`1124`	`1125`	`if operatorGroup == nil {`
`1125`	`1126`	`logger.WithField("reason", "no operatorgroup found for active CSV").Debug("skipping potential RBAC creation in target namespaces")`