summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>2023-07-24 10:13:31 +0000
committerLibravatar GitHub <noreply@github.com>2023-07-24 10:13:31 +0000
commitb7891bb46249b147c824e5a44577f1ebb9efa7be (patch)
treeb399158373606592ecc0b7f6dbf8875e1be20e51
parent[chore] Disable the right webfinger test (#2018) (diff)
downloadgotosocial-b7891bb46249b147c824e5a44577f1ebb9efa7be.tar.xz
[chore]: Bump go.uber.org/automaxprocs from 1.5.2 to 1.5.3 (#2020)
-rw-r--r--go.mod2
-rw-r--r--go.sum4
-rw-r--r--vendor/go.uber.org/automaxprocs/internal/cgroups/cgroups.go4
-rw-r--r--vendor/go.uber.org/automaxprocs/internal/cgroups/cgroups2.go4
-rw-r--r--vendor/go.uber.org/automaxprocs/internal/cgroups/mountpoint.go4
-rw-r--r--vendor/modules.txt2
6 files changed, 14 insertions, 6 deletions
diff --git a/go.mod b/go.mod
index 665b96562..a105c3398 100644
--- a/go.mod
+++ b/go.mod
@@ -58,7 +58,7 @@ require (
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0
go.opentelemetry.io/otel/sdk v1.16.0
go.opentelemetry.io/otel/trace v1.16.0
- go.uber.org/automaxprocs v1.5.2
+ go.uber.org/automaxprocs v1.5.3
golang.org/x/crypto v0.11.0
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
golang.org/x/image v0.9.0
diff --git a/go.sum b/go.sum
index 406f6bd98..be2b7eaf1 100644
--- a/go.sum
+++ b/go.sum
@@ -668,8 +668,8 @@ go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJP
go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/automaxprocs v1.5.2 h1:2LxUOGiR3O6tw8ui5sZa2LAaHnsviZdVOUZw4fvbnME=
-go.uber.org/automaxprocs v1.5.2/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
+go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
+go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
diff --git a/vendor/go.uber.org/automaxprocs/internal/cgroups/cgroups.go b/vendor/go.uber.org/automaxprocs/internal/cgroups/cgroups.go
index e6c173197..e89f54360 100644
--- a/vendor/go.uber.org/automaxprocs/internal/cgroups/cgroups.go
+++ b/vendor/go.uber.org/automaxprocs/internal/cgroups/cgroups.go
@@ -110,8 +110,8 @@ func (cg CGroups) CPUQuota() (float64, bool, error) {
}
cfsPeriodUs, err := cpuCGroup.readInt(_cgroupCPUCFSPeriodUsParam)
- if err != nil {
- return -1, false, err
+ if defined := cfsPeriodUs > 0; err != nil || !defined {
+ return -1, defined, err
}
return float64(cfsQuotaUs) / float64(cfsPeriodUs), true, nil
diff --git a/vendor/go.uber.org/automaxprocs/internal/cgroups/cgroups2.go b/vendor/go.uber.org/automaxprocs/internal/cgroups/cgroups2.go
index 3ac10c8b6..78556062f 100644
--- a/vendor/go.uber.org/automaxprocs/internal/cgroups/cgroups2.go
+++ b/vendor/go.uber.org/automaxprocs/internal/cgroups/cgroups2.go
@@ -159,6 +159,10 @@ func (cg *CGroups2) CPUQuota() (float64, bool, error) {
if err != nil {
return -1, false, err
}
+
+ if period == 0 {
+ return -1, false, errors.New("zero value for period is not allowed")
+ }
}
return float64(max) / float64(period), true, nil
diff --git a/vendor/go.uber.org/automaxprocs/internal/cgroups/mountpoint.go b/vendor/go.uber.org/automaxprocs/internal/cgroups/mountpoint.go
index 2efde4c4b..f3877f78a 100644
--- a/vendor/go.uber.org/automaxprocs/internal/cgroups/mountpoint.go
+++ b/vendor/go.uber.org/automaxprocs/internal/cgroups/mountpoint.go
@@ -95,8 +95,12 @@ func NewMountPointFromLine(line string) (*MountPoint, error) {
for i, field := range fields[_miFieldIDOptionalFields:] {
if field == _mountInfoOptionalFieldsSep {
+ // End of optional fields.
fsTypeStart := _miFieldIDOptionalFields + i + 1
+ // Now we know where the optional fields end, split the line again with a
+ // limit to avoid issues with spaces in super options as present on WSL.
+ fields = strings.SplitN(line, _mountInfoSep, fsTypeStart+_miFieldCountSecondHalf)
if len(fields) != fsTypeStart+_miFieldCountSecondHalf {
return nil, mountPointFormatInvalidError{line}
}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 4941d2cfc..34d27302b 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -827,7 +827,7 @@ go.opentelemetry.io/proto/otlp/collector/trace/v1
go.opentelemetry.io/proto/otlp/common/v1
go.opentelemetry.io/proto/otlp/resource/v1
go.opentelemetry.io/proto/otlp/trace/v1
-# go.uber.org/automaxprocs v1.5.2
+# go.uber.org/automaxprocs v1.5.3
## explicit; go 1.18
go.uber.org/automaxprocs/internal/cgroups
go.uber.org/automaxprocs/internal/runtime