From eaf9ebe26f334e1897bca86b977b7493f61f11d1 Mon Sep 17 00:00:00 2001
From: Simon <simon@vectorized.io>
Date: Mon, 5 Jul 2021 12:36:42 +0200
Subject: [PATCH] kprom: use Registerer and Gatherer interface instead of
 concreate registry type.

This allows the user of the plugin to:
- pass prometheus.DefaultRegisterer and prometheus.Defaultgatherer
- pass a testing a custom Registerer implementation (e.g. for testing purposes)
---
 plugin/kprom/kprom.go | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/plugin/kprom/kprom.go b/plugin/kprom/kprom.go
index fd51d0cd..3140d067 100644
--- a/plugin/kprom/kprom.go
+++ b/plugin/kprom/kprom.go
@@ -70,22 +70,28 @@ type Metrics struct {
 //
 // This is useful if you want the Metrics type to create its own registry for
 // you to add additional metrics to.
-func (m *Metrics) Registry() *prometheus.Registry {
+func (m *Metrics) Registry() prometheus.Registerer {
 	return m.cfg.reg
 }
 
 // Handler returns an http.Handler providing prometheus metrics.
 func (m *Metrics) Handler() http.Handler {
-	return promhttp.HandlerFor(m.cfg.reg, m.cfg.handlerOpts)
+	return promhttp.HandlerFor(m.cfg.gatherer, m.cfg.handlerOpts)
 }
 
 type cfg struct {
-	reg *prometheus.Registry
+	reg      prometheus.Registerer
+	gatherer prometheus.Gatherer
 
 	handlerOpts  promhttp.HandlerOpts
 	goCollectors bool
 }
 
+type RegistererGatherer interface {
+	prometheus.Registerer
+	prometheus.Gatherer
+}
+
 // Opt applies options to further tune how prometheus metrics are gathered or
 // which metrics to use.
 type Opt interface {
@@ -96,11 +102,25 @@ type opt struct{ fn func(*cfg) }
 
 func (o opt) apply(c *cfg) { o.fn(c) }
 
-// Registry sets the registry to add metrics to, rather than a new registry.
-func Registry(reg *prometheus.Registry) Opt {
+// Registry sets the registerer and gatherer to add metrics to, rather than a new registry.
+// Use this option if you want to configure both Gatherer and Registerer with the same object.
+func Registry(rg RegistererGatherer) Opt {
+	return opt{func(c *cfg) {
+		c.reg = rg
+		c.gatherer = rg
+	}}
+}
+
+// Registry sets the registerer to add metrics to, rather than a new registry.
+func Registerer(reg prometheus.Registerer) Opt {
 	return opt{func(c *cfg) { c.reg = reg }}
 }
 
+// Registry sets the gatherer to add metrics to, rather than a new registry.
+func Gatherer(gatherer prometheus.Gatherer) Opt {
+	return opt{func(c *cfg) { c.gatherer = gatherer }}
+}
+
 // GoCollectors adds the prometheus.NewProcessCollector and
 // prometheus.NewGoCollector collectors the the Metric's registry.
 func GoCollectors() Opt {
@@ -119,8 +139,10 @@ func HandlerOpts(opts promhttp.HandlerOpts) Opt {
 // NewMetrics returns a new Metrics that adds prometheus metrics to the
 // registry under the given namespace.
 func NewMetrics(namespace string, opts ...Opt) *Metrics {
+	var regGatherer RegistererGatherer = prometheus.NewRegistry()
 	cfg := cfg{
-		reg: prometheus.NewRegistry(),
+		reg:      regGatherer,
+		gatherer: regGatherer,
 	}
 	for _, opt := range opts {
 		opt.apply(&cfg)