From ac74256295d6ae751bb7cce2efa34709077fd0e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Mar 2023 11:06:53 +0100
Subject: [chore]: Bump go.uber.org/automaxprocs from 1.5.1 to 1.5.2 (#1633)

Bumps [go.uber.org/automaxprocs](https://github.com/uber-go/automaxprocs) from 1.5.1 to 1.5.2.
- [Release notes](https://github.com/uber-go/automaxprocs/releases)
- [Changelog](https://github.com/uber-go/automaxprocs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uber-go/automaxprocs/compare/v1.5.1...v1.5.2)

---
updated-dependencies:
- dependency-name: go.uber.org/automaxprocs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../automaxprocs/internal/cgroups/cgroups2.go      | 27 +++++++++++++++++++---
 .../automaxprocs/internal/runtime/runtime.go       |  2 +-
 .../go.uber.org/automaxprocs/maxprocs/version.go   |  2 +-
 3 files changed, 26 insertions(+), 5 deletions(-)

(limited to 'vendor/go.uber.org')

diff --git a/vendor/go.uber.org/automaxprocs/internal/cgroups/cgroups2.go b/vendor/go.uber.org/automaxprocs/internal/cgroups/cgroups2.go
index 66930d0ac..3ac10c8b6 100644
--- a/vendor/go.uber.org/automaxprocs/internal/cgroups/cgroups2.go
+++ b/vendor/go.uber.org/automaxprocs/internal/cgroups/cgroups2.go
@@ -59,6 +59,7 @@ var ErrNotV2 = errors.New("not using cgroups2")
 // CGroups2 provides access to cgroups data for systems using cgroups2.
 type CGroups2 struct {
 	mountPoint string
+	groupPath  string
 	cpuMaxFile string
 }
 
@@ -66,10 +67,10 @@ type CGroups2 struct {
 //
 // This returns ErrNotV2 if the system is not using cgroups2.
 func NewCGroups2ForCurrentProcess() (*CGroups2, error) {
-	return newCGroups2FromMountInfo(_procPathMountInfo)
+	return newCGroups2From(_procPathMountInfo, _procPathCGroup)
 }
 
-func newCGroups2FromMountInfo(mountInfoPath string) (*CGroups2, error) {
+func newCGroups2From(mountInfoPath, procPathCGroup string) (*CGroups2, error) {
 	isV2, err := isCGroupV2(mountInfoPath)
 	if err != nil {
 		return nil, err
@@ -79,8 +80,27 @@ func newCGroups2FromMountInfo(mountInfoPath string) (*CGroups2, error) {
 		return nil, ErrNotV2
 	}
 
+	subsystems, err := parseCGroupSubsystems(procPathCGroup)
+	if err != nil {
+		return nil, err
+	}
+
+	// Find v2 subsystem by looking for the `0` id
+	var v2subsys *CGroupSubsys
+	for _, subsys := range subsystems {
+		if subsys.ID == 0 {
+			v2subsys = subsys
+			break
+		}
+	}
+
+	if v2subsys == nil {
+		return nil, ErrNotV2
+	}
+
 	return &CGroups2{
 		mountPoint: _cgroupv2MountPoint,
+		groupPath:  v2subsys.Name,
 		cpuMaxFile: _cgroupv2CPUMax,
 	}, nil
 }
@@ -106,13 +126,14 @@ func isCGroupV2(procPathMountInfo string) (bool, error) {
 // It will return `cpu.max / cpu.period`. If cpu.max is set to max, it returns
 // (-1, false, nil)
 func (cg *CGroups2) CPUQuota() (float64, bool, error) {
-	cpuMaxParams, err := os.Open(path.Join(cg.mountPoint, cg.cpuMaxFile))
+	cpuMaxParams, err := os.Open(path.Join(cg.mountPoint, cg.groupPath, cg.cpuMaxFile))
 	if err != nil {
 		if os.IsNotExist(err) {
 			return -1, false, nil
 		}
 		return -1, false, err
 	}
+	defer cpuMaxParams.Close()
 
 	scanner := bufio.NewScanner(cpuMaxParams)
 	if scanner.Scan() {
diff --git a/vendor/go.uber.org/automaxprocs/internal/runtime/runtime.go b/vendor/go.uber.org/automaxprocs/internal/runtime/runtime.go
index 3a7515649..df6eacf05 100644
--- a/vendor/go.uber.org/automaxprocs/internal/runtime/runtime.go
+++ b/vendor/go.uber.org/automaxprocs/internal/runtime/runtime.go
@@ -28,6 +28,6 @@ const (
 	CPUQuotaUndefined CPUQuotaStatus = iota
 	// CPUQuotaUsed is returned when a valid CPU quota can be used
 	CPUQuotaUsed
-	// CPUQuotaMinUsed is return when CPU quota is smaller than the min value
+	// CPUQuotaMinUsed is returned when CPU quota is smaller than the min value
 	CPUQuotaMinUsed
 )
diff --git a/vendor/go.uber.org/automaxprocs/maxprocs/version.go b/vendor/go.uber.org/automaxprocs/maxprocs/version.go
index 15b156c99..108a95535 100644
--- a/vendor/go.uber.org/automaxprocs/maxprocs/version.go
+++ b/vendor/go.uber.org/automaxprocs/maxprocs/version.go
@@ -21,4 +21,4 @@
 package maxprocs
 
 // Version is the current package version.
-const Version = "1.5.1"
+const Version = "1.5.2"
-- 
cgit v1.3