Merge pull request #1639 from ecordell/fix-metrics

openshift-merge-robot · web-flow · commit e377ebd76d8c · 2020-07-17T05:16:08.000-04:00
fix(metrics): query cache for object count metrics
diff --git a/pkg/controller/operators/catalog/operator.go b/pkg/controller/operators/catalog/operator.go
@@ -175,7 +175,7 @@ func NewOperator(ctx context.Context, kubeconfigPath string, clock utilclock.Clo
 	op.ipQueueSet.Set(metav1.NamespaceAll, ipQueue)
 	ipQueueInformer, err := queueinformer.NewQueueInformer(
 		ctx,
-		queueinformer.WithMetricsProvider(metrics.NewMetricsInstallPlan(op.client)),
+		queueinformer.WithMetricsProvider(metrics.NewMetricsInstallPlan(op.lister.OperatorsV1alpha1().InstallPlanLister())),
 		queueinformer.WithLogger(op.logger),
 		queueinformer.WithQueue(ipQueue),
 		queueinformer.WithInformer(ipInformer.Informer()),
@@ -195,7 +195,7 @@ func NewOperator(ctx context.Context, kubeconfigPath string, clock utilclock.Clo
 	op.catsrcQueueSet.Set(metav1.NamespaceAll, catsrcQueue)
 	catsrcQueueInformer, err := queueinformer.NewQueueInformer(
 		ctx,
-		queueinformer.WithMetricsProvider(metrics.NewMetricsCatalogSource(op.client)),
+		queueinformer.WithMetricsProvider(metrics.NewMetricsCatalogSource(op.lister.OperatorsV1alpha1().CatalogSourceLister())),
 		queueinformer.WithLogger(op.logger),
 		queueinformer.WithQueue(catsrcQueue),
 		queueinformer.WithInformer(catsrcInformer.Informer()),
@@ -237,7 +237,7 @@ func NewOperator(ctx context.Context, kubeconfigPath string, clock utilclock.Clo
 	}
 	subQueueInformer, err := queueinformer.NewQueueInformer(
 		ctx,
-		queueinformer.WithMetricsProvider(metrics.NewMetricsSubscription(op.client)),
+		queueinformer.WithMetricsProvider(metrics.NewMetricsSubscription(op.lister.OperatorsV1alpha1().SubscriptionLister())),
 		queueinformer.WithLogger(op.logger),
 		queueinformer.WithQueue(subQueue),
 		queueinformer.WithInformer(subInformer.Informer()),
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
@@ -1,14 +1,11 @@
 package metrics
 
 import (
-	"context"
-
 	"github.com/prometheus/client_golang/prometheus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 
 	olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
-	"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned"
 	v1alpha1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1alpha1"
 )
 
@@ -45,54 +42,54 @@ func (m *metricsCSV) HandleMetrics() error {
 }
 
 type metricsInstallPlan struct {
-	client versioned.Interface
+	lister v1alpha1.InstallPlanLister
 }
 
-func NewMetricsInstallPlan(client versioned.Interface) MetricsProvider {
-	return &metricsInstallPlan{client}
+func NewMetricsInstallPlan(lister v1alpha1.InstallPlanLister) MetricsProvider {
+	return &metricsInstallPlan{lister}
 }
 
 func (m *metricsInstallPlan) HandleMetrics() error {
-	cList, err := m.client.OperatorsV1alpha1().InstallPlans(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{})
+	cList, err := m.lister.InstallPlans(metav1.NamespaceAll).List(labels.Everything())
 	if err != nil {
 		return err
 	}
-	installPlanCount.Set(float64(len(cList.Items)))
+	installPlanCount.Set(float64(len(cList)))
 	return nil
 }
 
 type metricsSubscription struct {
-	client versioned.Interface
+	 lister v1alpha1.SubscriptionLister
 }
 
-func NewMetricsSubscription(client versioned.Interface) MetricsProvider {
-	return &metricsSubscription{client}
+func NewMetricsSubscription(lister v1alpha1.SubscriptionLister) MetricsProvider {
+	return &metricsSubscription{lister}
 }
 
 func (m *metricsSubscription) HandleMetrics() error {
-	cList, err := m.client.OperatorsV1alpha1().Subscriptions(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{})
+	cList, err := m.lister.Subscriptions(metav1.NamespaceAll).List(labels.Everything())
 	if err != nil {
 		return err
 	}
-	subscriptionCount.Set(float64(len(cList.Items)))
+	subscriptionCount.Set(float64(len(cList)))
 	return nil
 }
 
 type metricsCatalogSource struct {
-	client versioned.Interface
+	lister v1alpha1.CatalogSourceLister
 }
 
-func NewMetricsCatalogSource(client versioned.Interface) MetricsProvider {
-	return &metricsCatalogSource{client}
+func NewMetricsCatalogSource(lister v1alpha1.CatalogSourceLister) MetricsProvider {
+	return &metricsCatalogSource{lister}
 
 }
 
 func (m *metricsCatalogSource) HandleMetrics() error {
-	cList, err := m.client.OperatorsV1alpha1().CatalogSources(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{})
+	cList, err := m.lister.CatalogSources(metav1.NamespaceAll).List(labels.Everything())
 	if err != nil {
 		return err
 	}
-	catalogSourceCount.Set(float64(len(cList.Items)))
+	catalogSourceCount.Set(float64(len(cList)))
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,11 @@`
`1`	`1`	`package metrics`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "context"`
`5`		`-`
`6`	`4`	`"github.com/prometheus/client_golang/prometheus"`
`7`	`5`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`8`	`6`	`"k8s.io/apimachinery/pkg/labels"`
`9`	`7`
`10`	`8`	`olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"`
`11`		`- "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned"`
`12`	`9`	`v1alpha1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1alpha1"`
`13`	`10`	`)`
`14`	`11`
`@@ -45,54 +42,54 @@ func (m *metricsCSV) HandleMetrics() error {`
`45`	`42`	`}`
`46`	`43`
`47`	`44`	`type metricsInstallPlan struct {`
`48`		`- client versioned.Interface`
	`45`	`+ lister v1alpha1.InstallPlanLister`
`49`	`46`	`}`
`50`	`47`
`51`		`-func NewMetricsInstallPlan(client versioned.Interface) MetricsProvider {`
`52`		`- return &metricsInstallPlan{client}`
	`48`	`+func NewMetricsInstallPlan(lister v1alpha1.InstallPlanLister) MetricsProvider {`
	`49`	`+ return &metricsInstallPlan{lister}`
`53`	`50`	`}`
`54`	`51`
`55`	`52`	`func (m *metricsInstallPlan) HandleMetrics() error {`
`56`		`- cList, err := m.client.OperatorsV1alpha1().InstallPlans(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{})`
	`53`	`+ cList, err := m.lister.InstallPlans(metav1.NamespaceAll).List(labels.Everything())`
`57`	`54`	`if err != nil {`
`58`	`55`	`return err`
`59`	`56`	`}`
`60`		`- installPlanCount.Set(float64(len(cList.Items)))`
	`57`	`+ installPlanCount.Set(float64(len(cList)))`
`61`	`58`	`return nil`
`62`	`59`	`}`
`63`	`60`
`64`	`61`	`type metricsSubscription struct {`
`65`		`- client versioned.Interface`
	`62`	`+ lister v1alpha1.SubscriptionLister`
`66`	`63`	`}`
`67`	`64`
`68`		`-func NewMetricsSubscription(client versioned.Interface) MetricsProvider {`
`69`		`- return &metricsSubscription{client}`
	`65`	`+func NewMetricsSubscription(lister v1alpha1.SubscriptionLister) MetricsProvider {`
	`66`	`+ return &metricsSubscription{lister}`
`70`	`67`	`}`
`71`	`68`
`72`	`69`	`func (m *metricsSubscription) HandleMetrics() error {`
`73`		`- cList, err := m.client.OperatorsV1alpha1().Subscriptions(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{})`
	`70`	`+ cList, err := m.lister.Subscriptions(metav1.NamespaceAll).List(labels.Everything())`
`74`	`71`	`if err != nil {`
`75`	`72`	`return err`
`76`	`73`	`}`
`77`		`- subscriptionCount.Set(float64(len(cList.Items)))`
	`74`	`+ subscriptionCount.Set(float64(len(cList)))`
`78`	`75`	`return nil`
`79`	`76`	`}`
`80`	`77`
`81`	`78`	`type metricsCatalogSource struct {`
`82`		`- client versioned.Interface`
	`79`	`+ lister v1alpha1.CatalogSourceLister`
`83`	`80`	`}`
`84`	`81`
`85`		`-func NewMetricsCatalogSource(client versioned.Interface) MetricsProvider {`
`86`		`- return &metricsCatalogSource{client}`
	`82`	`+func NewMetricsCatalogSource(lister v1alpha1.CatalogSourceLister) MetricsProvider {`
	`83`	`+ return &metricsCatalogSource{lister}`
`87`	`84`
`88`	`85`	`}`
`89`	`86`
`90`	`87`	`func (m *metricsCatalogSource) HandleMetrics() error {`
`91`		`- cList, err := m.client.OperatorsV1alpha1().CatalogSources(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{})`
	`88`	`+ cList, err := m.lister.CatalogSources(metav1.NamespaceAll).List(labels.Everything())`
`92`	`89`	`if err != nil {`
`93`	`90`	`return err`
`94`	`91`	`}`
`95`		`- catalogSourceCount.Set(float64(len(cList.Items)))`
	`92`	`+ catalogSourceCount.Set(float64(len(cList)))`
`96`	`93`	`return nil`
`97`	`94`	`}`
`98`	`95`