Merge pull request #75 from StackVista/STAC-13016-revert

Revert "Merge pull request #73 from StackVista/STAC-13016"

Author: hierynomus

config/config.go

@@ -323,10 +323,7 @@ func NewAgentConfig(agentIni *File, agentYaml *YamlAgentConfig, networkYaml *Yam
 		v, _ := agentIni.Get("Main", "process_agent_enabled")
 		if enabled, err := isAffirmative(v); enabled {
 			cfg.Enabled = true
-			checks := []string{}
-			checks = append(checks, processChecks...)
-			checks = append(checks, containerChecks...)
-			cfg.EnabledChecks = checks
+			cfg.EnabledChecks = processChecks
 		} else if !enabled && err == nil { // Only want to disable the process agent if it's explicitly disabled
 			cfg.Enabled = false
 		}
@@ -510,10 +507,7 @@ func mergeEnvironmentVariables(c *AgentConfig) *AgentConfig {
 	var err error
 	if enabled, err := isAffirmative(os.Getenv("DD_PROCESS_AGENT_ENABLED")); enabled {
 		c.Enabled = true
-		checks := []string{}
-		checks = append(checks, processChecks...)
-		checks = append(checks, containerChecks...)
-		c.EnabledChecks = checks
+		c.EnabledChecks = processChecks
 	} else if !enabled && err == nil {
 		c.Enabled = false
 	}

config/config_test.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	"fmt"
+	"github.com/StackVista/stackstate-process-agent/util"
 	"net/http"
 	"net/url"
 	"os"
@@ -13,8 +14,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/StackVista/stackstate-process-agent/util"
-
 	"github.com/DataDog/gopsutil/process"
 	ddconfig "github.com/StackVista/stackstate-agent/pkg/config"
 	"github.com/go-ini/ini"
@@ -617,8 +616,7 @@ func TestDDAgentConfigYamlOnly(t *testing.T) {
 	assert.Equal(true, agentConfig.Enabled)
 	assert.Equal(true, agentConfig.EnableIncrementalPublishing)
 	assert.Equal(1*time.Minute, agentConfig.IncrementalPublishingRefreshInterval)
-	containsAllOf(assert, processChecks, agentConfig.EnabledChecks)
-	containsAllOf(assert, containerChecks, agentConfig.EnabledChecks)
+	assert.Equal(processChecks, agentConfig.EnabledChecks)
 	assert.Equal(8*time.Second, agentConfig.CheckIntervals["container"])
 	assert.Equal(30*time.Second, agentConfig.CheckIntervals["process"])
 	assert.Equal(100, agentConfig.Windows.ArgsRefreshInterval)
@@ -654,8 +652,7 @@ func TestDDAgentConfigYamlOnly(t *testing.T) {
 	assert.Equal(true, agentConfig.Enabled)
 	assert.Equal(false, agentConfig.EnableIncrementalPublishing)
 	assert.Equal(2*time.Minute, agentConfig.IncrementalPublishingRefreshInterval)
-	containsAllOf(assert, processChecks, agentConfig.EnabledChecks)
-	containsAllOf(assert, containerChecks, agentConfig.EnabledChecks)
+	assert.Equal(containerChecks, agentConfig.EnabledChecks)
 	assert.Equal(-1, agentConfig.Windows.ArgsRefreshInterval)
 	assert.Equal(true, agentConfig.Windows.AddNewArgs)
 	assert.Equal(true, agentConfig.Scrubber.Enabled)
@@ -796,8 +793,7 @@ func TestDDAgentConfigYamlAndNetworkConfig(t *testing.T) {
 	assert.Equal(10, agentConfig.QueueSize)
 	assert.Equal(true, agentConfig.AllowRealTime)
 	assert.Equal(true, agentConfig.Enabled)
-	containsAllOf(assert, processChecks, agentConfig.EnabledChecks)
-	containsAllOf(assert, containerChecks, agentConfig.EnabledChecks)
+	assert.Equal(processChecks, agentConfig.EnabledChecks)
 	assert.Equal(8*time.Second, agentConfig.CheckIntervals["container"])
 	assert.Equal(30*time.Second, agentConfig.CheckIntervals["process"])
 	assert.Equal(100, agentConfig.Windows.ArgsRefreshInterval)
@@ -825,9 +821,7 @@ func TestDDAgentConfigYamlAndNetworkConfig(t *testing.T) {
 	assert.Equal(false, agentConfig.Windows.AddNewArgs)
 	assert.Equal(false, agentConfig.Scrubber.Enabled)
 	assert.Equal("/var/my-location/network-tracer.log", agentConfig.NetworkTracerSocketPath)
-	containsAllOf(assert, processChecks, agentConfig.EnabledChecks)
-	containsAllOf(assert, containerChecks, agentConfig.EnabledChecks)
-	assert.Contains(agentConfig.EnabledChecks, "connections")
+	assert.Equal(append(processChecks, "connections"), agentConfig.EnabledChecks)
 }
 
 func TestStackStateNetworkConfigFromMainAgentConfig(t *testing.T) {
@@ -871,9 +865,7 @@ func TestStackStateNetworkConfigFromMainAgentConfig(t *testing.T) {
 	assert.Equal(8*time.Second, agentConfig.CheckIntervals["container"])
 	assert.Equal(30*time.Second, agentConfig.CheckIntervals["process"])
 	assert.Equal(true, agentConfig.NetworkInitialConnectionsFromProc)
-	containsAllOf(assert, processChecks, agentConfig.EnabledChecks)
-	containsAllOf(assert, containerChecks, agentConfig.EnabledChecks)
-	assert.Contains(agentConfig.EnabledChecks, "connections")
+	assert.Equal(append(processChecks, "connections"), agentConfig.EnabledChecks)
 	assert.Equal(10*time.Minute, agentConfig.NetworkRelationCacheDurationMin)
 	assert.Equal(15*time.Minute, agentConfig.ProcessCacheDurationMin)
 	assert.Equal(false, agentConfig.EnableShortLivedProcessFilter)
@@ -1317,9 +1309,3 @@ func TestNetworkTracerInitRetry_FromYaml(t *testing.T) {
 	assert.Equal(t, 10, agentConfig.NetworkTracerInitRetryAmount)
 	assert.Equal(t, 50*time.Second, agentConfig.NetworkTracerInitRetryDuration)
 }
-
-func containsAllOf(a *assert.Assertions, contains, coll []string) {
-	for _, c := range contains {
-		a.Contains(coll, c)
-	}
-}

config/yaml_config.go

@@ -156,18 +156,12 @@ func mergeYamlConfig(agentConf *AgentConfig, yc *YamlAgentConfig) (*AgentConfig,
 
 	if enabled, err := isAffirmative(yc.Process.Enabled); enabled {
 		agentConf.Enabled = true
-		checks := []string{}
-		checks = append(checks, processChecks...)
-		checks = append(checks, containerChecks...)
-		agentConf.EnabledChecks = checks
+		agentConf.EnabledChecks = processChecks
 	} else if strings.ToLower(yc.Process.Enabled) == "disabled" {
 		agentConf.Enabled = false
 	} else if !enabled && err == nil {
 		agentConf.Enabled = true
-		checks := []string{}
-		checks = append(checks, processChecks...)
-		checks = append(checks, containerChecks...)
-		agentConf.EnabledChecks = checks
+		agentConf.EnabledChecks = containerChecks
 	}
 
 	if yc.LogToConsole {