.

SumoLogic · Dec 4, 2024 · 8b23a2c · 8b23a2c
1 parent ae41459
commit 8b23a2c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/pkg/extension/opampextension/config.go b/pkg/extension/opampextension/config.go
@@ -41,7 +41,7 @@ type Config struct {
 	AcceptsRemoteConfiguration bool `mapstructure:"accepts_remote_configuration"`
 
 	// Flag to toggle new config merge flow introduced for collector tag edit feature
-	NewConfigMergeFlowEnabled bool `mapstructure:"new_configmergeflow_enabled"`
+	NewConfigMergeFlowDisabled bool `mapstructure:"new_configmergeflow_disabled"`
 }
 
 // CreateDefaultClientConfig returns default http client settings

diff --git a/pkg/extension/opampextension/factory.go b/pkg/extension/opampextension/factory.go
@@ -36,7 +36,6 @@ func createDefaultConfig() component.Config {
 	return &Config{
 		ClientConfig:               CreateDefaultClientConfig(),
 		AcceptsRemoteConfiguration: true,
-		NewConfigMergeFlowEnabled: true,
 	}
 }
 

diff --git a/pkg/extension/opampextension/opamp_agent.go b/pkg/extension/opampextension/opamp_agent.go
@@ -192,10 +192,6 @@ func (o *opampAgent) startClient(ctx context.Context) error {
 
 	o.logger.Debug("Starting OpAMP client...")
 
-	if !o.cfg.NewConfigMergeFlowEnabled {
-		o.logger.Info("New config merge flow disabled..")
-	}
-
 	if err := o.opampClient.Start(ctx, settings); err != nil {
 		return err
 	}