@@ -78,6 +78,20 @@ func init() {
7878 cntFileDeliv .Register (routesRegistry .newRegistry ("deliverFile" ))
7979 cntGetPGP .Register (routesRegistry .newRegistry ("getPGPKey" ))
8080 cntAuditUnenroll .Register (routesRegistry .newRegistry ("auditUnenroll" ))
81+ << << << < HEAD
82+ == == == =
83+
84+ err := report .SetupMetricsOptions (report.MetricOptions {
85+ Logger : zap .NewStub ("instance-metrics" ),
86+ Name : build .ServiceName ,
87+ Version : version .DefaultVersion ,
88+ SystemMetrics : monitoring .NewRegistry (),
89+ ProcessMetrics : registry .registry ,
90+ })
91+ if err != nil {
92+ zerolog .Ctx (context .TODO ()).Error ().Err (err ).Msg ("unable to initialize metrics" ) // TODO is used because this may logged during the package load
93+ }
94+ >> >> >> > 898 abd5 (build (deps ): bump github .com / elastic / elastic - agent - system - metrics from 0.11 .18 to 0.12 .0 (#5273 ))
8195}
8296
8397// metricsRegistry wraps libbeat and prometheus registries
@@ -91,7 +105,7 @@ func newMetricsRegistry(name string) *metricsRegistry {
91105 reg := monitoring .Default
92106 return & metricsRegistry {
93107 fullName : name ,
94- registry : reg .NewRegistry (name ),
108+ registry : reg .GetOrCreateRegistry (name ),
95109 promReg : prometheus .NewRegistry (),
96110 }
97111}
@@ -103,7 +117,7 @@ func (r *metricsRegistry) newRegistry(name string) *metricsRegistry {
103117 }
104118 return & metricsRegistry {
105119 fullName : fullName ,
106- registry : r .registry .NewRegistry (name ),
120+ registry : r .registry .GetOrCreateRegistry (name ),
107121 promReg : r .promReg ,
108122 }
109123}
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?v=4&size=40){kind=avatar}
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?v=4&size=40){kind=avatar}
0 commit comments