Skip to content

Commit 07ff170

Browse files
committed
Do not register core metrics in init
Fixes panic when both etcd and kine are in use Signed-off-by: Brad Davidson <[email protected]>
1 parent a864589 commit 07ff170

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

pkg/app/app.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,9 @@ func run(c *cli.Context) error {
198198
if !metricsIgnoreTLSConfig {
199199
metricsConfig.ServerTLSConfig = config.ServerTLSConfig
200200
}
201-
go metrics.Serve(ctx, metricsConfig)
202201
config.MetricsRegisterer = metrics.Registry
202+
metrics.RegisterCoreCollectors()
203+
go metrics.Serve(ctx, metricsConfig)
203204
_, err := endpoint.Listen(ctx, config)
204205
if err != nil {
205206
return err

pkg/metrics/registry.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ type RegistererGatherer interface {
1212

1313
var Registry RegistererGatherer = prometheus.NewRegistry()
1414

15-
func init() {
15+
func RegisterCoreCollectors() {
1616
Registry.MustRegister(
1717
// expose process metrics like CPU, Memory, file descriptor usage etc.
1818
collectors.NewProcessCollector(collectors.ProcessCollectorOpts{}),

0 commit comments

Comments
 (0)