diff options
| author |  Zou Nengren <zounengren@cmss.chinamobile.com>
| 2020-07-25 23:06:28 +0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-07-25 08:06:28 -0700 |
| commit | 4166dcc2feab0b42b6e7748a6078d0f5d3d54186 (patch) | |
| tree | 93ce01fd91b6da6d0457c91e5be21555b686cb55 /plugin/acl | |
| parent | 05751bdb59737221367f13413a83451e38bce355 (diff) | |
| download | coredns-4166dcc2feab0b42b6e7748a6078d0f5d3d54186.tar.gz coredns-4166dcc2feab0b42b6e7748a6078d0f5d3d54186.tar.zst coredns-4166dcc2feab0b42b6e7748a6078d0f5d3d54186.zip | |
using promauto package to ensure all created metrics are properly registered (#4025)
Signed-off-by: zounengren <zounengren@cmss.chinamobile.com>
Diffstat (limited to 'plugin/acl')
| -rw-r--r-- | plugin/acl/metrics.go | 5 | ||||
| -rw-r--r-- | plugin/acl/setup.go | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/plugin/acl/metrics.go b/plugin/acl/metrics.go index 719f24675..b0357cab1 100644 --- a/plugin/acl/metrics.go +++ b/plugin/acl/metrics.go @@ -4,18 +4,19 @@ import ( "github.com/coredns/coredns/plugin" "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promauto" ) var ( // RequestBlockCount is the number of DNS requests being blocked. - RequestBlockCount = prometheus.NewCounterVec(prometheus.CounterOpts{ + RequestBlockCount = promauto.NewCounterVec(prometheus.CounterOpts{ Namespace: plugin.Namespace, Subsystem: pluginName, Name: "blocked_requests_total", Help: "Counter of DNS requests being blocked.", }, []string{"server", "zone"}) // RequestAllowCount is the number of DNS requests being Allowed. - RequestAllowCount = prometheus.NewCounterVec(prometheus.CounterOpts{ + RequestAllowCount = promauto.NewCounterVec(prometheus.CounterOpts{ Namespace: plugin.Namespace, Subsystem: pluginName, Name: "allowed_requests_total", diff --git a/plugin/acl/setup.go b/plugin/acl/setup.go index 1bc891b50..98327b6b0 100644 --- a/plugin/acl/setup.go +++ b/plugin/acl/setup.go @@ -6,7 +6,6 @@ import ( "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - "github.com/coredns/coredns/plugin/metrics" "github.com/caddyserver/caddy" "github.com/infobloxopen/go-trees/iptree" @@ -37,11 +36,6 @@ func setup(c *caddy.Controller) error { return a }) - // Register all metrics. - c.OnStartup(func() error { - metrics.MustRegister(c, RequestBlockCount, RequestAllowCount) - return nil - }) return nil } |