Make reregistration of prom metrics resilient to v0 + v2 (#584)

reddit · Nov 4, 2022 · 5fc5cda · 5fc5cda
1 parent c06ebf3
commit 5fc5cda
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/internal/admin/server.go b/internal/admin/server.go
@@ -35,11 +35,11 @@ func init() {
 
 	Mux.Handle("/metrics", promhttp.Handler())
 
-	// Unregister the default GoCollector.
-	prometheus.Unregister(collectors.NewGoCollector())
-
-	// Register GoCollector with baseplate defaults.
-	prometheus.MustRegister(collectors.NewGoCollector(baseplateGoCollectors))
+	// Unregister the default GoCollector, and reregister with baseplate defaults
+	if prometheus.Unregister(collectors.NewGoCollector()) {
+		// Only register a new collector if we unregistered one to avoid double-reregistration
+		prometheus.MustRegister(collectors.NewGoCollector(baseplateGoCollectors))
+	}
 }
 
 func Serve() error {