Skip to content

Commit eae05bc

Browse files
mblaschkemblaschke
committed
add AutoProcMemLimit
Signed-off-by: Markus Blaschke <[email protected]>
1 parent ce3784e commit eae05bc

File tree

4 files changed

+13
-31
lines changed

4 files changed

+13
-31
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: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ require (
1010
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azcertificates v1.3.1
1111
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.1
1212
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.3.1
13-
github.com/KimMachineGun/automemlimit v0.7.1
14-
github.com/dustin/go-humanize v1.0.1
1513
github.com/jessevdk/go-flags v1.6.1
1614
github.com/prometheus/client_golang v1.22.0
17-
github.com/webdevops/go-common v0.0.0-20250501161329-195617db3f0f
15+
github.com/webdevops/go-common v0.0.0-20250501163022-5a5152626efb
1816
go.uber.org/zap v1.27.0
1917
go.uber.org/zap/exp v0.3.0
2018
)
@@ -28,9 +26,11 @@ require (
2826
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 // indirect
2927
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.1 // indirect
3028
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
29+
github.com/KimMachineGun/automemlimit v0.7.1 // indirect
3130
github.com/beorn7/perks v1.0.1 // indirect
3231
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3332
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
33+
github.com/dustin/go-humanize v1.0.1 // indirect
3434
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
3535
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
3636
github.com/go-logr/logr v1.4.2 // indirect
@@ -59,6 +59,7 @@ require (
5959
github.com/remeh/sizedwaitgroup v1.0.0 // indirect
6060
github.com/robfig/cron v1.2.0 // indirect
6161
github.com/x448/float16 v0.8.4 // indirect
62+
go.uber.org/automaxprocs v1.6.0 // indirect
6263
go.uber.org/multierr v1.11.0 // indirect
6364
golang.org/x/crypto v0.37.0 // indirect
6465
golang.org/x/net v0.39.0 // indirect

‎go.sum

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
120120
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
121121
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
122122
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
123+
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
124+
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
123125
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
124126
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
125127
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
@@ -144,12 +146,14 @@ github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/
144146
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
145147
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
146148
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
147-
github.com/webdevops/go-common v0.0.0-20250501161329-195617db3f0f h1:ZMoD9aTRQUaSd2XDklbbCmzDGaPckwGhH+Bd8vc5KE0=
148-
github.com/webdevops/go-common v0.0.0-20250501161329-195617db3f0f/go.mod h1:9/OQooHNdti2g6SZZGc9GVql0SPTdhdZytQoSGeKIqQ=
149+
github.com/webdevops/go-common v0.0.0-20250501163022-5a5152626efb h1:QX8WvRfo9FHM3hAiIh8+V81pu2hxZYcSm9T08ugZK4Q=
150+
github.com/webdevops/go-common v0.0.0-20250501163022-5a5152626efb/go.mod h1:GzD/xLtTZ5Vh3aHTi02g0OlfDUoiDx44OHeUnqWO2CI=
149151
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
150152
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
151153
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
152154
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
155+
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
156+
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
153157
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
154158
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
155159
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=

0 commit comments

Comments
 (0)