From 2b0ee1dc3a66b6e00ccac2bb7fd202f7398c4a79 Mon Sep 17 00:00:00 2001 From: Zixuan Liu Date: Tue, 30 Sep 2025 14:50:03 +0800 Subject: [PATCH 1/3] improve: use SetupMetricsOptions instead of SetupMetrics --- libbeat/cmd/instance/beat.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libbeat/cmd/instance/beat.go b/libbeat/cmd/instance/beat.go index aa93db94b65..7e6d87d883a 100644 --- a/libbeat/cmd/instance/beat.go +++ b/libbeat/cmd/instance/beat.go @@ -345,7 +345,14 @@ func (b *Beat) createBeater(bt beat.Creator) (beat.Beater, error) { reg := b.Monitoring.StatsRegistry().GetOrCreateRegistry("libbeat") - err = metricreport.SetupMetrics(b.Info.Logger.Named("metrics"), b.Info.Beat, version.GetDefaultVersion()) //nolint:staticcheck //keep behavior for now + err = metricreport.SetupMetricsOptions(metricreport.MetricOptions{ + Name: b.Info.Beat, + Version: version.GetDefaultVersion(), + EphemeralID: b.Info.ID.String(), + Logger: b.Info.Logger.Named("metrics"), + SystemMetrics: monitoring.Default.GetOrCreateRegistry("system"), + ProcessMetrics: monitoring.Default.GetOrCreateRegistry("beat"), + }) if err != nil { return nil, err } From 8ab14f7670701c63ff52a650b0c4d47b7b71845c Mon Sep 17 00:00:00 2001 From: Zixuan Liu Date: Tue, 30 Sep 2025 15:08:00 +0800 Subject: [PATCH 2/3] improve: update EphemeralID usage --- libbeat/cmd/instance/beat.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libbeat/cmd/instance/beat.go b/libbeat/cmd/instance/beat.go index 7e6d87d883a..f9ea2196452 100644 --- a/libbeat/cmd/instance/beat.go +++ b/libbeat/cmd/instance/beat.go @@ -348,7 +348,7 @@ func (b *Beat) createBeater(bt beat.Creator) (beat.Beater, error) { err = metricreport.SetupMetricsOptions(metricreport.MetricOptions{ Name: b.Info.Beat, Version: version.GetDefaultVersion(), - EphemeralID: b.Info.ID.String(), + 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"), From 930da56be84792355ad2158b32dd8a507a899467 Mon Sep 17 00:00:00 2001 From: Zixuan Liu Date: Tue, 30 Sep 2025 15:29:35 +0800 Subject: [PATCH 3/3] Fix style --- libbeat/cmd/instance/beat.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libbeat/cmd/instance/beat.go b/libbeat/cmd/instance/beat.go index f9ea2196452..7787d72f5b4 100644 --- a/libbeat/cmd/instance/beat.go +++ b/libbeat/cmd/instance/beat.go @@ -348,7 +348,7 @@ func (b *Beat) createBeater(bt beat.Creator) (beat.Beater, error) { err = metricreport.SetupMetricsOptions(metricreport.MetricOptions{ Name: b.Info.Beat, Version: version.GetDefaultVersion(), - EphemeralID: metricreport.EphemeralID().String(), // nolint:staticcheck //keep behavior for now + 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"),