Merge pull request #69 from StackVista/stac-12306-remove-label

check if tags removal works

Author: vishalxebia

checks/process_common.go

@@ -23,14 +23,6 @@ type ProcessCommon struct {
 	Tags          []string
 }
 
-// Process tags for top usage
-const (
-	TopCPU     string = "usage:top-cpu"
-	TopMemory  string = "usage:top-mem"
-	TopIORead  string = "usage:top-io-read"
-	TopIOWrite string = "usage:top-io-write"
-)
-
 // returns a function to filter short-lived and blacklisted processes based on the configuration provided
 func keepProcess(cfg *config.AgentConfig) func(*ProcessCommon) bool {
 	return func(process *ProcessCommon) bool {
@@ -68,13 +60,6 @@ func sortAndTakeN(processes []*ProcessCommon, sortingFunc func([]*ProcessCommon)
 	return topNProcesses
 }
 
-func addTagToProcessCommon(tag string) func(*ProcessCommon) *ProcessCommon {
-	return func(process *ProcessCommon) *ProcessCommon {
-		process.Tags = append(process.Tags, tag)
-		return process
-	}
-}
-
 func getProcessInclusions(commonProcesses []*ProcessCommon, cfg *config.AgentConfig, totalCPUUsage float32, totalMemUsage uint64) []*ProcessCommon {
 	cpuProcessChan := make(chan []*ProcessCommon)
 	cpuProcesses := make([]*ProcessCommon, len(commonProcesses))
@@ -109,7 +94,7 @@ func getProcessInclusions(commonProcesses []*ProcessCommon, cfg *config.AgentCon
 		}
 
 		if totalCPUUsage >= float32(cfg.CPUPercentageUsageThreshold) {
-			cpuProcessChan <- deriveFmapTagProcess(addTagToProcessCommon(TopCPU), sortAndTakeN(cpuProcesses, percentageSort, cfg.AmountTopCPUPercentageUsage))
+			cpuProcessChan <- sortAndTakeN(cpuProcesses, percentageSort, cfg.AmountTopCPUPercentageUsage)
 		} else {
 			cpuProcessChan <- make([]*ProcessCommon, 0)
 		}
@@ -124,7 +109,7 @@ func getProcessInclusions(commonProcesses []*ProcessCommon, cfg *config.AgentCon
 
 			return sortingFunc
 		}
-		ioReadProcessesChan <- deriveFmapTagProcess(addTagToProcessCommon(TopIORead), sortAndTakeN(ioReadProcesses, readIOSort, cfg.AmountTopIOReadUsage))
+		ioReadProcessesChan <- sortAndTakeN(ioReadProcesses, readIOSort, cfg.AmountTopIOReadUsage)
 	}()
 
 	// Top Write IO Using Processes, insert into chunked slice and strip from chunk slice
@@ -136,7 +121,7 @@ func getProcessInclusions(commonProcesses []*ProcessCommon, cfg *config.AgentCon
 
 			return sortingFunc
 		}
-		ioWriteProcessesChan <- deriveFmapTagProcess(addTagToProcessCommon(TopIOWrite), sortAndTakeN(ioWriteProcesses, writeIOSort, cfg.AmountTopIOWriteUsage))
+		ioWriteProcessesChan <- sortAndTakeN(ioWriteProcesses, writeIOSort, cfg.AmountTopIOWriteUsage)
 	}()
 
 	// Top Memory Using Processes, insert into chunked slice and strip from chunk slice
@@ -150,7 +135,7 @@ func getProcessInclusions(commonProcesses []*ProcessCommon, cfg *config.AgentCon
 		}
 
 		if totalMemUsage >= uint64(cfg.MemoryUsageThreshold) {
-			memoryProcessesChan <- deriveFmapTagProcess(addTagToProcessCommon(TopMemory), sortAndTakeN(memoryProcesses, memorySort, cfg.AmountTopMemoryUsage))
+			memoryProcessesChan <- sortAndTakeN(memoryProcesses, memorySort, cfg.AmountTopMemoryUsage)
 		} else {
 			memoryProcessesChan <- make([]*ProcessCommon, 0)
 		}

checks/process_test.go

@@ -274,7 +274,6 @@ func TestProcessBlacklisting(t *testing.T) {
 }
 
 func TestProcessInclusions(t *testing.T) {
-	type Tags = map[string]struct{}
 	for _, tc := range []struct {
 		name                        string
 		processes                   []*ProcessCommon
@@ -284,10 +283,7 @@ func TestProcessInclusions(t *testing.T) {
 		amountTopIOWriteUsage       int
 		amountTopMemoryUsage        int
 		memoryUsageThreshold        int
-		expectedPidsTags            []struct {
-			Pid  int
-			Tags Tags
-		}
+		expectedPids        		[]int
 		totalCPUpercentage float32
 		totalMemory        uint64
 	}{
@@ -349,15 +345,7 @@ func TestProcessInclusions(t *testing.T) {
 			amountTopIOWriteUsage:       1,
 			amountTopMemoryUsage:        1,
 			memoryUsageThreshold:        35,
-			expectedPidsTags: []struct {
-				Pid  int
-				Tags Tags
-			}{
-				{2, map[string]struct{}{TopMemory: {}}},
-				{4, map[string]struct{}{TopCPU: {}}},
-				{6, map[string]struct{}{TopIORead: {}}},
-				{8, map[string]struct{}{TopIOWrite: {}}},
-			},
+			expectedPids: 				 []int {2, 4, 6, 8},
 			totalCPUpercentage: 25,
 			totalMemory:        40,
 		},
@@ -419,10 +407,7 @@ func TestProcessInclusions(t *testing.T) {
 			amountTopIOWriteUsage:       1,
 			amountTopMemoryUsage:        1,
 			memoryUsageThreshold:        35,
-			expectedPidsTags: []struct {
-				Pid  int
-				Tags Tags
-			}{{1, map[string]struct{}{TopMemory: {}, TopCPU: {}, TopIORead: {}, TopIOWrite: {}}}},
+			expectedPids: 				 []int {1},
 			totalCPUpercentage: 25,
 			totalMemory:        40,
 		},
@@ -484,13 +469,7 @@ func TestProcessInclusions(t *testing.T) {
 			amountTopIOWriteUsage:       1,
 			amountTopMemoryUsage:        1,
 			memoryUsageThreshold:        35,
-			expectedPidsTags: []struct {
-				Pid  int
-				Tags Tags
-			}{
-				{6, map[string]struct{}{TopIORead: {}}},
-				{8, map[string]struct{}{TopIOWrite: {}}},
-			},
+			expectedPids: 			     []int {6, 8},
 			totalCPUpercentage: 10,
 			totalMemory:        10,
 		},
@@ -509,12 +488,8 @@ func TestProcessInclusions(t *testing.T) {
 			assert.True(t, len(processInclusions) <= maxTopProcesses, fmt.Sprintf("Way too many top processes reported: %d > %d", len(processInclusions), maxTopProcesses))
 
 			for _, proc := range processInclusions {
-				sort.Strings(proc.Tags)
-				pidTags := struct {
-					Pid  int
-					Tags Tags
-				}{int(proc.Pid), deriveSet(proc.Tags)}
-				assert.Contains(t, tc.expectedPidsTags, pidTags, fmt.Sprintf("Expected pids/tags: %v, found pid/tag: %v", tc.expectedPidsTags, pidTags))
+				pids := int(proc.Pid)
+				assert.Contains(t, tc.expectedPids, pids, fmt.Sprintf("Expected pids/tags: %v, found pid/tag: %v", tc.expectedPids, pids))
 			}
 		})
 	}