mirror of
https://github.com/grafana/loki.git
synced 2026-03-13 09:33:58 +08:00
fix(deps): update module github.com/shirou/gopsutil/v4 to v4.25.11 (main) (#20066)
Signed-off-by: renovate-sh-app[bot] <219655108+renovate-sh-app[bot]@users.noreply.github.com> Co-authored-by: renovate-sh-app[bot] <219655108+renovate-sh-app[bot]@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
ac5df60537
commit
76cc947951
8
go.mod
8
go.mod
@@ -148,7 +148,7 @@ require (
|
||||
github.com/prometheus/sigv4 v0.3.0
|
||||
github.com/richardartoul/molecule v1.0.0
|
||||
github.com/schollz/progressbar/v3 v3.18.0
|
||||
github.com/shirou/gopsutil/v4 v4.25.10
|
||||
github.com/shirou/gopsutil/v4 v4.25.11
|
||||
github.com/thanos-io/objstore v0.0.0-20250115091151-a54d0f04b42a
|
||||
github.com/tjhop/slog-gokit v0.1.5
|
||||
github.com/twmb/franz-go v1.20.5
|
||||
@@ -206,7 +206,7 @@ require (
|
||||
github.com/containerd/errdefs v1.0.0 // indirect
|
||||
github.com/containerd/errdefs/pkg v0.3.0 // indirect
|
||||
github.com/dlclark/regexp2 v1.11.5 // indirect
|
||||
github.com/ebitengine/purego v0.9.0 // indirect
|
||||
github.com/ebitengine/purego v0.9.1 // indirect
|
||||
github.com/envoyproxy/go-control-plane/envoy v1.35.0 // indirect
|
||||
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
|
||||
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
|
||||
@@ -276,8 +276,8 @@ require (
|
||||
github.com/sethvargo/go-retry v0.3.0 // indirect
|
||||
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
|
||||
github.com/tinylib/msgp v1.5.0 // indirect
|
||||
github.com/tklauser/go-sysconf v0.3.15 // indirect
|
||||
github.com/tklauser/numcpus v0.10.0 // indirect
|
||||
github.com/tklauser/go-sysconf v0.3.16 // indirect
|
||||
github.com/tklauser/numcpus v0.11.0 // indirect
|
||||
github.com/x448/float16 v0.8.4 // indirect
|
||||
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
|
||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
||||
|
||||
16
go.sum
16
go.sum
@@ -383,8 +383,8 @@ github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4A
|
||||
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0=
|
||||
github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
|
||||
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
|
||||
github.com/ebitengine/purego v0.9.0 h1:mh0zpKBIXDceC63hpvPuGLiJ8ZAa3DfrFTudmfi8A4k=
|
||||
github.com/ebitengine/purego v0.9.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
|
||||
github.com/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s0A=
|
||||
github.com/ebitengine/purego v0.9.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
|
||||
github.com/edsrzf/mmap-go v1.2.0 h1:hXLYlkbaPzt1SaQk+anYwKSRNhufIDCchSPkUD6dD84=
|
||||
github.com/edsrzf/mmap-go v1.2.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
|
||||
github.com/efficientgo/core v1.0.0-rc.3 h1:X6CdgycYWDcbYiJr1H1+lQGzx13o7bq3EUkbB9DsSPc=
|
||||
@@ -1074,8 +1074,8 @@ github.com/sercand/kuberesolver/v6 v6.0.0 h1:ScvS2Ga9snVkpOahln/BCLySr3/iBAHJf25
|
||||
github.com/sercand/kuberesolver/v6 v6.0.0/go.mod h1:Dxkqms3OJadP5zirIBPLi9FV8Qpys3T3w40XPEcVsu0=
|
||||
github.com/sethvargo/go-retry v0.3.0 h1:EEt31A35QhrcRZtrYFDTBg91cqZVnFL2navjDrah2SE=
|
||||
github.com/sethvargo/go-retry v0.3.0/go.mod h1:mNX17F0C/HguQMyMyJxcnU471gOZGxCLyYaFyAZraas=
|
||||
github.com/shirou/gopsutil/v4 v4.25.10 h1:at8lk/5T1OgtuCp+AwrDofFRjnvosn0nkN2OLQ6g8tA=
|
||||
github.com/shirou/gopsutil/v4 v4.25.10/go.mod h1:+kSwyC8DRUD9XXEHCAFjK+0nuArFJM0lva+StQAcskM=
|
||||
github.com/shirou/gopsutil/v4 v4.25.11 h1:X53gB7muL9Gnwwo2evPSE+SfOrltMoR6V3xJAXZILTY=
|
||||
github.com/shirou/gopsutil/v4 v4.25.11/go.mod h1:EivAfP5x2EhLp2ovdpKSozecVXn1TmuG7SMzs/Wh4PU=
|
||||
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
|
||||
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
|
||||
github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c h1:aqg5Vm5dwtvL+YgDpBcK1ITf3o96N/K7/wsRXQnUTEs=
|
||||
@@ -1128,10 +1128,10 @@ github.com/tinylib/msgp v1.5.0 h1:GWnqAE54wmnlFazjq2+vgr736Akg58iiHImh+kPY2pc=
|
||||
github.com/tinylib/msgp v1.5.0/go.mod h1:cvjFkb4RiC8qSBOPMGPSzSAx47nAsfhLVTCZZNuHv5o=
|
||||
github.com/tjhop/slog-gokit v0.1.5 h1:ayloIUi5EK2QYB8eY4DOPO95/mRtMW42lUkp3quJohc=
|
||||
github.com/tjhop/slog-gokit v0.1.5/go.mod h1:yA48zAHvV+Sg4z4VRyeFyFUNNXd3JY5Zg84u3USICq0=
|
||||
github.com/tklauser/go-sysconf v0.3.15 h1:VE89k0criAymJ/Os65CSn1IXaol+1wrsFHEB8Ol49K4=
|
||||
github.com/tklauser/go-sysconf v0.3.15/go.mod h1:Dmjwr6tYFIseJw7a3dRLJfsHAMXZ3nEnL/aZY+0IuI4=
|
||||
github.com/tklauser/numcpus v0.10.0 h1:18njr6LDBk1zuna922MgdjQuJFjrdppsZG60sHGfjso=
|
||||
github.com/tklauser/numcpus v0.10.0/go.mod h1:BiTKazU708GQTYF4mB+cmlpT2Is1gLk7XVuEeem8LsQ=
|
||||
github.com/tklauser/go-sysconf v0.3.16 h1:frioLaCQSsF5Cy1jgRBrzr6t502KIIwQ0MArYICU0nA=
|
||||
github.com/tklauser/go-sysconf v0.3.16/go.mod h1:/qNL9xxDhc7tx3HSRsLWNnuzbVfh3e7gh/BmM179nYI=
|
||||
github.com/tklauser/numcpus v0.11.0 h1:nSTwhKH5e1dMNsCdVBukSZrURJRoHbSEQjdEbY+9RXw=
|
||||
github.com/tklauser/numcpus v0.11.0/go.mod h1:z+LwcLq54uWZTX0u/bGobaV34u6V7KNlTZejzM6/3MQ=
|
||||
github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q=
|
||||
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
|
||||
github.com/twmb/franz-go v1.20.5 h1:Gj9jdkvlddf8pdrehvtDHLPult5JS8q65oITUff6dXo=
|
||||
|
||||
2
vendor/github.com/ebitengine/purego/func.go
generated
vendored
2
vendor/github.com/ebitengine/purego/func.go
generated
vendored
@@ -286,7 +286,7 @@ func RegisterFunc(fptr any, cfn uintptr) {
|
||||
|
||||
for j, val := range args[i:] {
|
||||
if val.Kind() == reflect.String {
|
||||
ptr := strings.CString(v.String())
|
||||
ptr := strings.CString(val.String())
|
||||
keepAlive = append(keepAlive, ptr)
|
||||
val = reflect.ValueOf(ptr)
|
||||
args[i+j] = val
|
||||
|
||||
2
vendor/github.com/ebitengine/purego/struct_amd64.go
generated
vendored
2
vendor/github.com/ebitengine/purego/struct_amd64.go
generated
vendored
@@ -165,7 +165,7 @@ func tryPlaceRegister(v reflect.Value, addFloat func(uintptr), addInt func(uintp
|
||||
place(f)
|
||||
case reflect.Bool:
|
||||
if f.Bool() {
|
||||
val |= 1
|
||||
val |= 1 << shift
|
||||
}
|
||||
shift += 8
|
||||
class |= _INTEGER
|
||||
|
||||
4
vendor/github.com/ebitengine/purego/struct_arm64.go
generated
vendored
4
vendor/github.com/ebitengine/purego/struct_arm64.go
generated
vendored
@@ -117,13 +117,15 @@ func placeRegisters(v reflect.Value, addFloat func(uintptr), addInt func(uintptr
|
||||
} else {
|
||||
addInt(uintptr(val))
|
||||
}
|
||||
val = 0
|
||||
class = _NO_CLASS
|
||||
}
|
||||
switch f.Type().Kind() {
|
||||
case reflect.Struct:
|
||||
place(f)
|
||||
case reflect.Bool:
|
||||
if f.Bool() {
|
||||
val |= 1
|
||||
val |= 1 << shift
|
||||
}
|
||||
shift += 8
|
||||
class |= _INT
|
||||
|
||||
2
vendor/github.com/ebitengine/purego/struct_loong64.go
generated
vendored
2
vendor/github.com/ebitengine/purego/struct_loong64.go
generated
vendored
@@ -104,7 +104,7 @@ func placeRegisters(v reflect.Value, addFloat func(uintptr), addInt func(uintptr
|
||||
place(f)
|
||||
case reflect.Bool:
|
||||
if f.Bool() {
|
||||
val |= 1
|
||||
val |= 1 << shift
|
||||
}
|
||||
shift += 8
|
||||
class |= _INT
|
||||
|
||||
2
vendor/github.com/shirou/gopsutil/v4/cpu/cpu_windows.go
generated
vendored
2
vendor/github.com/shirou/gopsutil/v4/cpu/cpu_windows.go
generated
vendored
@@ -190,7 +190,7 @@ func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
|
||||
|
||||
ppis, powerInformationErr := getProcessorPowerInformation(ctx)
|
||||
if powerInformationErr != nil {
|
||||
return ret, fmt.Errorf("failed to get processor power information: %w", err)
|
||||
return ret, fmt.Errorf("failed to get processor power information: %w", powerInformationErr)
|
||||
}
|
||||
|
||||
family, processorId, smBIOSErr := getSMBIOSProcessorInfo()
|
||||
|
||||
2
vendor/github.com/shirou/gopsutil/v4/process/process.go
generated
vendored
2
vendor/github.com/shirou/gopsutil/v4/process/process.go
generated
vendored
@@ -5,6 +5,7 @@ import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"regexp"
|
||||
"runtime"
|
||||
"sort"
|
||||
"sync"
|
||||
@@ -18,6 +19,7 @@ import (
|
||||
|
||||
var (
|
||||
invoke common.Invoker = common.Invoke{}
|
||||
strictIntPtrn = regexp.MustCompile(`^\d+$`)
|
||||
ErrorNoChildren = errors.New("process does not have children") // Deprecated: ErrorNoChildren is never returned by process.Children(), check its returned []*Process slice length instead
|
||||
ErrorProcessNotRunning = errors.New("process does not exist")
|
||||
ErrorNotPermitted = errors.New("operation not permitted")
|
||||
|
||||
3
vendor/github.com/shirou/gopsutil/v4/process/process_linux.go
generated
vendored
3
vendor/github.com/shirou/gopsutil/v4/process/process_linux.go
generated
vendored
@@ -1173,6 +1173,9 @@ func readPidsFromDir(path string) ([]int32, error) {
|
||||
return nil, err
|
||||
}
|
||||
for _, fname := range fnames {
|
||||
if !strictIntPtrn.MatchString(fname) {
|
||||
continue
|
||||
}
|
||||
pid, err := strconv.ParseInt(fname, 10, 32)
|
||||
if err != nil {
|
||||
// if not numeric name, just skip
|
||||
|
||||
3
vendor/github.com/shirou/gopsutil/v4/process/process_solaris.go
generated
vendored
3
vendor/github.com/shirou/gopsutil/v4/process/process_solaris.go
generated
vendored
@@ -289,6 +289,9 @@ func readPidsFromDir(path string) ([]int32, error) {
|
||||
return nil, err
|
||||
}
|
||||
for _, fname := range fnames {
|
||||
if !strictIntPtrn.MatchString(fname) {
|
||||
continue
|
||||
}
|
||||
pid, err := strconv.ParseInt(fname, 10, 32)
|
||||
if err != nil {
|
||||
// if not numeric name, just skip
|
||||
|
||||
1
vendor/github.com/shirou/gopsutil/v4/process/process_windows.go
generated
vendored
1
vendor/github.com/shirou/gopsutil/v4/process/process_windows.go
generated
vendored
@@ -699,6 +699,7 @@ func (p *Process) OpenFilesWithContext(ctx context.Context) ([]OpenFilesStat, er
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer windows.CloseHandle(process)
|
||||
|
||||
buffer := make([]byte, 1024)
|
||||
var size uint32
|
||||
|
||||
2
vendor/github.com/tklauser/go-sysconf/.cirrus.yml
generated
vendored
2
vendor/github.com/tklauser/go-sysconf/.cirrus.yml
generated
vendored
@@ -1,6 +1,6 @@
|
||||
env:
|
||||
CIRRUS_CLONE_DEPTH: 1
|
||||
GO_VERSION: go1.24.0
|
||||
GO_VERSION: go1.25.0
|
||||
|
||||
freebsd_13_task:
|
||||
freebsd_instance:
|
||||
|
||||
20
vendor/github.com/tklauser/go-sysconf/sysconf_netbsd.go
generated
vendored
20
vendor/github.com/tklauser/go-sysconf/sysconf_netbsd.go
generated
vendored
@@ -25,10 +25,13 @@ const (
|
||||
_POSIX2_UPE = -1
|
||||
)
|
||||
|
||||
var clktck struct {
|
||||
sync.Once
|
||||
v int64
|
||||
}
|
||||
var clktck = sync.OnceValue(func() int64 {
|
||||
ci, err := unix.SysctlClockinfo("kern.clockrate")
|
||||
if err != nil {
|
||||
return -1
|
||||
}
|
||||
return int64(ci.Hz)
|
||||
})
|
||||
|
||||
func sysconfPOSIX(name int) (int64, error) {
|
||||
// NetBSD does not define all _POSIX_* values used in sysconf_posix.go
|
||||
@@ -54,14 +57,7 @@ func sysconf(name int) (int64, error) {
|
||||
}
|
||||
return -1, nil
|
||||
case SC_CLK_TCK:
|
||||
// TODO: use sync.OnceValue once Go 1.21 is the minimal supported version
|
||||
clktck.Do(func() {
|
||||
clktck.v = -1
|
||||
if ci, err := unix.SysctlClockinfo("kern.clockrate"); err == nil {
|
||||
clktck.v = int64(ci.Hz)
|
||||
}
|
||||
})
|
||||
return clktck.v, nil
|
||||
return clktck(), nil
|
||||
case SC_NGROUPS_MAX:
|
||||
return sysctl32("kern.ngroups"), nil
|
||||
case SC_JOB_CONTROL:
|
||||
|
||||
2
vendor/github.com/tklauser/numcpus/.cirrus.yml
generated
vendored
2
vendor/github.com/tklauser/numcpus/.cirrus.yml
generated
vendored
@@ -1,6 +1,6 @@
|
||||
env:
|
||||
CIRRUS_CLONE_DEPTH: 1
|
||||
GO_VERSION: go1.24.0
|
||||
GO_VERSION: go1.25.0
|
||||
|
||||
freebsd_13_task:
|
||||
freebsd_instance:
|
||||
|
||||
10
vendor/github.com/tklauser/numcpus/numcpus_linux.go
generated
vendored
10
vendor/github.com/tklauser/numcpus/numcpus_linux.go
generated
vendored
@@ -47,10 +47,12 @@ func readCPURangeWith[T any](file string, f func(cpus string) (T, error)) (T, er
|
||||
if err != nil {
|
||||
return zero, err
|
||||
}
|
||||
return f(strings.Trim(string(buf), "\n "))
|
||||
return f(string(buf))
|
||||
}
|
||||
|
||||
func countCPURange(cpus string) (int, error) {
|
||||
cpus = strings.Trim(cpus, "\n ")
|
||||
|
||||
// Treat empty file as valid. This might be the case if there are no offline CPUs in which
|
||||
// case /sys/devices/system/cpu/offline is empty.
|
||||
if cpus == "" {
|
||||
@@ -58,7 +60,7 @@ func countCPURange(cpus string) (int, error) {
|
||||
}
|
||||
|
||||
n := int(0)
|
||||
for _, cpuRange := range strings.Split(cpus, ",") {
|
||||
for cpuRange := range strings.SplitSeq(cpus, ",") {
|
||||
if cpuRange == "" {
|
||||
return 0, fmt.Errorf("empty CPU range in CPU string %q", cpus)
|
||||
}
|
||||
@@ -84,13 +86,15 @@ func countCPURange(cpus string) (int, error) {
|
||||
}
|
||||
|
||||
func listCPURange(cpus string) ([]int, error) {
|
||||
cpus = strings.Trim(cpus, "\n ")
|
||||
|
||||
// See comment in countCPURange.
|
||||
if cpus == "" {
|
||||
return []int{}, nil
|
||||
}
|
||||
|
||||
list := []int{}
|
||||
for _, cpuRange := range strings.Split(cpus, ",") {
|
||||
for cpuRange := range strings.SplitSeq(cpus, ",") {
|
||||
if cpuRange == "" {
|
||||
return nil, fmt.Errorf("empty CPU range in CPU string %q", cpus)
|
||||
}
|
||||
|
||||
12
vendor/modules.txt
vendored
12
vendor/modules.txt
vendored
@@ -806,7 +806,7 @@ github.com/eapache/go-xerial-snappy
|
||||
# github.com/eapache/queue v1.1.0
|
||||
## explicit
|
||||
github.com/eapache/queue
|
||||
# github.com/ebitengine/purego v0.9.0
|
||||
# github.com/ebitengine/purego v0.9.1
|
||||
## explicit; go 1.18
|
||||
github.com/ebitengine/purego
|
||||
github.com/ebitengine/purego/internal/cgo
|
||||
@@ -1888,7 +1888,7 @@ github.com/sercand/kuberesolver/v6
|
||||
# github.com/sethvargo/go-retry v0.3.0
|
||||
## explicit; go 1.21
|
||||
github.com/sethvargo/go-retry
|
||||
# github.com/shirou/gopsutil/v4 v4.25.10
|
||||
# github.com/shirou/gopsutil/v4 v4.25.11
|
||||
## explicit; go 1.24.0
|
||||
github.com/shirou/gopsutil/v4/common
|
||||
github.com/shirou/gopsutil/v4/cpu
|
||||
@@ -1964,11 +1964,11 @@ github.com/tinylib/msgp/msgp
|
||||
# github.com/tjhop/slog-gokit v0.1.5
|
||||
## explicit; go 1.21
|
||||
github.com/tjhop/slog-gokit
|
||||
# github.com/tklauser/go-sysconf v0.3.15
|
||||
## explicit; go 1.23.0
|
||||
# github.com/tklauser/go-sysconf v0.3.16
|
||||
## explicit; go 1.24.0
|
||||
github.com/tklauser/go-sysconf
|
||||
# github.com/tklauser/numcpus v0.10.0
|
||||
## explicit; go 1.23.0
|
||||
# github.com/tklauser/numcpus v0.11.0
|
||||
## explicit; go 1.24.0
|
||||
github.com/tklauser/numcpus
|
||||
# github.com/twmb/franz-go v1.20.5
|
||||
## explicit; go 1.24.0
|
||||
|
||||
Reference in New Issue
Block a user