using promauto package to ensure all created metrics are properly registered (#4025)

Signed-off-by: zounengren <zounengren@cmss.chinamobile.com>

1 files changed, 4 insertions, 16 deletions

diff --git a/plugin/template/metrics.go b/plugin/template/metrics.go
index 56aa63a44..db930dd77 100644
--- a/plugin/template/metrics.go
+++ b/plugin/template/metrics.go
@@ -2,42 +2,30 @@ package template
 
 import (
 	"github.com/coredns/coredns/plugin"
-	"github.com/coredns/coredns/plugin/metrics"
-
-	"github.com/caddyserver/caddy"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
 )
 
 var (
 	// templateMatchesCount is the counter of template regex matches.
-	templateMatchesCount = prometheus.NewCounterVec(prometheus.CounterOpts{
+	templateMatchesCount = promauto.NewCounterVec(prometheus.CounterOpts{
 		Namespace: plugin.Namespace,
 		Subsystem: "template",
 		Name:      "matches_total",
 		Help:      "Counter of template regex matches.",
 	}, []string{"server", "zone", "class", "type"})
 	// templateFailureCount is the counter of go template failures.
-	templateFailureCount = prometheus.NewCounterVec(prometheus.CounterOpts{
+	templateFailureCount = promauto.NewCounterVec(prometheus.CounterOpts{
 		Namespace: plugin.Namespace,
 		Subsystem: "template",
 		Name:      "template_failures_total",
 		Help:      "Counter of go template failures.",
 	}, []string{"server", "zone", "class", "type", "section", "template"})
 	// templateRRFailureCount is the counter of mis-templated RRs.
-	templateRRFailureCount = prometheus.NewCounterVec(prometheus.CounterOpts{
+	templateRRFailureCount = promauto.NewCounterVec(prometheus.CounterOpts{
 		Namespace: plugin.Namespace,
 		Subsystem: "template",
 		Name:      "rr_failures_total",
 		Help:      "Counter of mis-templated RRs.",
 	}, []string{"server", "zone", "class", "type", "section", "template"})
 )
-
-// OnStartupMetrics sets up the metrics on startup.
-func setupMetrics(c *caddy.Controller) error {
-	c.OnStartup(func() error {
-		metrics.MustRegister(c, templateMatchesCount, templateFailureCount, templateRRFailureCount)
-		return nil
-	})
-
-	return nil
-}