Revert "[memorylimiter] Fix cgroups parsing (open-telemetry#6825)" (o…

…pen-telemetry#7142) This reverts commit ede9e0a.
coralogix · Feb 6, 2023 · f7af599 · f7af599
1 parent d587e1d
commit f7af599
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git a/.chloggen/fix-memory-limiter.yaml b/.chloggen/fix-memory-limiter.yaml
diff --git a/internal/cgroups/cgroups.go b/internal/cgroups/cgroups.go
@@ -104,9 +104,7 @@ func NewCGroups(procPathMountInfo, procPathCGroup string) (CGroups, error) {
 			if err != nil {
 				return err
 			}
-			if strings.HasPrefix(cgroupPath, "/sys") {
-				cgroups[opt] = NewCGroup(cgroupPath)
-			}
+			cgroups[opt] = NewCGroup(cgroupPath)
 		}
 
 		return nil

diff --git a/internal/cgroups/testdata/proc/cgroups/mountinfo b/internal/cgroups/testdata/proc/cgroups/mountinfo
@@ -6,5 +6,3 @@
 6 5 0:5 / /sys/fs/cgroup/cpuset rw,nosuid,nodev,noexec,relatime shared:6 - cgroup cgroup rw,cpuset
 7 5 0:6 /docker /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:7 - cgroup cgroup rw,cpu,cpuacct
 8 5 0:7 /docker /sys/fs/cgroup/memory rw,nosuid,nodev,noexec,relatime shared:8 - cgroup cgroup rw,memory
-9 1 0:8 / /var/lib/docker/overlay2/9054a95f2cf7296867089e1bd37931742a17eb3308a795d51adb2654ee2276df/merged/sys/fs/cgroup ro,nosuid,nodev,noexec,relatime - tmpfs tmpfs rw,mode=755
-10 9 0:9 /docker /var/lib/docker/overlay2/9054a95f2cf7296867089e1bd37931742a17eb3308a795d51adb2654ee2276df/merged/sys/fs/cgroup/memory ro,nosuid,nodev,noexec,relatime master:17 - cgroup cgroup rw,memory