Skip to content

Commit 7c9ed48

Browse files
committed
add AutoProcMemLimit
Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>
1 parent bcf814d commit 7c9ed48

File tree

4 files changed

+14
-32
lines changed

4 files changed

+14
-32
lines changed

common.logger.go

+1-6
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

+2-20
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

+5-4
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,11 @@ require (
1717
require (
1818
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0
1919
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.9.0
20-
github.com/KimMachineGun/automemlimit v0.7.1
21-
github.com/dustin/go-humanize v1.0.1
2220
github.com/jessevdk/go-flags v1.6.1
2321
github.com/patrickmn/go-cache v2.1.0+incompatible
2422
github.com/remeh/sizedwaitgroup v1.0.0
25-
github.com/webdevops/go-common v0.0.0-20250501125726-52273986367f
23+
github.com/webdevops/go-common v0.0.0-20250501225441-53b22a3a9550
2624
go.uber.org/zap v1.27.0
27-
go.uber.org/zap/exp v0.3.0
2825
)
2926

3027
require (
@@ -34,9 +31,11 @@ require (
3431
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions v1.3.0 // indirect
3532
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.1 // indirect
3633
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
34+
github.com/KimMachineGun/automemlimit v0.7.1 // indirect
3735
github.com/beorn7/perks v1.0.1 // indirect
3836
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3937
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
38+
github.com/dustin/go-humanize v1.0.1 // indirect
4039
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
4140
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
4241
github.com/go-logr/logr v1.4.2 // indirect
@@ -61,7 +60,9 @@ require (
6160
github.com/prometheus/client_model v0.6.2 // indirect
6261
github.com/robfig/cron v1.2.0 // indirect
6362
github.com/x448/float16 v0.8.4 // indirect
63+
go.uber.org/automaxprocs v1.6.0 // indirect
6464
go.uber.org/multierr v1.11.0 // indirect
65+
go.uber.org/zap/exp v0.3.0 // indirect
6566
golang.org/x/crypto v0.37.0 // indirect
6667
golang.org/x/oauth2 v0.29.0 // indirect
6768
golang.org/x/term v0.31.0 // indirect

go.sum

+6-2
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
110110
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
111111
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
112112
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
113+
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
114+
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
113115
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
114116
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
115117
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
@@ -134,12 +136,14 @@ github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/
134136
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
135137
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
136138
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
137-
github.com/webdevops/go-common v0.0.0-20250501125726-52273986367f h1:v6aiE34Z91PdUYL66vNQz7MOKzfu44zr3c1zGFD6deM=
138-
github.com/webdevops/go-common v0.0.0-20250501125726-52273986367f/go.mod h1:of9MWttI9zAIamavzVk90P67OqdDjWW3CprTndJsSwE=
139+
github.com/webdevops/go-common v0.0.0-20250501225441-53b22a3a9550 h1:9Rhejj9T4vEVq7wwL/IPRBqC51Tt6SDmSxgAqXJT7MI=
140+
github.com/webdevops/go-common v0.0.0-20250501225441-53b22a3a9550/go.mod h1:GzD/xLtTZ5Vh3aHTi02g0OlfDUoiDx44OHeUnqWO2CI=
139141
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
140142
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
141143
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
142144
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
145+
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
146+
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
143147
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
144148
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
145149
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=

0 commit comments

Comments
 (0)