fix version

Author: aphralG

src/core/config/config.go

@@ -16,6 +16,8 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
+	"reflect"
+	"sort"
 	"strings"
 	"sync"
 	"time"
@@ -254,6 +256,7 @@ func UpdateAgentConfig(systemId string, updateTags []string, updateFeatures []st
 		log.Errorf("Failed to register config: %v", err)
 		return false, err
 	}
+
 	// Update nil valued updateTags to empty slice for comparison
 	if updateTags == nil {
 		updateTags = []string{}
@@ -263,12 +266,33 @@ func UpdateAgentConfig(systemId string, updateTags []string, updateFeatures []st
 		updateFeatures = []string{}
 	}
 
+	// Sort tags and compare them
+	sort.Strings(updateTags)
+	sort.Strings(config.Tags)
+	synchronizedTags := reflect.DeepEqual(updateTags, config.Tags)
+
 	Viper.Set(TagsKey, updateTags)
 	config.Tags = Viper.GetStringSlice(TagsKey)
 
+	// Needed for legacy reasons.
+	// Remove Features_ prefix from the feature strings.
+	// This is needed for management servers that are sending features before sdk version v2.23.0
+	for index, feature := range updateFeatures {
+		updateFeatures[index] = strings.Replace(feature, "features_", "", 1)
+	}
+	sort.Strings(updateFeatures)
+	sort.Strings(config.Features)
+	synchronizedFeatures := reflect.DeepEqual(updateFeatures, config.Features)
+
 	Viper.Set(agent_config.FeaturesKey, updateFeatures)
 	config.Features = Viper.GetStringSlice(agent_config.FeaturesKey)
 
+	// If the features are already synchronized there is no need to overwrite
+	if synchronizedTags && synchronizedFeatures {
+		log.Debug("Manager and Local tags and features are already synchronized")
+		return false, nil
+	}
+
 	// Get the dynamic config path and use default dynamic config path if it's not
 	// already set.
 	dynamicCfgPath := Viper.GetString(DynamicConfigPathKey)

src/core/config/config_test.go

@@ -417,7 +417,7 @@ func TestUpdateAgentConfig(t *testing.T) {
 			updatedConfFeatures: curConf.Features,
 			expConfTags:         curConf.Tags,
 			expConfFeatures:     curConf.Features,
-			updatedConf:         true,
+			updatedConf:         false,
 		},
 		{
 			testName:            "UpdatedTags",
@@ -458,7 +458,7 @@ func TestUpdateAgentConfig(t *testing.T) {
 			// Attempt update & check results
 			updated, err := UpdateAgentConfig("12345", tc.updatedConfTags, tc.updatedConfFeatures)
 			assert.NoError(t, err)
-			assert.Equal(t, tc.updatedConf, updated)
+			assert.Equal(t, updated, tc.updatedConf)
 
 			// Get potentially updated config
 			updatedConf, err := GetConfig("12345")

src/plugins/config_reader.go

@@ -100,6 +100,7 @@ func (r *ConfigReader) updateAgentConfig(payloadAgentConfig *proto.AgentConfig)
 		}
 
 		synchronizeFeatures := false
+		synchronizeTags := false
 
 		if payloadAgentConfig.Details.Features != nil {
 			r.detailsMu.Lock()
@@ -127,14 +128,20 @@ func (r *ConfigReader) updateAgentConfig(payloadAgentConfig *proto.AgentConfig)
 			r.detailsMu.Unlock()
 		}
 
-		tags := payloadAgentConfig.Details.Tags
-		features := payloadAgentConfig.Details.Features
-		configUpdated, err := config.UpdateAgentConfig(r.config.ClientID, tags, features)
-		if err != nil {
-			log.Errorf("Failed updating Agent config - %v", err)
-		}
-		if configUpdated {
-			log.Debugf("Updated agent config on disk")
+		sort.Strings(onDiskAgentConfig.Tags)
+		sort.Strings(payloadAgentConfig.Details.Tags)
+		synchronizeTags = !reflect.DeepEqual(payloadAgentConfig.Details.Tags, onDiskAgentConfig.Tags)
+
+		if synchronizeFeatures || synchronizeTags {
+			tags := payloadAgentConfig.Details.Tags
+			features := payloadAgentConfig.Details.Features
+			configUpdated, err := config.UpdateAgentConfig(r.config.ClientID, tags, features)
+			if err != nil {
+				log.Errorf("Failed updating Agent config - %v", err)
+			}
+			if configUpdated {
+				log.Debugf("Updated agent config on disk")
+			}
 		}
 
 		if payloadAgentConfig.Details.Extensions != nil {

src/plugins/dataplane_status_test.go

@@ -239,7 +239,7 @@ func TestDPSSyncAgentConfigChange(t *testing.T) {
 				Tags:     tutils.InitialConfTags,
 				Features: config.Defaults.Features,
 			},
-			updatedTags: true,
+			updatedTags: false,
 		},
 	}
 	processID := "12345"
@@ -288,7 +288,7 @@ func TestDPSSyncAgentConfigChange(t *testing.T) {
 			// Attempt update & check results
 			updated, err := config.UpdateAgentConfig("12345", tc.expUpdatedConfig.Tags, tc.expUpdatedConfig.Features)
 			assert.Nil(t, err)
-			assert.Equal(t, tc.updatedTags, updated)
+			assert.Equal(t, updated, tc.updatedTags)
 
 			// Create message that should trigger a sync agent config call
 			msg := core.NewMessage(core.AgentConfigChanged, "")

src/plugins/metrics_test.go

@@ -229,7 +229,7 @@ func TestMetrics_Process_AgentConfigChanged(t *testing.T) {
 				},
 				Features: config.Defaults.Features,
 			},
-			updatedTags: true,
+			updatedTags: false,
 		},
 	}