From ee86dbc151bdceeac439591c838ec6926ce8e8dc Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Mon, 9 Sep 2024 11:15:59 -0700 Subject: [PATCH] [chore] [discoverer] Remove redundant memoization (#5330) The is no need to memoize the bundle config because the whole retrieved is memoized. So "" key access cannot happen twice --- internal/confmapprovider/discovery/provider.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/internal/confmapprovider/discovery/provider.go b/internal/confmapprovider/discovery/provider.go index 41b910f352..39726ad7b8 100644 --- a/internal/confmapprovider/discovery/provider.go +++ b/internal/confmapprovider/discovery/provider.go @@ -169,17 +169,13 @@ func (m *Provider) retrieve(scheme string) func(context.Context, string, confmap if m.retrieved != nil { return m.retrieved, nil } - var bundledCfg *Config - if bundledCfg, ok = m.configs[""]; !ok { - m.logger.Debug("loading bundle.d") - bundledCfg = NewConfig(m.logger) - if err := bundledCfg.LoadFS(bundle.BundledFS); err != nil { - m.logger.Error("failed loading bundle.d", zap.Error(err)) - return nil, err - } - m.logger.Debug("successfully loaded bundle.d") - m.configs[""] = bundledCfg + m.logger.Debug("loading bundle.d") + bundledCfg := NewConfig(m.logger) + if err := bundledCfg.LoadFS(bundle.BundledFS); err != nil { + m.logger.Error("failed loading bundle.d", zap.Error(err)) + return nil, err } + m.logger.Debug("successfully loaded bundle.d") if err := mergeConfigWithBundle(cfg, bundledCfg); err != nil { return nil, fmt.Errorf("failed merging user and bundled discovery configs: %w", err) }