Ensure Re-register of metrics variables after a reload (#2080)

* - ensure plugins that use prometheus.MustRegister, re-register after reload
- removing once.Do on the startup function was simplest way to do it.

* - fix underscored names (advice of bot)

* - tune existing UT for reload, and add a test verifying failing reload does not prevent correct registering for metrics

* - ensure different ports for tests that can run in same time ..
This commit is contained in:
Francois Tur
2018-09-19 05:11:24 -04:00
committed by Yong Tang
parent cb932ca231
commit f9bdd382dd
13 changed files with 143 additions and 43 deletions

View File

@@ -3,7 +3,6 @@ package cache
import (
"context"
"math"
"sync"
"time"
"github.com/coredns/coredns/plugin"
@@ -126,5 +125,3 @@ var (
Help: "The number responses that are not cached, because the reply is malformed.",
}, []string{"server"})
)
var once sync.Once

View File

@@ -34,11 +34,9 @@ func setup(c *caddy.Controller) error {
})
c.OnStartup(func() error {
once.Do(func() {
metrics.MustRegister(c,
cacheSize, cacheHits, cacheMisses,
cachePrefetches, cacheDrops)
})
metrics.MustRegister(c,
cacheSize, cacheHits, cacheMisses,
cachePrefetches, cacheDrops)
return nil
})