process_metrics_linux.go: make sure that getCgroupV2Path() returns a path, which doesnt end with a slash

valyala · valyala · commit 75b6cfb9b749 · 2025-08-03T21:59:58.000+02:00
This avoids double slashes in the constructed cgroup paths like in the comment VictoriaMetrics/VictoriaLogs#517 (comment) .
diff --git a/process_metrics_linux.go b/process_metrics_linux.go
@@ -413,5 +413,8 @@ func getCgroupV2Path() string {
 	if len(tmp) != 2 {
 		return ""
 	}
-	return "/sys/fs/cgroup" + strings.TrimSpace(tmp[1])
+	path := "/sys/fs/cgroup" + strings.TrimSpace(tmp[1])
+
+	// Drop trailing slash if it exsits. This prevents from '//' in the constructed paths by the caller.
+	return strings.TrimSuffix(path, "/")
 }

Original file line number	Diff line number	Diff line change
`@@ -413,5 +413,8 @@ func getCgroupV2Path() string {`
`413`	`413`	`if len(tmp) != 2 {`
`414`	`414`	`return ""`
`415`	`415`	`}`
`416`		`- return "/sys/fs/cgroup" + strings.TrimSpace(tmp[1])`
	`416`	`+ path := "/sys/fs/cgroup" + strings.TrimSpace(tmp[1])`
	`417`	`+`
	`418`	`+ // Drop trailing slash if it exsits. This prevents from '//' in the constructed paths by the caller.`
	`419`	`+ return strings.TrimSuffix(path, "/")`
`417`	`420`	`}`