Skip to content

Commit 238f533

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 0f58fd0 commit 238f533

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
@@ -344,7 +344,18 @@ func (b *Beat) createBeater(bt beat.Creator) (beat.Beater, error) {
344344

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

347+
<<<<<<< HEAD
347348
err = metricreport.SetupMetrics(b.Info.Logger.Named("metrics"), b.Info.Beat, version.GetDefaultVersion())
349+
=======
350+
err = metricreport.SetupMetricsOptions(metricreport.MetricOptions{
351+
Name: b.Info.Beat,
352+
Version: version.GetDefaultVersion(),
353+
EphemeralID: metricreport.EphemeralID().String(), //nolint:staticcheck //keep behavior for now
354+
Logger: b.Info.Logger.Named("metrics"),
355+
SystemMetrics: monitoring.Default.GetOrCreateRegistry("system"),
356+
ProcessMetrics: monitoring.Default.GetOrCreateRegistry("beat"),
357+
})
358+
>>>>>>> 2d5086e12 ([libbeat] use SetupMetricsOptions instead of SetupMetrics (#46313))
348359
if err != nil {
349360
return nil, err
350361
}

0 commit comments

Comments
 (0)