@@ -74,7 +74,13 @@ func init() {
7474 cntGetPGP .Register (routesRegistry .newRegistry ("getPGPKey" ))
7575 cntAuditUnenroll .Register (routesRegistry .newRegistry ("auditUnenroll" ))
7676
77- err := report .SetupMetrics (zap .NewStub ("instance-metrics" ), build .ServiceName , version .DefaultVersion , monitoring .NewRegistry (), registry .registry )
77+ err := report .SetupMetricsOptions (report.MetricOptions {
78+ Logger : zap .NewStub ("instance-metrics" ),
79+ Name : build .ServiceName ,
80+ Version : version .DefaultVersion ,
81+ SystemMetrics : monitoring .NewRegistry (),
82+ ProcessMetrics : registry .registry ,
83+ })
7884 if err != nil {
7985 zerolog .Ctx (context .TODO ()).Error ().Err (err ).Msg ("unable to initialize metrics" ) // TODO is used because this may logged during the package load
8086 }
@@ -91,7 +97,7 @@ func newMetricsRegistry(name string) *metricsRegistry {
9197 reg := monitoring .Default
9298 return & metricsRegistry {
9399 fullName : name ,
94- registry : reg .NewRegistry (name ),
100+ registry : reg .GetOrCreateRegistry (name ),
95101 promReg : prometheus .NewRegistry (),
96102 }
97103}
@@ -103,7 +109,7 @@ func (r *metricsRegistry) newRegistry(name string) *metricsRegistry {
103109 }
104110 return & metricsRegistry {
105111 fullName : fullName ,
106- registry : r .registry .NewRegistry (name ),
112+ registry : r .registry .GetOrCreateRegistry (name ),
107113 promReg : r .promReg ,
108114 }
109115}
0 commit comments