improve Docker container ID parsing from /proc/pid/cgroup (#578)

grafana · Jan 29, 2024 · 8291c0e · 8291c0e
1 parent fb4bd1a
commit 8291c0e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pkg/internal/helpers/container/container.go b/pkg/internal/helpers/container/container.go
@@ -30,7 +30,7 @@ type Info struct {
 // where the last <hex...> chain is the container ID inside its Pod
 // The /docker/<hex...> part might not be visible inside the Pod (e.g. deploying Beyla
 // as a sidecar). That's why we search for the "kubelet.slice" string.
-var dockerCgroup = regexp.MustCompile(`^\d+:.*:.*/.*-(.+)\.scope$`)
+var dockerCgroup = regexp.MustCompile(`^\d+:.*:.*/.*-([\da-fA-F]+)\.scope`)
 
 // InfoForPID returns the container ID and PID namespace for the given PID.
 func InfoForPID(pid uint32) (Info, error) {

diff --git a/pkg/internal/helpers/container/container_test.go b/pkg/internal/helpers/container/container_test.go
@@ -30,6 +30,7 @@ var fixturesWithContainer = map[uint32]string{
 1:name=systemd:/docker/a2ffe0e97ac22657a2a023ad628e9df837c38a03b1ebc904d3f6d644eb1a1a81
 0::/system.slice/containerd.service`,
 	789: `0::/../cri-containerd-40c03570b6f4c30bc8d69923d37ee698f5cfcced92c7b7df1c47f6f7887378a9.scope`,
+	999: `0::/system.slice/docker-40c03570b6f4c30bc8d69923d37ee698f5cfcced92c7b7df1c47f6f7887378a9.scope/kubepods/burstable/podc55ba69a-e39f-44af-925d-c4794fd57878/264c1e319d1f6080a48a9fabcf9ac8fd9afd9a5930cf35e8d0eeb03b258c3152`,
 }
 
 var fixturesWithoutContainer = map[uint32]string{