Collect cache metrics from aws-sdk-go-cache library

Author: bigkraig

Gopkg.lock

@@ -28,6 +28,7 @@ import (
 	"time"
 
 	"github.com/golang/glog"
+	"github.com/kubernetes-sigs/aws-alb-ingress-controller/internal/ingress/metric/collectors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/ticketmaster/aws-sdk-go-cache/cache"
@@ -87,8 +88,11 @@ func main() {
 
 	conf.Client = kubeClient
 
+	cc := cache.NewConfig(5 * time.Minute)
+
 	reg := prometheus.NewRegistry()
 
+	reg.MustRegister(cc.NewCacheCollector(collectors.PrometheusNamespace))
 	reg.MustRegister(prometheus.NewGoCollector())
 	reg.MustRegister(prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{}))
 
@@ -98,8 +102,6 @@ func main() {
 	}
 	mc.Start()
 
-	cc := cache.NewConfig(5 * time.Minute)
-
 	c := controller.NewALBController(conf, mc, cc)
 	go handleSigterm(c, func(code int) {
 		os.Exit(code)

cmd/main.go

@@ -39,14 +39,6 @@ func NewSession(awsconfig *aws.Config, AWSDebug bool, mc metric.Collector, cc *c
 	})
 
 	session.Handlers.Complete.PushFront(func(r *request.Request) {
-		ctx := r.HTTPRequest.Context()
-		cacheName := r.ClientInfo.ServiceName + "." + r.Operation.Name
-		if cache.IsCacheHit(ctx) {
-			mc.IncAPICacheCount(prometheus.Labels{"cache": cacheName, "action": "hit"})
-		} else {
-			mc.IncAPICacheCount(prometheus.Labels{"cache": cacheName, "action": "miss"})
-		}
-
 		if r.Error != nil {
 			mc.IncAPIErrorCount(prometheus.Labels{"service": r.ClientInfo.ServiceName, "operation": r.Operation.Name})
 			if AWSDebug {

internal/aws/albsession/session.go

@@ -27,7 +27,6 @@ type AWSAPIController struct {
 	awsAPIRequest *prometheus.CounterVec
 	awsAPIError   *prometheus.CounterVec
 	awsAPIRetry   *prometheus.CounterVec
-	awsAPICache   *prometheus.CounterVec
 }
 
 // NewAWSAPIController creates a new prometheus collector for the
@@ -58,14 +57,6 @@ func NewAWSAPIController() *AWSAPIController {
 			},
 			[]string{"service", "operation"},
 		),
-		awsAPICache: prometheus.NewCounterVec(
-			prometheus.CounterOpts{
-				Namespace: PrometheusNamespace,
-				Name:      "aws_api_cache",
-				Help:      `Cache action`,
-			},
-			[]string{"cache", "action"},
-		),
 	}
 }
 
@@ -84,23 +75,16 @@ func (a *AWSAPIController) IncAPIRetryCount(l prometheus.Labels) {
 	a.awsAPIRetry.With(l).Inc()
 }
 
-// IncAPICacheCount increment the reconcile counter
-func (a *AWSAPIController) IncAPICacheCount(l prometheus.Labels) {
-	a.awsAPICache.With(l).Inc()
-}
-
 // Describe implements prometheus.Collector
 func (a AWSAPIController) Describe(ch chan<- *prometheus.Desc) {
 	a.awsAPIRequest.Describe(ch)
 	a.awsAPIError.Describe(ch)
 	a.awsAPIRetry.Describe(ch)
-	a.awsAPICache.Describe(ch)
 }
 
 // Collect implements the prometheus.Collector interface.
 func (a AWSAPIController) Collect(ch chan<- prometheus.Metric) {
 	a.awsAPIRequest.Collect(ch)
 	a.awsAPIError.Collect(ch)
 	a.awsAPIRetry.Collect(ch)
-	a.awsAPICache.Collect(ch)
 }

internal/ingress/metric/collectors/aws.go

@@ -39,9 +39,6 @@ func (dc DummyCollector) IncAPIErrorCount(prometheus.Labels) {}
 // IncAPIRetryCount ...
 func (dc DummyCollector) IncAPIRetryCount(prometheus.Labels) {}
 
-// IncAPICacheCount ...
-func (dc DummyCollector) IncAPICacheCount(prometheus.Labels) {}
-
 // Start ...
 func (dc DummyCollector) Start() {}
 

internal/ingress/metric/dummy.go

@@ -32,7 +32,6 @@ type Collector interface {
 	IncAPIRequestCount(prometheus.Labels)
 	IncAPIErrorCount(prometheus.Labels)
 	IncAPIRetryCount(prometheus.Labels)
-	IncAPICacheCount(prometheus.Labels)
 
 	RemoveMetrics(string)
 
@@ -83,10 +82,6 @@ func (c *collector) IncAPIRetryCount(l prometheus.Labels) {
 	c.awsAPIController.IncAPIRetryCount(l)
 }
 
-func (c *collector) IncAPICacheCount(l prometheus.Labels) {
-	c.awsAPIController.IncAPICacheCount(l)
-}
-
 func (c *collector) RemoveMetrics(ingressName string) {
 	c.ingressController.RemoveMetrics(ingressName)
 }