From f9bdd382ddf911c88b33d2bbd8f8aa9be2885a39 Mon Sep 17 00:00:00 2001 From: Francois Tur Date: Wed, 19 Sep 2018 05:11:24 -0400 Subject: 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 .. --- plugin/forward/setup.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'plugin/forward/setup.go') diff --git a/plugin/forward/setup.go b/plugin/forward/setup.go index 5743d73b3..23d9acfed 100644 --- a/plugin/forward/setup.go +++ b/plugin/forward/setup.go @@ -38,9 +38,7 @@ func setup(c *caddy.Controller) error { }) c.OnStartup(func() error { - once.Do(func() { - metrics.MustRegister(c, RequestCount, RcodeCount, RequestDuration, HealthcheckFailureCount, SocketGauge) - }) + metrics.MustRegister(c, RequestCount, RcodeCount, RequestDuration, HealthcheckFailureCount, SocketGauge) return f.OnStartup() }) -- cgit v1.2.3