From 73ea23e8cb6707eca418c12e9a666189f52095bc Mon Sep 17 00:00:00 2001 From: Zixuan Liu Date: Thu, 2 Oct 2025 20:24:49 +0800 Subject: [PATCH] [libbeat] use SetupMetricsOptions instead of SetupMetrics (#46313) --------- Co-authored-by: Anderson Queiroz (cherry picked from commit 2d5086e1205e3c741953b92cf818889c06ca1e23) # Conflicts: # libbeat/cmd/instance/beat.go --- libbeat/cmd/instance/beat.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libbeat/cmd/instance/beat.go b/libbeat/cmd/instance/beat.go index bace72a057ad..101c17aba5ae 100644 --- a/libbeat/cmd/instance/beat.go +++ b/libbeat/cmd/instance/beat.go @@ -344,7 +344,18 @@ func (b *Beat) createBeater(bt beat.Creator) (beat.Beater, error) { reg := b.Monitoring.StatsRegistry().GetOrCreateRegistry("libbeat") +<<<<<<< HEAD err = metricreport.SetupMetrics(b.Info.Logger.Named("metrics"), b.Info.Beat, version.GetDefaultVersion()) +======= + err = metricreport.SetupMetricsOptions(metricreport.MetricOptions{ + Name: b.Info.Beat, + Version: version.GetDefaultVersion(), + EphemeralID: metricreport.EphemeralID().String(), //nolint:staticcheck //keep behavior for now + Logger: b.Info.Logger.Named("metrics"), + SystemMetrics: monitoring.Default.GetOrCreateRegistry("system"), + ProcessMetrics: monitoring.Default.GetOrCreateRegistry("beat"), + }) +>>>>>>> 2d5086e12 ([libbeat] use SetupMetricsOptions instead of SetupMetrics (#46313)) if err != nil { return nil, err }