mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-09 23:24:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Revert type casting removal

Browse source 
This reverts the removal of type casting due to an error in the
dragonfly integration. The change in the type casting introduced by the
commit causes a type mismatch, resulting in the following errors:

util/runtime/limits_default.go:42:57: cannot use rlimit.Cur (variable of type int64) as type uint64 in argument to limitToString
util/runtime/limits_default.go:42:90: cannot use rlimit.Max (variable of type int64) as type uint64 in argument to limitToString

Reverting this commit to resolve the type mismatch error and maintain compatibility with the dragonfly integration.

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
This commit is contained in:
Julien Pivotto 2023-04-20 16:19:50 +02:00
parent f7c6130ff2
commit 637235f0a6
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
util/runtime/limits_default.go
View file

@ -39,7 +39,9 @@ func getLimits(resource int, unit string) string {
if err != nil { if err != nil {
panic("syscall.Getrlimit failed: " + err.Error()) panic("syscall.Getrlimit failed: " + err.Error())
} }
return fmt.Sprintf("(soft=%s, hard=%s)", limitToString(rlimit.Cur, unit), limitToString(rlimit.Max, unit)) // rlimit.Cur and rlimit.Max are int64 on some platforms, such as dragonfly.
// We need to cast them explicitly to uint64.
return fmt.Sprintf("(soft=%s, hard=%s)", limitToString(uint64(rlimit.Cur), unit), limitToString(uint64(rlimit.Max), unit)) //nolint:unconvert
} }
// FdLimits returns the soft and hard limits for file descriptors. // FdLimits returns the soft and hard limits for file descriptors.