Skip to content

Commit 014564d

Browse files
nodecemergify[bot]
authored andcommitted
[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
1 parent 75793bc commit 014564d

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

libbeat/cmd/instance/beat.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,18 @@ func (b *Beat) createBeater(bt beat.Creator) (beat.Beater, error) {
349349
reg = monitoring.Default.NewRegistry("libbeat")
350350
}
351351

352+
<<<<<<< HEAD
352353
err = metricreport.SetupMetrics(logp.NewLogger("metrics"), b.Info.Beat, version.GetDefaultVersion())
354+
=======
355+
err = metricreport.SetupMetricsOptions(metricreport.MetricOptions{
356+
Name: b.Info.Beat,
357+
Version: version.GetDefaultVersion(),
358+
EphemeralID: metricreport.EphemeralID().String(), //nolint:staticcheck //keep behavior for now
359+
Logger: b.Info.Logger.Named("metrics"),
360+
SystemMetrics: monitoring.Default.GetOrCreateRegistry("system"),
361+
ProcessMetrics: monitoring.Default.GetOrCreateRegistry("beat"),
362+
})
363+
>>>>>>> 2d5086e12 ([libbeat] use SetupMetricsOptions instead of SetupMetrics (#46313))
353364
if err != nil {
354365
return nil, err
355366
}

0 commit comments

Comments
 (0)