Skip to content

fix(metrics): query cache for object count metrics #1639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 17, 2020
Merged

fix(metrics): query cache for object count metrics #1639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/controller/operators/catalog/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand All @@ -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()),
Expand Down Expand Up @@ -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()),
Expand Down
33 changes: 15 additions & 18 deletions pkg/metrics/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down Expand Up @@ -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
}

Expand Down