Skip to content

Commit 3ce0a61

Browse files
mblaschkemblaschke
committed
add AutoProcMemLimit
Signed-off-by: Markus Blaschke <[email protected]>
1 parent 855eb6a commit 3ce0a61

File tree

4 files changed

+14
-35
lines changed

4 files changed

+14
-35
lines changed

‎common.logger.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
package main
22

33
import (
4-
"log/slog"
5-
64
"go.uber.org/zap"
7-
"go.uber.org/zap/exp/zapslog"
85
"go.uber.org/zap/zapcore"
96
)
107

118
var (
12-
logger *zap.SugaredLogger
13-
slogger *slog.Logger
9+
logger *zap.SugaredLogger
1410
)
1511

1612
func initLogger() *zap.SugaredLogger {
@@ -45,7 +41,6 @@ func initLogger() *zap.SugaredLogger {
4541
}
4642

4743
logger = log.Sugar()
48-
slogger = slog.New(zapslog.NewHandler(log.Core()))
4944

5045
return logger
5146
}

‎common.system.go‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,9 @@
11
package main
22

33
import (
4-
"github.com/KimMachineGun/automemlimit/memlimit"
5-
humanize "github.com/dustin/go-humanize"
4+
"github.com/webdevops/go-common/system"
65
)
76

87
func initSystem() {
9-
// set memory limit
10-
goMemLimit, err := memlimit.SetGoMemLimitWithOpts(
11-
memlimit.WithProvider(
12-
memlimit.ApplyFallback(
13-
memlimit.FromCgroup,
14-
memlimit.FromSystem,
15-
),
16-
),
17-
memlimit.WithLogger(slogger),
18-
)
19-
20-
if goMemLimit > 0 {
21-
logger.Infof(`GOMEMLIMIT updated to %v`, humanize.Bytes(uint64(goMemLimit)))
22-
}
23-
24-
if err != nil {
25-
logger.Fatal(err)
26-
}
8+
system.AutoProcMemLimit(logger)
279
}

‎go.mod‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,21 @@ require (
1313
github.com/prometheus/client_golang v1.22.0
1414
github.com/prometheus/common v0.63.0 // indirect
1515
github.com/rickb777/date v1.21.1
16-
github.com/webdevops/go-common v0.0.0-20250501125726-52273986367f
16+
github.com/webdevops/go-common v0.0.0-20250501225441-53b22a3a9550
1717
go.uber.org/zap v1.27.0
1818
golang.org/x/crypto v0.37.0 // indirect
1919
)
2020

21-
require (
22-
github.com/KimMachineGun/automemlimit v0.7.1
23-
github.com/dustin/go-humanize v1.0.1
24-
go.uber.org/zap/exp v0.3.0
25-
)
26-
2721
require (
2822
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 // indirect
2923
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.9.0 // indirect
3024
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
3125
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0 // indirect
3226
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
27+
github.com/KimMachineGun/automemlimit v0.7.1 // indirect
3328
github.com/beorn7/perks v1.0.1 // indirect
3429
github.com/cespare/xxhash/v2 v2.3.0 // indirect
30+
github.com/dustin/go-humanize v1.0.1 // indirect
3531
github.com/go-logr/logr v1.4.2 // indirect
3632
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
3733
github.com/google/uuid v1.6.0 // indirect
@@ -44,7 +40,9 @@ require (
4440
github.com/prometheus/procfs v0.16.1 // indirect
4541
github.com/remeh/sizedwaitgroup v1.0.0 // indirect
4642
github.com/rickb777/plural v1.4.3 // indirect
43+
go.uber.org/automaxprocs v1.6.0 // indirect
4744
go.uber.org/multierr v1.11.0 // indirect
45+
go.uber.org/zap/exp v0.3.0 // indirect
4846
golang.org/x/net v0.39.0 // indirect
4947
golang.org/x/sys v0.32.0 // indirect
5048
golang.org/x/text v0.24.0 // indirect

‎go.sum‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmd
6464
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
6565
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
6666
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
67+
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
68+
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
6769
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
6870
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
6971
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
@@ -82,8 +84,10 @@ github.com/rickb777/plural v1.4.3 h1:YrWiz/jrbcRzjPOIWQZZRQFOBj2e/2CwZpD7BxLu65U
8284
github.com/rickb777/plural v1.4.3/go.mod h1:dzZdD8cHnKMz8jud+XKajn8Hz8voyCNgbuozC8pv1N8=
8385
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
8486
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
85-
github.com/webdevops/go-common v0.0.0-20250501125726-52273986367f h1:v6aiE34Z91PdUYL66vNQz7MOKzfu44zr3c1zGFD6deM=
86-
github.com/webdevops/go-common v0.0.0-20250501125726-52273986367f/go.mod h1:of9MWttI9zAIamavzVk90P67OqdDjWW3CprTndJsSwE=
87+
github.com/webdevops/go-common v0.0.0-20250501225441-53b22a3a9550 h1:9Rhejj9T4vEVq7wwL/IPRBqC51Tt6SDmSxgAqXJT7MI=
88+
github.com/webdevops/go-common v0.0.0-20250501225441-53b22a3a9550/go.mod h1:GzD/xLtTZ5Vh3aHTi02g0OlfDUoiDx44OHeUnqWO2CI=
89+
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
90+
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
8791
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
8892
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
8993
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=

0 commit comments

Comments
 (0)