Skip to content

Commit aac9ce1

Browse files
mergify[bot]nodeceAndersonQ
authored
[9.1](backport #46313) improve: use SetupMetricsOptions instead of SetupMetrics (#46902)
* [libbeat] use SetupMetricsOptions instead of SetupMetrics (#46313) --------- Co-authored-by: Anderson Queiroz <[email protected]> (cherry picked from commit 2d5086e) # Conflicts: # libbeat/cmd/instance/beat.go * fix merge conflict --------- Co-authored-by: Zixuan Liu <[email protected]> Co-authored-by: Anderson Queiroz <[email protected]>
1 parent 240cb89 commit aac9ce1

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

libbeat/cmd/instance/beat.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,14 @@ func (b *Beat) createBeater(bt beat.Creator) (beat.Beater, error) {
345345

346346
reg := b.Monitoring.StatsRegistry().GetOrCreateRegistry("libbeat")
347347

348-
err = metricreport.SetupMetrics(b.Info.Logger.Named("metrics"), b.Info.Beat, version.GetDefaultVersion())
348+
err = metricreport.SetupMetricsOptions(metricreport.MetricOptions{
349+
Name: b.Info.Beat,
350+
Version: version.GetDefaultVersion(),
351+
EphemeralID: metricreport.EphemeralID().String(), //nolint:staticcheck //keep behavior for now
352+
Logger: b.Info.Logger.Named("metrics"),
353+
SystemMetrics: monitoring.Default.GetOrCreateRegistry("system"),
354+
ProcessMetrics: monitoring.Default.GetOrCreateRegistry("beat"),
355+
})
349356
if err != nil {
350357
return nil, err
351358
}

0 commit comments

Comments
 (0)