Skip to content

Commit 9711d1f

Browse files
committed
update deps
Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>
1 parent 5265f70 commit 9711d1f

File tree

4 files changed

+162
-81
lines changed

4 files changed

+162
-81
lines changed

logger.go renamed to common.logger.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
package main
22

33
import (
4+
"log/slog"
5+
46
"go.uber.org/zap"
7+
"go.uber.org/zap/exp/zapslog"
58
"go.uber.org/zap/zapcore"
69
)
710

811
var (
9-
logger *zap.SugaredLogger
12+
logger *zap.SugaredLogger
13+
slogger *slog.Logger
1014
)
1115

1216
func initLogger() *zap.SugaredLogger {
@@ -39,6 +43,9 @@ func initLogger() *zap.SugaredLogger {
3943
if err != nil {
4044
panic(err)
4145
}
46+
4247
logger = log.Sugar()
48+
slogger = slog.New(zapslog.NewHandler(log.Core(), nil))
49+
4350
return logger
4451
}

common.system.go

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package main
2+
3+
import (
4+
"github.com/KimMachineGun/automemlimit/memlimit"
5+
humanize "github.com/dustin/go-humanize"
6+
)
7+
8+
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+
}
27+
}

go.mod

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,61 @@
11
module github.com/webdevops/azure-janitor
22

3-
go 1.22
4-
5-
toolchain go1.22.0
3+
go 1.23
64

75
require (
86
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2 v2.2.0
97
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
108
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions v1.3.0
11-
github.com/jessevdk/go-flags v1.5.0
9+
github.com/jessevdk/go-flags v1.6.1
1210
github.com/karrick/tparse/v2 v2.8.2
13-
github.com/prometheus/client_golang v1.19.0
14-
github.com/prometheus/common v0.49.0 // indirect
15-
github.com/rickb777/date v1.20.6
16-
github.com/webdevops/go-common v0.0.0-20240229220036-40910d2ba23e
11+
github.com/prometheus/client_golang v1.20.3
12+
github.com/prometheus/common v0.59.1 // indirect
13+
github.com/rickb777/date v1.21.1
14+
github.com/webdevops/go-common v0.0.0-20240821190643-248b039cf4c0
1715
go.uber.org/zap v1.27.0
18-
golang.org/x/crypto v0.20.0 // indirect
16+
golang.org/x/crypto v0.27.0 // indirect
17+
)
18+
19+
require (
20+
github.com/KimMachineGun/automemlimit v0.6.1
21+
github.com/dustin/go-humanize v1.0.1
22+
go.uber.org/zap/exp v0.2.0
1923
)
2024

2125
require (
22-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.2 // indirect
23-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 // indirect
24-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
26+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect
27+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
28+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
2529
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0 // indirect
2630
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
2731
github.com/beorn7/perks v1.0.1 // indirect
28-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
29-
github.com/go-logr/logr v1.4.1 // indirect
30-
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
32+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
33+
github.com/cilium/ebpf v0.9.1 // indirect
34+
github.com/containerd/cgroups/v3 v3.0.1 // indirect
35+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
36+
github.com/docker/go-units v0.4.0 // indirect
37+
github.com/go-logr/logr v1.4.2 // indirect
38+
github.com/godbus/dbus/v5 v5.0.4 // indirect
39+
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
3140
github.com/google/uuid v1.6.0 // indirect
41+
github.com/klauspost/compress v1.17.9 // indirect
3242
github.com/kylelemons/godebug v1.1.0 // indirect
43+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
44+
github.com/opencontainers/runtime-spec v1.0.2 // indirect
3345
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
46+
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
3447
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
35-
github.com/prometheus/client_model v0.6.0 // indirect
36-
github.com/prometheus/procfs v0.12.0 // indirect
48+
github.com/prometheus/client_model v0.6.1 // indirect
49+
github.com/prometheus/procfs v0.15.1 // indirect
3750
github.com/remeh/sizedwaitgroup v1.0.0 // indirect
38-
github.com/rickb777/plural v1.4.1 // indirect
51+
github.com/rickb777/plural v1.4.2 // indirect
52+
github.com/sirupsen/logrus v1.8.1 // indirect
3953
go.uber.org/multierr v1.11.0 // indirect
40-
golang.org/x/net v0.21.0 // indirect
41-
golang.org/x/sys v0.17.0 // indirect
42-
golang.org/x/text v0.14.0 // indirect
43-
google.golang.org/protobuf v1.32.0 // indirect
44-
k8s.io/apimachinery v0.29.2 // indirect
45-
k8s.io/klog/v2 v2.120.1 // indirect
46-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
54+
golang.org/x/net v0.29.0 // indirect
55+
golang.org/x/sys v0.25.0 // indirect
56+
golang.org/x/text v0.18.0 // indirect
57+
google.golang.org/protobuf v1.34.2 // indirect
58+
k8s.io/apimachinery v0.31.1 // indirect
59+
k8s.io/klog/v2 v2.130.1 // indirect
60+
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 // indirect
4761
)

0 commit comments

Comments
 (0)