sync with base repo

Dockerfile

@@ -1,5 +1,15 @@
-FROM golang:1.23.8-bullseye AS builder
-RUN apt update && apt install -y libsystemd-dev
+FROM debian:bullseye AS builder
+# Using Debian instead of the official Golang image because it’s based on newer OS versions
+# with newer glibc, which causes compatibility issues.
+
+RUN apt-get update && apt-get install -y \
+    curl git build-essential pkg-config libsystemd-dev
+
+ARG GO_VERSION=1.24.9
+RUN curl -fsSL https://go.dev/dl/go${GO_VERSION}.linux-$(dpkg --print-architecture).tar.gz -o go.tar.gz && \
+    tar -C /usr/local -xzf go.tar.gz && rm go.tar.gz
+ENV PATH="/usr/local/go/bin:${PATH}"
+
 WORKDIR /tmp/src
 COPY go.mod .
 COPY go.sum .

cgroup/cgroup.go

@@ -23,7 +23,7 @@ var (
 	crioIdRegexp        = regexp.MustCompile(`crio-([a-z0-9]{64})`)
 	containerdIdRegexp  = regexp.MustCompile(`cri-containerd[-:]([a-z0-9]{64})`)
 	lxcIdRegexp         = regexp.MustCompile(`/lxc/([^/]+)`)
-	systemSliceIdRegexp = regexp.MustCompile(`(/(system|runtime|reserved)\.slice/([^/]+))`)
+	systemSliceIdRegexp = regexp.MustCompile(`(/(system|runtime|reserved|kube|azure|podruntime)\.slice/([^/]+))`)
 	talosIdRegexp       = regexp.MustCompile(`/(system|podruntime)/([^/]+)`)
 	lxcPayloadRegexp    = regexp.MustCompile(`/lxc\.payload\.([^/]+)`)
 )
@@ -162,7 +162,7 @@ func containerByCgroup(cgroupPath string) (ContainerType, string, error) {
 	switch {
 	case cgroupPath == "/init":
 		return ContainerTypeTalosRuntime, "/talos/init", nil
-	case prefix == "user.slice" || prefix == "init.scope":
+	case prefix == "user.slice" || prefix == "init.scope" || prefix == "systemd":
 		return ContainerTypeStandaloneProcess, "", nil
 	case prefix == "docker" || (prefix == "system.slice" && len(parts) > 1 && strings.HasPrefix(parts[1], "docker-")):
 		matches := dockerIdRegexp.FindStringSubmatch(cgroupPath)
@@ -193,7 +193,10 @@ func containerByCgroup(cgroupPath string) (ContainerType, string, error) {
 			return ContainerTypeUnknown, "", fmt.Errorf("invalid talos runtime cgroup %s", cgroupPath)
 		}
 		return ContainerTypeTalosRuntime, path.Join("/talos/", matches[2]), nil
-	case prefix == "system.slice" || prefix == "runtime.slice" || prefix == "reserved.slice":
+	case prefix == "system.slice" || prefix == "runtime.slice" || prefix == "reserved.slice" || prefix == "kube.slice" || prefix == "azure.slice" || prefix == "podruntime.slice":
+		if strings.HasSuffix(cgroupPath, ".scope") {
+			return ContainerTypeStandaloneProcess, "", nil
+		}
 		matches := systemSliceIdRegexp.FindStringSubmatch(cgroupPath)
 		if matches == nil {
 			return ContainerTypeUnknown, "", fmt.Errorf("invalid systemd cgroup %s", cgroupPath)

cgroup/cgroup_test.go

@@ -161,6 +161,26 @@ func TestContainerByCgroup(t *testing.T) {
 	as.Equal("/reserved.slice/kubelet.service", id)
 	as.Nil(err)
 
+	typ, id, err = containerByCgroup("/kube.slice/kubelet.service")
+	as.Equal(typ, ContainerTypeSystemdService)
+	as.Equal("/kube.slice/kubelet.service", id)
+	as.Nil(err)
+
+	typ, id, err = containerByCgroup("/azure.slice/walinuxagent.service")
+	as.Equal(typ, ContainerTypeSystemdService)
+	as.Equal("/azure.slice/walinuxagent.service", id)
+	as.Nil(err)
+
+	typ, id, err = containerByCgroup("/podruntime.slice/containerd.service")
+	as.Equal(typ, ContainerTypeSystemdService)
+	as.Equal("/podruntime.slice/containerd.service", id)
+	as.Nil(err)
+
+	typ, id, err = containerByCgroup("/podruntime.slice/kubelet.service")
+	as.Equal(typ, ContainerTypeSystemdService)
+	as.Equal("/podruntime.slice/kubelet.service", id)
+	as.Nil(err)
+
 	typ, id, err = containerByCgroup("/system.slice/system-postgresql.slice/postgresql@9.4-main.service")
 	as.Equal(typ, ContainerTypeSystemdService)
 	as.Equal("/system.slice/system-postgresql.slice", id)
@@ -195,4 +215,24 @@ func TestContainerByCgroup(t *testing.T) {
 	as.Equal(ContainerTypeStandaloneProcess, typ)
 	as.Equal("", id)
 	as.Nil(err)
+
+	typ, id, err = containerByCgroup("/systemd/system.slice")
+	as.Equal(ContainerTypeStandaloneProcess, typ)
+	as.Equal("", id)
+	as.Nil(err)
+
+	typ, id, err = containerByCgroup("/system.slice/cri-containerd-69e8ded3c33c9d5e2b93acd74787b17a8629f74d6707bc5bb9b2e095337d0263.scope")
+	as.Equal(ContainerTypeStandaloneProcess, typ)
+	as.Equal("", id)
+	as.Nil(err)
+
+	typ, id, err = containerByCgroup("/system.slice/run-ra2ddf9594bbf4a1986439b594f89eb0f.scope")
+	as.Equal(ContainerTypeStandaloneProcess, typ)
+	as.Equal("", id)
+	as.Nil(err)
+
+	typ, id, err = containerByCgroup("/system.slice/docker-ba7b10d15d16e10e3de7a2dcd408a3d971169ae303f46cfad4c5453c6326fee2.scope")
+	as.Equal(ContainerTypeDocker, typ)
+	as.Equal("ba7b10d15d16e10e3de7a2dcd408a3d971169ae303f46cfad4c5453c6326fee2", id)
+	as.Nil(err)
 }

cgroup/cpu.go

@@ -16,7 +16,7 @@ type CPUStat struct {
 	LimitCores           float64
 }
 
-func (cg Cgroup) CpuStat() *CPUStat {
+func (cg *Cgroup) CpuStat() *CPUStat {
 	cpu, cpuacct := cg.subsystems["cpu"], cg.subsystems["cpuacct"]
 	if cpu == "" || cpuacct == "" {
 		st, _ := cg.cpuStatV2()
@@ -26,7 +26,7 @@ func (cg Cgroup) CpuStat() *CPUStat {
 	return st
 }
 
-func (cg Cgroup) cpuStatV1() (*CPUStat, error) {
+func (cg *Cgroup) cpuStatV1() (*CPUStat, error) {
 	if cg.subsystems["cpu"] == "" || cg.subsystems["cpuacct"] == "" {
 		return nil, nil
 	}
@@ -56,7 +56,7 @@ func (cg Cgroup) cpuStatV1() (*CPUStat, error) {
 	return res, nil
 }
 
-func (cg Cgroup) cpuStatV2() (*CPUStat, error) {
+func (cg *Cgroup) cpuStatV2() (*CPUStat, error) {
 	if cg.subsystems[""] == "" {
 		return nil, nil
 	}

cgroup/fixtures/cgroup/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod8712f785_1a3e_41ec_a00b_e2dcc77431cb.slice/docker-73051af271105c07e1f493b34856a77e665e3b0b4fc72f76c807dfbffeb881bd.scope/cpu.pressure

@@ -0,0 +1,2 @@
+some avg10=0.00 avg60=0.00 avg300=0.00 total=465907442
+full avg10=0.00 avg60=0.00 avg300=0.00 total=463529433

cgroup/fixtures/cgroup/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod8712f785_1a3e_41ec_a00b_e2dcc77431cb.slice/docker-73051af271105c07e1f493b34856a77e665e3b0b4fc72f76c807dfbffeb881bd.scope/io.pressure

@@ -0,0 +1,2 @@
+some avg10=0.00 avg60=0.00 avg300=0.05 total=17657662684
+full avg10=0.00 avg60=0.00 avg300=0.05 total=17636951020

cgroup/fixtures/cgroup/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod8712f785_1a3e_41ec_a00b_e2dcc77431cb.slice/docker-73051af271105c07e1f493b34856a77e665e3b0b4fc72f76c807dfbffeb881bd.scope/memory.pressure

@@ -0,0 +1,2 @@
+some avg10=0.00 avg60=0.00 avg300=0.00 total=6937313991
+full avg10=0.00 avg60=0.00 avg300=0.00 total=6934649214

cgroup/memory.go

@@ -48,8 +48,8 @@ func (cg *Cgroup) memoryStatV1() (*MemoryStat, error) {
 	//	 mapped_file is accounted only when the memory cgroup is owner of page
 	//	 cache.)
 	return &MemoryStat{
-		RSS:   vars["rss"] + vars["mapped_file"],
-		Cache: vars["cache"],
+		RSS:   vars["total_rss"] + vars["total_mapped_file"],
+		Cache: vars["total_cache"],
 		Limit: limit,
 	}, nil
 }

cgroup/psi.go

@@ -0,0 +1,85 @@
+package cgroup
+
+import (
+	"os"
+	"path"
+	"strconv"
+	"strings"
+
+	"github.com/coroot/coroot-node-agent/common"
+	"k8s.io/klog/v2"
+)
+
+type PSIStats struct {
+	CPUSecondsSome    float64
+	CPUSecondsFull    float64
+	MemorySecondsSome float64
+	MemorySecondsFull float64
+	IOSecondsSome     float64
+	IOSecondsFull     float64
+}
+
+type PressureTotals struct {
+	SomeSecondsTotal float64
+	FullSecondsTotal float64
+}
+
+func (cg *Cgroup) PSI() *PSIStats {
+	if cg.subsystems[""] == "" {
+		return nil
+	}
+	stats := &PSIStats{}
+	for _, controller := range []string{"cpu", "memory", "io"} {
+		p, err := cg.readPressure(controller)
+		if err != nil {
+			if !common.IsNotExist(err) {
+				klog.Warningln(err)
+			}
+			return nil
+		}
+		switch controller {
+		case "cpu":
+			stats.CPUSecondsSome = p.SomeSecondsTotal
+			stats.CPUSecondsFull = p.FullSecondsTotal
+		case "memory":
+			stats.MemorySecondsSome = p.SomeSecondsTotal
+			stats.MemorySecondsFull = p.FullSecondsTotal
+		case "io":
+			stats.IOSecondsSome = p.SomeSecondsTotal
+			stats.IOSecondsFull = p.FullSecondsTotal
+		}
+	}
+	return stats
+}
+
+func (cg *Cgroup) readPressure(controller string) (*PressureTotals, error) {
+	data, err := os.ReadFile(path.Join(cg2Root, cg.subsystems[""], controller+".pressure"))
+	if err != nil {
+		return nil, err
+	}
+	pressure := &PressureTotals{}
+	for _, line := range strings.Split(strings.TrimSpace(string(data)), "\n") {
+		parts := strings.Fields(line)
+		if len(parts) == 0 {
+			continue
+		}
+		kind := parts[0]
+		for _, p := range parts[1:] {
+			if strings.HasPrefix(p, "total=") {
+				vStr := strings.TrimPrefix(p, "total=")
+				v, err := strconv.ParseUint(vStr, 10, 64)
+				if err != nil {
+					return nil, err
+				}
+				switch kind {
+				case "some":
+					pressure.SomeSecondsTotal = float64(v) / 1e6 // microseconds to seconds
+				case "full":
+					pressure.FullSecondsTotal = float64(v) / 1e6
+				}
+				break
+			}
+		}
+	}
+	return pressure, nil
+}

cgroup/psi_test.go

@@ -0,0 +1,27 @@
+package cgroup
+
+import (
+	"path"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCgroupPSI(t *testing.T) {
+	cgRoot = "fixtures/cgroup"
+	cg2Root = "fixtures/cgroup"
+
+	cg, _ := NewFromProcessCgroupFile(path.Join("fixtures/proc/400/cgroup"))
+	stat := cg.PSI()
+	require.NotNil(t, stat)
+	assert.Equal(t, float64(465907442)/1e6, stat.CPUSecondsSome)
+	assert.Equal(t, float64(463529433)/1e6, stat.CPUSecondsFull)
+	assert.Equal(t, float64(6937313991)/1e6, stat.MemorySecondsSome)
+	assert.Equal(t, float64(6934649214)/1e6, stat.MemorySecondsFull)
+	assert.Equal(t, float64(17657662684)/1e6, stat.IOSecondsSome)
+	assert.Equal(t, float64(17636951020)/1e6, stat.IOSecondsFull)
+
+	cg, _ = NewFromProcessCgroupFile(path.Join("fixtures/proc/100/cgroup"))
+	assert.Nil(t, cg.PSI())
+}

containers/app.go

@@ -122,6 +122,8 @@ func guessApplicationTypeByCmdline(cmdline []byte) string {
 		return "java"
 	case bytes.HasSuffix(cmd, []byte("ollama")):
 		return "ollama"
+	case bytes.HasSuffix(cmd, []byte("fdbserver")):
+		return "foundationdb"
 	case bytes.Contains(cmd, []byte("victoria-metrics")) ||
 		bytes.Contains(cmd, []byte("vmstorage")) ||
 		bytes.Contains(cmd, []byte("vminsert")) ||