Skip to content

Commit cde4af8

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

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
@@ -14,7 +14,6 @@ require (
1414
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armfeatures v1.2.0
1515
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
1616
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions v1.3.0
17-
github.com/KimMachineGun/automemlimit v0.7.1
1817
github.com/Masterminds/sprig/v3 v3.3.0
1918
github.com/dustin/go-humanize v1.0.1
2019
github.com/gofrs/uuid v4.4.0+incompatible
@@ -25,9 +24,8 @@ require (
2524
github.com/prometheus/client_golang v1.22.0
2625
github.com/robertkrimen/otto v0.5.1
2726
github.com/robfig/cron/v3 v3.0.1
28-
github.com/webdevops/go-common v0.0.0-20250501125726-52273986367f
27+
github.com/webdevops/go-common v0.0.0-20250501163022-5a5152626efb
2928
go.uber.org/zap v1.27.0
30-
go.uber.org/zap/exp v0.3.0
3129
sigs.k8s.io/yaml v1.4.0
3230
)
3331

@@ -37,6 +35,7 @@ require (
3735
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.9.0 // indirect
3836
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
3937
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
38+
github.com/KimMachineGun/automemlimit v0.7.1 // indirect
4039
github.com/Masterminds/goutils v1.1.1 // indirect
4140
github.com/Masterminds/semver/v3 v3.3.1 // indirect
4241
github.com/beorn7/perks v1.0.1 // indirect
@@ -74,7 +73,9 @@ require (
7473
go.opentelemetry.io/otel v1.35.0 // indirect
7574
go.opentelemetry.io/otel/metric v1.35.0 // indirect
7675
go.opentelemetry.io/otel/trace v1.35.0 // indirect
76+
go.uber.org/automaxprocs v1.6.0 // indirect
7777
go.uber.org/multierr v1.11.0 // indirect
78+
go.uber.org/zap/exp v0.3.0 // indirect
7879
golang.org/x/crypto v0.37.0 // indirect
7980
golang.org/x/net v0.39.0 // indirect
8081
golang.org/x/sys v0.32.0 // indirect

‎go.sum

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmd
118118
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
119119
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
120120
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
121+
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
122+
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
121123
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
122124
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
123125
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
@@ -144,8 +146,8 @@ github.com/std-uritemplate/std-uritemplate/go/v2 v2.0.3 h1:7hth9376EoQEd1hH4lAp3
144146
github.com/std-uritemplate/std-uritemplate/go/v2 v2.0.3/go.mod h1:Z5KcoM0YLC7INlNhEezeIZ0TZNYf7WSNO0Lvah4DSeQ=
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-20250501125726-52273986367f h1:v6aiE34Z91PdUYL66vNQz7MOKzfu44zr3c1zGFD6deM=
148-
github.com/webdevops/go-common v0.0.0-20250501125726-52273986367f/go.mod h1:of9MWttI9zAIamavzVk90P67OqdDjWW3CprTndJsSwE=
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
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
150152
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
151153
go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
@@ -154,6 +156,8 @@ go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/
154156
go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=
155157
go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
156158
go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
159+
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
160+
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
157161
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
158162
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
159163
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=

0 commit comments

Comments
 (0)