pkg/metrics decoupled from pkg/common

pkg/common/auth.go

@@ -39,12 +39,6 @@ type TypedEvaluator interface {
 	GetType() string
 }
 
-type Monitorable interface {
-	NamedEvaluator
-	TypedEvaluator
-	Measured() bool
-}
-
 type Prioritizable interface {
 	GetPriority() int
 }

pkg/config/authorization.go

@@ -65,12 +65,6 @@ func (config *AuthorizationConfig) GetType() string {
 	}
 }
 
-// impl:Monitorable
-
-func (config *AuthorizationConfig) Measured() bool {
-	return config.MetricsEnabled
-}
-
 // impl:Prioritizable
 
 func (config *AuthorizationConfig) GetPriority() int {
@@ -82,3 +76,9 @@ func (config *AuthorizationConfig) GetPriority() int {
 func (config *AuthorizationConfig) GetConditions() []common.JSONPatternMatchingRule {
 	return config.Conditions
 }
+
+// impl:metrics.Object
+
+func (config *AuthorizationConfig) Measured() bool {
+	return config.MetricsEnabled
+}

pkg/config/identity.go

@@ -115,12 +115,6 @@ func (config *IdentityConfig) GetType() string {
 	}
 }
 
-// impl:Monitorable
-
-func (config *IdentityConfig) Measured() bool {
-	return config.MetricsEnabled
-}
-
 // impl:Prioritizable
 
 func (config *IdentityConfig) GetPriority() int {
@@ -189,3 +183,9 @@ func (config *IdentityConfig) FindSecretByName(lookup types.NamespacedName) *v1.
 		return nil
 	}
 }
+
+// impl:metrics.Object
+
+func (config *IdentityConfig) Measured() bool {
+	return config.MetricsEnabled
+}

pkg/config/metadata.go

@@ -71,12 +71,6 @@ func (config *MetadataConfig) GetType() string {
 	}
 }
 
-// impl:Monitorable
-
-func (config *MetadataConfig) Measured() bool {
-	return config.MetricsEnabled
-}
-
 // impl:Prioritizable
 
 func (config *MetadataConfig) GetPriority() int {
@@ -88,3 +82,9 @@ func (config *MetadataConfig) GetPriority() int {
 func (config *MetadataConfig) GetConditions() []common.JSONPatternMatchingRule {
 	return config.Conditions
 }
+
+// impl:metrics.Object
+
+func (config *MetadataConfig) Measured() bool {
+	return config.MetricsEnabled
+}

pkg/config/response.go

@@ -93,12 +93,6 @@ func (config *ResponseConfig) GetType() string {
 	}
 }
 
-// impl:Monitorable
-
-func (config *ResponseConfig) Measured() bool {
-	return config.MetricsEnabled
-}
-
 // impl:Prioritizable
 
 func (config *ResponseConfig) GetPriority() int {
@@ -117,6 +111,12 @@ func (config *ResponseConfig) GetWristbandIssuer() common.WristbandIssuer {
 	return config.Wristband
 }
 
+// impl:metrics.Object
+
+func (config *ResponseConfig) Measured() bool {
+	return config.MetricsEnabled
+}
+
 func WrapResponses(responses map[*ResponseConfig]interface{}) (responseHeaders map[string]string, responseMetadata map[string]interface{}) {
 	responseHeaders = make(map[string]string)
 	responseMetadata = make(map[string]interface{})

pkg/metrics/metrics.go

@@ -3,11 +3,16 @@ package metrics
 import (
 	"fmt"
 
-	"github.com/kuadrant/authorino/pkg/common"
-
 	"github.com/prometheus/client_golang/prometheus"
 )
 
+type Object interface {
+	GetType() string
+	GetName() string
+
+	Measured() bool
+}
+
 func Register(metrics ...prometheus.Collector) {
 	prometheus.MustRegister(metrics...)
 }
@@ -49,8 +54,8 @@ func ReportMetricWithStatus(metric *prometheus.CounterVec, status string, labels
 	ReportMetric(metric, extendLabelValuesWithStatus(status, labels...)...)
 }
 
-func ReportMetricWithEvaluator(metric *prometheus.CounterVec, evaluator common.AuthConfigEvaluator, labels ...string) {
-	if labels, err := extendLabelValuesWithEvaluator(evaluator, labels...); err == nil {
+func ReportMetricWithObject(metric *prometheus.CounterVec, obj Object, labels ...string) {
+	if labels, err := extendLabelValuesWithObject(obj, labels...); err == nil {
 		ReportMetric(metric, labels...)
 	}
 }
@@ -71,8 +76,8 @@ func ReportTimedMetricWithStatus(metric *prometheus.HistogramVec, f func(), stat
 	ReportTimedMetric(metric, f, extendLabelValuesWithStatus(status, labels...)...)
 }
 
-func ReportTimedMetricWithEvaluator(metric *prometheus.HistogramVec, f func(), evaluator common.AuthConfigEvaluator, labels ...string) {
-	if labels, err := extendLabelValuesWithEvaluator(evaluator, labels...); err == nil {
+func ReportTimedMetricWithObject(metric *prometheus.HistogramVec, f func(), obj Object, labels ...string) {
+	if labels, err := extendLabelValuesWithObject(obj, labels...); err == nil {
 		ReportTimedMetric(metric, f, labels...)
 	} else {
 		f()
@@ -92,17 +97,13 @@ func extendLabelValuesWithStatus(status string, baseLabels ...string) []string {
 	return labels
 }
 
-func extendLabelValuesWithEvaluator(evaluator common.AuthConfigEvaluator, baseLabels ...string) ([]string, error) {
-	if ev, ok := evaluator.(common.Monitorable); ok {
-		if !ev.Measured() {
-			return nil, fmt.Errorf("metrics are disabled for the evaluator")
-		}
-
-		labels := make([]string, len(baseLabels))
-		copy(labels, baseLabels)
-		labels = append(labels, ev.GetType(), ev.GetName())
-		return labels, nil
-	} else {
-		return baseLabels, fmt.Errorf("cannot cast evaluator to monitorable")
+func extendLabelValuesWithObject(obj Object, baseLabels ...string) ([]string, error) {
+	if obj == nil || !obj.Measured() {
+		return nil, fmt.Errorf("metrics are disabled")
 	}
+
+	labels := make([]string, len(baseLabels))
+	copy(labels, baseLabels)
+	labels = append(labels, obj.GetType(), obj.GetName())
+	return labels, nil
 }