diff --git a/main.go b/main.go index fb47fb1bc..fafd52663 100644 --- a/main.go +++ b/main.go @@ -65,8 +65,8 @@ func main() { log.Infof("setting displayName to %s", loadedConfig.DisplayName) } - log.Infof("NGINX Agent %s at %s with pid %d, clientID=%s name=%s", - version, commit, os.Getpid(), loadedConfig.ClientID, loadedConfig.DisplayName) + log.Infof("NGINX Agent %s at %s with pid %d, clientID=%s name=%s features=%v", + version, commit, os.Getpid(), loadedConfig.ClientID, loadedConfig.DisplayName, loadedConfig.Features) sdkGRPC.InitMeta(loadedConfig.ClientID, loadedConfig.CloudAccountID) controller, commander, reporter := createGrpcClients(ctx, loadedConfig) diff --git a/src/core/config/defaults.go b/src/core/config/defaults.go index 2ecf4a2b5..9c9487b7b 100644 --- a/src/core/config/defaults.go +++ b/src/core/config/defaults.go @@ -250,6 +250,7 @@ var ( &StringSliceFlag{ Name: FeaturesKey, Usage: "A comma-separated list of features enabled for the agent.", + DefaultValue: Defaults.Features, }, // NGINX Config &StringFlag{ diff --git a/src/plugins/dataplane_status_test.go b/src/plugins/dataplane_status_test.go index 05578ae5e..35fa2e88d 100644 --- a/src/plugins/dataplane_status_test.go +++ b/src/plugins/dataplane_status_test.go @@ -96,9 +96,11 @@ func TestDPSSyncAgentConfigChange(t *testing.T) { testName: "ValuesToUpdate", config: &config.Config{ Tags: tutils.InitialConfTags, + Features: config.Defaults.Features, }, expUpdatedConfig: &config.Config{ Tags: updateTags, + Features: config.Defaults.Features, }, updatedTags: true, }, @@ -106,9 +108,11 @@ func TestDPSSyncAgentConfigChange(t *testing.T) { testName: "NoValuesToUpdate", config: &config.Config{ Tags: tutils.InitialConfTags, + Features: config.Defaults.Features, }, expUpdatedConfig: &config.Config{ Tags: tutils.InitialConfTags, + Features: config.Defaults.Features, }, updatedTags: false, }, diff --git a/src/plugins/metrics_test.go b/src/plugins/metrics_test.go index 259512548..f4ce17d35 100644 --- a/src/plugins/metrics_test.go +++ b/src/plugins/metrics_test.go @@ -211,6 +211,7 @@ func TestMetrics_Process_AgentConfigChanged(t *testing.T) { CollectionInterval: 10, Mode: "streaming", }, + Features: config.Defaults.Features, }, expUpdatedConfig: &config.Config{ ClientID: "12345", @@ -221,6 +222,7 @@ func TestMetrics_Process_AgentConfigChanged(t *testing.T) { CollectionInterval: 10, Mode: "aggregated", }, + Features: config.Defaults.Features, }, updatedTags: false, }, diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/core/config/defaults.go b/test/performance/vendor/github.com/nginx/agent/v2/src/core/config/defaults.go index 2ecf4a2b5..9c9487b7b 100644 --- a/test/performance/vendor/github.com/nginx/agent/v2/src/core/config/defaults.go +++ b/test/performance/vendor/github.com/nginx/agent/v2/src/core/config/defaults.go @@ -250,6 +250,7 @@ var ( &StringSliceFlag{ Name: FeaturesKey, Usage: "A comma-separated list of features enabled for the agent.", + DefaultValue: Defaults.Features, }, // NGINX Config &StringFlag{