refactor: replace NewRegistry with safer GetOrCreateRegistry (#17948) (#17949)

those calls should not panic but replace them with a safer
alternative to prevent future issues

(cherry picked from commit 48aa45e)

Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com>

Author: mergify[bot]

internal/beatcmd/beat.go

@@ -486,20 +486,20 @@ func (b *Beat) registerStateMetrics() {
 	stateRegistry := b.Monitoring.StateRegistry()
 
 	// state.service
-	serviceRegistry := stateRegistry.NewRegistry("service")
+	serviceRegistry := stateRegistry.GetOrCreateRegistry("service")
 	monitoring.NewString(serviceRegistry, "version").Set(b.Info.Version)
 	monitoring.NewString(serviceRegistry, "name").Set(b.Info.Beat)
 	monitoring.NewString(serviceRegistry, "id").Set(b.Info.ID.String())
 
 	// state.beat
-	beatRegistry := stateRegistry.NewRegistry("beat")
+	beatRegistry := stateRegistry.GetOrCreateRegistry("beat")
 	monitoring.NewString(beatRegistry, "name").Set(b.Info.Name)
 
 	// state.host
 	monitoring.NewFunc(stateRegistry, "host", host.ReportInfo("" /* don't use FQDN */), monitoring.Report)
 
 	// state.management
-	managementRegistry := stateRegistry.NewRegistry("management")
+	managementRegistry := stateRegistry.GetOrCreateRegistry("management")
 	monitoring.NewBool(managementRegistry, "enabled").Set(b.Manager.Enabled())
 }
 
@@ -785,7 +785,7 @@ func (b *Beat) registerClusterUUIDFetching() (func(), error) {
 // Build and return a callback to fetch the Elasticsearch cluster_uuid for monitoring
 func (b *Beat) clusterUUIDFetchingCallback() elasticsearch.ConnectCallback {
 	stateRegistry := b.Monitoring.StateRegistry()
-	elasticsearchRegistry := stateRegistry.NewRegistry("outputs.elasticsearch")
+	elasticsearchRegistry := stateRegistry.GetOrCreateRegistry("outputs.elasticsearch")
 	clusterUUIDRegVar := monitoring.NewString(elasticsearchRegistry, "cluster_uuid")
 
 	callback := func(esClient *eslegclient.Connection, _ *logp.Logger) error {
@@ -823,7 +823,7 @@ func (b *Beat) setupMonitoring() (report.Reporter, error) {
 	// Expose monitoring.cluster_uuid in state API
 	if monitoringClusterUUID != "" {
 		stateRegistry := b.Monitoring.StateRegistry()
-		monitoringRegistry := stateRegistry.NewRegistry("monitoring")
+		monitoringRegistry := stateRegistry.GetOrCreateRegistry("monitoring")
 		clusterUUIDRegVar := monitoring.NewString(monitoringRegistry, "cluster_uuid")
 		clusterUUIDRegVar.Set(monitoringClusterUUID)
 	}

internal/beater/beater.go

@@ -715,7 +715,7 @@ func (s *Runner) newFinalBatchProcessor(
 ) (modelpb.BatchProcessor, func(context.Context) error, error) {
 	if s.elasticsearchOutputConfig == nil {
 		s.beatMonitoring.StatsRegistry().Remove("libbeat")
-		libbeatMonitoringRegistry := s.beatMonitoring.StatsRegistry().NewRegistry("libbeat")
+		libbeatMonitoringRegistry := s.beatMonitoring.StatsRegistry().GetOrCreateRegistry("libbeat")
 		return s.newLibbeatFinalBatchProcessor(tracer, libbeatMonitoringRegistry, logger)
 	}
 

internal/beater/beater_test.go

@@ -126,7 +126,7 @@ func sourcemapSearchResponseBody(name string, version string, bundlePath string)
 func TestQueryClusterUUIDRegistriesExist(t *testing.T) {
 	stateRegistry := monitoring.NewRegistry()
 
-	elasticsearchRegistry := stateRegistry.NewRegistry("outputs.elasticsearch")
+	elasticsearchRegistry := stateRegistry.GetOrCreateRegistry("outputs.elasticsearch")
 	monitoring.NewString(elasticsearchRegistry, "cluster_uuid")
 
 	const clusterUUID = "abc123"