Add peak memory reporting when using containerd metrics collector

vboulineau · vboulineau · commit 4ba20ac52069 · 2025-06-12T12:32:26.000+02:00
diff --git a/pkg/util/containers/metrics/containerd/collector_cgroupv2.go b/pkg/util/containers/metrics/containerd/collector_cgroupv2.go
@@ -62,6 +62,7 @@ func getMemoryStatsCgroupV2(memStat *v2.MemoryStat, memEvents *v2.MemoryEvents)
 		Swap:         pointer.Ptr(float64(memStat.SwapUsage)),
 		Pgfault:      pointer.Ptr(float64(memStat.Pgfault)),
 		Pgmajfault:   pointer.Ptr(float64(memStat.Pgmajfault)),
+		Peak:         pointer.Ptr(float64(memStat.MaxUsage)),
 	}
 
 	if memEvents != nil {
diff --git a/pkg/util/containers/metrics/containerd/collector_linux_test.go b/pkg/util/containers/metrics/containerd/collector_linux_test.go
@@ -145,6 +145,7 @@ func TestGetContainerStats_Containerd(t *testing.T) {
 			KernelStack:  100,
 			Pgfault:      2,
 			Pgmajfault:   1,
+			MaxUsage:     1000,
 		},
 		Io: &v2.IOStat{
 			Usage: []*v2.IOEntry{
@@ -252,6 +253,7 @@ func TestGetContainerStats_Containerd(t *testing.T) {
 					Swap:         pointer.Ptr(10.0),
 					Pgfault:      pointer.Ptr(2.0),
 					Pgmajfault:   pointer.Ptr(1.0),
+					Peak:         pointer.Ptr(1000.0),
 				},
 				IO: &provider.ContainerIOStats{
 					ReadBytes:       pointer.Ptr(60.0),

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ func getMemoryStatsCgroupV2(memStat v2.MemoryStat, memEvents v2.MemoryEvents)`
`62`	`62`	`Swap: pointer.Ptr(float64(memStat.SwapUsage)),`
`63`	`63`	`Pgfault: pointer.Ptr(float64(memStat.Pgfault)),`
`64`	`64`	`Pgmajfault: pointer.Ptr(float64(memStat.Pgmajfault)),`
	`65`	`+ Peak: pointer.Ptr(float64(memStat.MaxUsage)),`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`if memEvents != nil {`