Skip to content

[9.1] (backport #18154) Remove last remaining NewRegistry method call #18182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 14, 2025
Merged

[9.1] (backport #18154) Remove last remaining NewRegistry method call #18182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions internal/beater/beater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,9 +966,12 @@ func queryClusterUUID(ctx context.Context, esClient *elasticsearch.Client, state
// Running under elastic-agent, the callback linked above is not
// registered until later, meaning we need to check and instantiate the
// registries if they don't exist.
elasticsearchRegistry := stateRegistry.GetRegistry(outputES)
elasticsearchRegistry := stateRegistry.GetOrCreateRegistry(outputES)
if elasticsearchRegistry == nil {
elasticsearchRegistry = stateRegistry.NewRegistry(outputES)
// This can only happen if "outputs.elasticsearch" was already created as
// a non-registry (scalar) value, but in that unlikely chance, let's still
// report a comprehensible error.
return fmt.Errorf("couldn't create registry: %v", outputES)
}

var (
Expand Down
Loading