[chore] [discoverer] Remove redundant memoization (#5330)

The is no need to memoize the bundle config because the whole retrieved is memoized. So "<bundle>" key access cannot happen twice
signalfx · Sep 9, 2024 · ee86dbc · ee86dbc
1 parent 4358510
commit ee86dbc
Showing 1 changed file with 6 additions and 10 deletions.
diff --git 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["<bundled>"]; !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["<bundled>"] = 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)
 			}