From afe62633e3b6c1a8fe0779a444fa9af13097a5ff Mon Sep 17 00:00:00 2001 From: Edwin Buck Date: Tue, 3 Dec 2024 09:52:45 -0800 Subject: [PATCH] Remove plugin load / binding logging, per review comments. Signed-off-by: Edwin Buck --- pkg/common/catalog/catalog.go | 7 ------- pkg/common/catalog/plugin.go | 2 -- 2 files changed, 9 deletions(-) diff --git a/pkg/common/catalog/catalog.go b/pkg/common/catalog/catalog.go index 4490aa43a3..4efa946083 100644 --- a/pkg/common/catalog/catalog.go +++ b/pkg/common/catalog/catalog.go @@ -181,20 +181,16 @@ func Load(ctx context.Context, config *Config, repo Repository) (_ *Catalog, err if err != nil { return nil, err } - log.Infof("bindablePluginRepos: %+v", pluginRepos) serviceRepos, err := makeBindableServiceRepos(repo.Services()) if err != nil { return nil, err } - log.Infof("bindableServiceRepos: %+v", serviceRepos) pluginCounts := make(map[string]int) var reconfigurers Reconfigurers for _, pluginConfig := range config.PluginConfigs { - log.Infof("plugin(%s): processing", pluginConfig.Name) - pluginLog := makePluginLog(config.Log, pluginConfig) pluginRepo, ok := pluginRepos[pluginConfig.Type] @@ -205,7 +201,6 @@ func Load(ctx context.Context, config *Config, repo Repository) (_ *Catalog, err } continue } - log.Infof("plugin(%s): supported", pluginConfig.Name) if pluginConfig.Disabled { pluginLog.Debug("Not loading plugin; disabled") @@ -227,7 +222,6 @@ func Load(ctx context.Context, config *Config, repo Repository) (_ *Catalog, err // panic, etc.) we want the defer above to close the plugin. Failure to // do so can orphan external plugin processes. closers = append(closers, pluginCloser{plugin: plugin, log: pluginLog}) - log.Infof("plugin(%s): loaded", pluginConfig.Name) configurer, err := plugin.bindRepos(pluginRepo, serviceRepos) if err != nil { @@ -237,7 +231,6 @@ func Load(ctx context.Context, config *Config, repo Repository) (_ *Catalog, err return nil, fmt.Errorf("failed to bind plugin %q: %w", pluginConfig.Name, err) } } - log.Infof("plugin(%s): bound, configurer %+v", pluginConfig.Name, configurer) if !config.ValidateOnly { reconfigurer, err := configurePlugin(ctx, pluginLog, config.CoreConfig, configurer, pluginConfig.DataSource) diff --git a/pkg/common/catalog/plugin.go b/pkg/common/catalog/plugin.go index 7804ddeb91..c48357fe78 100644 --- a/pkg/common/catalog/plugin.go +++ b/pkg/common/catalog/plugin.go @@ -101,11 +101,9 @@ func (p *pluginImpl) initFacade(facade Facade) any { func (p *pluginImpl) bindRepos(pluginRepo bindablePluginRepo, serviceRepos []bindableServiceRepo) (Configurer, error) { grpcServiceNames := grpcServiceNameSet(p.grpcServiceNames) - p.log.Infof("plugin %q binding repos", p.info.Name()) impl := p.bindRepo(pluginRepo, grpcServiceNames) for _, serviceRepo := range serviceRepos { - p.log.Infof("plugin %q binding repo %+v", p.info.Name(), serviceRepo) p.bindRepo(serviceRepo, grpcServiceNames) }