Skip to content

Commit 937e9a7

Browse files
committed
check if tags removal works
1 parent 1489eb3 commit 937e9a7

2 files changed

Lines changed: 17 additions & 17 deletions

File tree

checks/process_common.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ type ProcessCommon struct {
2424
}
2525

2626
// Process tags for top usage
27-
const (
28-
TopCPU string = "usage:top-cpu"
29-
TopMemory string = "usage:top-mem"
30-
TopIORead string = "usage:top-io-read"
31-
TopIOWrite string = "usage:top-io-write"
32-
)
27+
//const (
28+
// TopCPU string = "usage:top-cpu"
29+
// TopMemory string = "usage:top-mem"
30+
// TopIORead string = "usage:top-io-read"
31+
// TopIOWrite string = "usage:top-io-write"
32+
//)
3333

3434
// returns a function to filter short-lived and blacklisted processes based on the configuration provided
3535
func keepProcess(cfg *config.AgentConfig) func(*ProcessCommon) bool {
@@ -109,7 +109,7 @@ func getProcessInclusions(commonProcesses []*ProcessCommon, cfg *config.AgentCon
109109
}
110110

111111
if totalCPUUsage >= float32(cfg.CPUPercentageUsageThreshold) {
112-
cpuProcessChan <- deriveFmapTagProcess(addTagToProcessCommon(TopCPU), sortAndTakeN(cpuProcesses, percentageSort, cfg.AmountTopCPUPercentageUsage))
112+
cpuProcessChan <- deriveFmapTagProcess(sortAndTakeN(cpuProcesses, percentageSort, cfg.AmountTopCPUPercentageUsage))
113113
} else {
114114
cpuProcessChan <- make([]*ProcessCommon, 0)
115115
}
@@ -124,7 +124,7 @@ func getProcessInclusions(commonProcesses []*ProcessCommon, cfg *config.AgentCon
124124

125125
return sortingFunc
126126
}
127-
ioReadProcessesChan <- deriveFmapTagProcess(addTagToProcessCommon(TopIORead), sortAndTakeN(ioReadProcesses, readIOSort, cfg.AmountTopIOReadUsage))
127+
ioReadProcessesChan <- deriveFmapTagProcess(sortAndTakeN(ioReadProcesses, readIOSort, cfg.AmountTopIOReadUsage))
128128
}()
129129

130130
// Top Write IO Using Processes, insert into chunked slice and strip from chunk slice
@@ -136,7 +136,7 @@ func getProcessInclusions(commonProcesses []*ProcessCommon, cfg *config.AgentCon
136136

137137
return sortingFunc
138138
}
139-
ioWriteProcessesChan <- deriveFmapTagProcess(addTagToProcessCommon(TopIOWrite), sortAndTakeN(ioWriteProcesses, writeIOSort, cfg.AmountTopIOWriteUsage))
139+
ioWriteProcessesChan <- deriveFmapTagProcess(sortAndTakeN(ioWriteProcesses, writeIOSort, cfg.AmountTopIOWriteUsage))
140140
}()
141141

142142
// Top Memory Using Processes, insert into chunked slice and strip from chunk slice
@@ -150,7 +150,7 @@ func getProcessInclusions(commonProcesses []*ProcessCommon, cfg *config.AgentCon
150150
}
151151

152152
if totalMemUsage >= uint64(cfg.MemoryUsageThreshold) {
153-
memoryProcessesChan <- deriveFmapTagProcess(addTagToProcessCommon(TopMemory), sortAndTakeN(memoryProcesses, memorySort, cfg.AmountTopMemoryUsage))
153+
memoryProcessesChan <- deriveFmapTagProcess(sortAndTakeN(memoryProcesses, memorySort, cfg.AmountTopMemoryUsage))
154154
} else {
155155
memoryProcessesChan <- make([]*ProcessCommon, 0)
156156
}

checks/process_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -353,10 +353,10 @@ func TestProcessInclusions(t *testing.T) {
353353
Pid int
354354
Tags Tags
355355
}{
356-
{2, map[string]struct{}{TopMemory: {}}},
357-
{4, map[string]struct{}{TopCPU: {}}},
358-
{6, map[string]struct{}{TopIORead: {}}},
359-
{8, map[string]struct{}{TopIOWrite: {}}},
356+
{2, map[string]struct{}{}},
357+
{4, map[string]struct{}{}},
358+
{6, map[string]struct{}{}},
359+
{8, map[string]struct{}{}},
360360
},
361361
totalCPUpercentage: 25,
362362
totalMemory: 40,
@@ -422,7 +422,7 @@ func TestProcessInclusions(t *testing.T) {
422422
expectedPidsTags: []struct {
423423
Pid int
424424
Tags Tags
425-
}{{1, map[string]struct{}{TopMemory: {}, TopCPU: {}, TopIORead: {}, TopIOWrite: {}}}},
425+
}{{1, map[string]struct{}{}}},
426426
totalCPUpercentage: 25,
427427
totalMemory: 40,
428428
},
@@ -488,8 +488,8 @@ func TestProcessInclusions(t *testing.T) {
488488
Pid int
489489
Tags Tags
490490
}{
491-
{6, map[string]struct{}{TopIORead: {}}},
492-
{8, map[string]struct{}{TopIOWrite: {}}},
491+
{6, map[string]struct{}{}},
492+
{8, map[string]struct{}{}},
493493
},
494494
totalCPUpercentage: 10,
495495
totalMemory: 10,

0 commit comments

Comments
 (0)