Skip to content

Commit 403bddb

Browse files
syepessyepes
committed
update deps and loggers
1 parent 821df10 commit 403bddb

16 files changed

+294
-309
lines changed

‎.goreleaser.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ builds:
2626
ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}
2727
binary: network_exporter
2828
archives:
29-
- format: tar.gz
29+
- formats: ["tar.gz"]
3030
name_template: >-
3131
{{ .ProjectName }}_{{ .Version }}.
3232
{{- title .Os }}_
@@ -35,7 +35,7 @@ archives:
3535
{{- else }}{{ .Arch }}{{ end }}
3636
format_overrides:
3737
- goos: windows
38-
format: zip
38+
formats: ["zip"]
3939
files:
4040
- README.md
4141
- LICENSE.md

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
BUILDX_VER=v0.18.0
1+
BUILDX_VER=v0.23.0
22
IMAGE_NAME=syepes/network_exporter
33
VERSION?=latest
44

‎config/config.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package config
22

33
import (
44
"fmt"
5+
"log/slog"
56
"net"
67
"os"
78
"regexp"
@@ -10,8 +11,6 @@ import (
1011
"time"
1112

1213
"github.com/creasty/defaults"
13-
"github.com/go-kit/log"
14-
"github.com/go-kit/log/level"
1514
"github.com/syepes/network_exporter/pkg/common"
1615

1716
yaml "gopkg.in/yaml.v3"
@@ -91,7 +90,7 @@ type SafeConfig struct {
9190
}
9291

9392
// ReloadConfig Safe configuration reload
94-
func (sc *SafeConfig) ReloadConfig(logger log.Logger, confFile string) (err error) {
93+
func (sc *SafeConfig) ReloadConfig(logger *slog.Logger, confFile string) (err error) {
9594
hostname, err := os.Hostname()
9695
if err != nil {
9796
panic(err)
@@ -120,20 +119,20 @@ func (sc *SafeConfig) ReloadConfig(logger log.Logger, confFile string) (err erro
120119
if common.SrvRecordCheck(t.Host) {
121120
found := re.MatchString(t.Type)
122121
if !found {
123-
level.Error(logger).Log("type", "Config", "func", "ReloadConfig", "msg", fmt.Sprintf("Target '%s' has unknown check type '%s' must be one of (ICMP|MTR|ICMP+MTR|TCP|HTTPGet)", t.Name, t.Type))
122+
logger.Error("Unknown check type", "type", "Config", "func", "ReloadConfig", "target", t.Name, "check_type", t.Type, "allowed", "(ICMP|MTR|ICMP+MTR|TCP|HTTPGet)")
124123
continue
125124
}
126125
// Check that SRV record's type is TCP, if config's type is TCP
127126
if t.Type == "TCP" {
128127
if !strings.EqualFold(t.Type, strings.Split(t.Host, ".")[1][1:]) {
129-
level.Error(logger).Log("type", "Config", "func", "ReloadConfig", "msg", fmt.Sprintf("Target %s type '%s' doesn't match SRV record proto '%s'", t.Name, t.Type, strings.Split(t.Host, ".")[1][1:]))
128+
logger.Error("Target type doesn't match SRV record protocol", "type", "Config", "func", "ReloadConfig", "target", t.Name, "check_type", t.Type, "srv_proto", strings.Split(t.Host, ".")[1][1:])
130129
continue
131130
}
132131
}
133132

134133
srv_record_hosts, err := common.SrvRecordHosts(t.Host)
135134
if err != nil {
136-
level.Error(logger).Log("type", "Config", "func", "ReloadConfig", "msg", (fmt.Sprintf("Error processing SRV {target %s}: %s", t.Host, err)))
135+
logger.Error("Error processing SRV record", "type", "Config", "func", "ReloadConfig", "target", t.Host, "err", err)
137136
continue
138137
}
139138

@@ -157,7 +156,7 @@ func (sc *SafeConfig) ReloadConfig(logger log.Logger, confFile string) (err erro
157156
} else {
158157
found := re.MatchString(t.Type)
159158
if !found {
160-
level.Error(logger).Log("type", "Config", "func", "ReloadConfig", "msg", "Target '%s' has unknown check type '%s' must be one of (ICMP|MTR|ICMP+MTR|TCP|HTTPGet)", t.Name, t.Type)
159+
logger.Error("Unknown check type", "type", "Config", "func", "ReloadConfig", "target", t.Name, "check_type", t.Type, "allowed", "(ICMP|MTR|ICMP+MTR|TCP|HTTPGet)")
161160
continue
162161
}
163162

@@ -251,4 +250,4 @@ func HasDuplicateTargets(m Targets) (bool, error) {
251250
}
252251
}
253252
return false, nil
254-
}
253+
}

‎go.mod

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,42 @@
1-
go 1.23
2-
toolchain go1.24.1
1+
go 1.24.2
32

43
module github.com/syepes/network_exporter
54

65
require (
76
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
87
github.com/go-kit/log v0.2.1
9-
github.com/prometheus/client_golang v1.20.5
10-
github.com/prometheus/common v0.60.1
11-
github.com/prometheus/procfs v0.15.1 // indirect
12-
golang.org/x/net v0.38.0
13-
golang.org/x/sys v0.31.0 // indirect
8+
github.com/prometheus/client_golang v1.22.0
9+
github.com/prometheus/common v0.63.0
10+
github.com/prometheus/procfs v0.16.1 // indirect
11+
golang.org/x/net v0.39.0
12+
golang.org/x/sys v0.32.0 // indirect
1413
gopkg.in/yaml.v3 v3.0.1
1514
)
1615

1716
require (
1817
github.com/alecthomas/kingpin/v2 v2.4.0
1918
github.com/creasty/defaults v1.8.0
2019
github.com/felixge/fgprof v0.9.5
21-
github.com/prometheus/exporter-toolkit v0.12.0
20+
github.com/prometheus/exporter-toolkit v0.14.0
2221
)
2322

2423
require (
2524
github.com/beorn7/perks v1.0.1 // indirect
2625
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2726
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
2827
github.com/go-logfmt/logfmt v0.6.0 // indirect
29-
github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 // indirect
28+
github.com/google/pprof v0.0.0-20250423184734-337e5dd93bb4 // indirect
3029
github.com/jpillora/backoff v1.0.0 // indirect
31-
github.com/klauspost/compress v1.17.11 // indirect
3230
github.com/mdlayher/socket v0.5.1 // indirect
3331
github.com/mdlayher/vsock v1.2.1 // indirect
3432
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3533
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
36-
github.com/prometheus/client_model v0.6.1 // indirect
34+
github.com/prometheus/client_model v0.6.2 // indirect
3735
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
38-
golang.org/x/crypto v0.36.0 // indirect
39-
golang.org/x/oauth2 v0.24.0 // indirect
40-
golang.org/x/sync v0.12.0 // indirect
41-
golang.org/x/text v0.23.0 // indirect
42-
google.golang.org/protobuf v1.35.1 // indirect
36+
golang.org/x/crypto v0.37.0 // indirect
37+
golang.org/x/oauth2 v0.29.0 // indirect
38+
golang.org/x/sync v0.13.0 // indirect
39+
golang.org/x/text v0.24.0 // indirect
40+
google.golang.org/protobuf v1.36.6 // indirect
4341
gopkg.in/yaml.v2 v2.4.0 // indirect
4442
)

‎go.sum

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u1
2929
github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
3030
github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
3131
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
32-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
33-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
32+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
33+
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
3434
github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
35-
github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 h1:sAGdeJj0bnMgUNVeUpp6AYlVdCt3/GdI3pGRqsNSQLs=
36-
github.com/google/pprof v0.0.0-20241101162523-b92577c0c142/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
35+
github.com/google/pprof v0.0.0-20250423184734-337e5dd93bb4 h1:gD0vax+4I+mAj+jEChEf25Ia07Jq7kYOFO5PPhAxFl4=
36+
github.com/google/pprof v0.0.0-20250423184734-337e5dd93bb4/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA=
3737
github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
3838
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
3939
github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
4040
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
41-
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
42-
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
41+
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
42+
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
4343
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
4444
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
4545
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -59,16 +59,16 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW
5959
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
6060
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
6161
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
62-
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
63-
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
64-
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
65-
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
66-
github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc=
67-
github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw=
68-
github.com/prometheus/exporter-toolkit v0.12.0 h1:DkE5RcEZR3lQA2QD5JLVQIf41dFKNsVMXFhgqcif7fo=
69-
github.com/prometheus/exporter-toolkit v0.12.0/go.mod h1:fQH0KtTn0yrrS0S82kqppRjDDiwMfIQUwT+RBRRhwUc=
70-
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
71-
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
62+
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
63+
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
64+
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
65+
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
66+
github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k=
67+
github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18=
68+
github.com/prometheus/exporter-toolkit v0.14.0 h1:NMlswfibpcZZ+H0sZBiTjrA3/aBFHkNZqE+iCj5EmRg=
69+
github.com/prometheus/exporter-toolkit v0.14.0/go.mod h1:Gu5LnVvt7Nr/oqTBUC23WILZepW0nffNo10XdhQcwWA=
70+
github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
71+
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
7272
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
7373
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
7474
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -78,26 +78,27 @@ github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/
7878
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
7979
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
8080
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
81-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
8281
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
82+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
83+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
8384
github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=
8485
github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
85-
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
86-
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
87-
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
88-
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
89-
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
90-
golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
91-
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
92-
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
86+
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
87+
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
88+
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
89+
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
90+
golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98=
91+
golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
92+
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
93+
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
9394
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
9495
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
95-
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
96-
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
97-
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
98-
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
99-
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
100-
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
96+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
97+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
98+
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
99+
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
100+
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
101+
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
101102
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
102103
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
103104
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎main.go

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"expvar"
66
"fmt"
7+
"log/slog"
78
"net"
89
"net/http"
910
"net/http/pprof"
@@ -12,21 +13,19 @@ import (
1213

1314
"github.com/alecthomas/kingpin/v2"
1415
"github.com/felixge/fgprof"
15-
"github.com/go-kit/log"
16-
"github.com/go-kit/log/level"
1716
"github.com/prometheus/client_golang/prometheus"
1817
"github.com/prometheus/client_golang/prometheus/collectors"
1918
"github.com/prometheus/client_golang/prometheus/promhttp"
20-
"github.com/prometheus/common/promlog"
21-
"github.com/prometheus/common/promlog/flag"
19+
"github.com/prometheus/common/promslog"
20+
"github.com/prometheus/common/promslog/flag"
2221
"github.com/prometheus/exporter-toolkit/web"
2322
"github.com/syepes/network_exporter/collector"
2423
"github.com/syepes/network_exporter/config"
2524
"github.com/syepes/network_exporter/monitor"
2625
"github.com/syepes/network_exporter/pkg/common"
2726
)
2827

29-
const version string = "1.7.9"
28+
const version string = "1.7.10"
3029

3130
var (
3231
WebListenAddresses = kingpin.Flag("web.listen-address", "The address to listen on for HTTP requests").Default(":9427").Strings()
@@ -37,7 +36,7 @@ var (
3736
configFile = kingpin.Flag("config.file", "Exporter configuration file").Default("/app/cfg/network_exporter.yml").String()
3837
enableProfileing = kingpin.Flag("profiling", "Enable Profiling (pprof + fgprof)").Default("false").Bool()
3938
sc = &config.SafeConfig{Cfg: &config.Config{}}
40-
logger log.Logger
39+
logger *slog.Logger
4140
icmpID *common.IcmpID // goroutine shared counter
4241
monitorPING *monitor.PING
4342
monitorMTR *monitor.MTR
@@ -48,21 +47,21 @@ var (
4847
)
4948

5049
func init() {
51-
promlogConfig := &promlog.Config{}
52-
flag.AddFlags(kingpin.CommandLine, promlogConfig)
50+
promslogConfig := &promslog.Config{}
51+
flag.AddFlags(kingpin.CommandLine, promslogConfig)
5352
kingpin.Version(version)
5453
kingpin.HelpFlag.Short('h')
5554
kingpin.Parse()
56-
logger = promlog.New(promlogConfig)
55+
logger = promslog.New(promslogConfig)
5756
icmpID = &common.IcmpID{}
5857
}
5958

6059
func main() {
61-
level.Info(logger).Log("msg", "Starting network_exporter", "version", version)
60+
logger.Info("msg", "Starting network_exporter", "version", version)
6261

63-
level.Info(logger).Log("msg", "Loading config")
62+
logger.Info("msg", "Loading config")
6463
if err := sc.ReloadConfig(logger, *configFile); err != nil {
65-
level.Error(logger).Log("msg", "Loading config", "err", err)
64+
logger.Error("msg", "Loading config", "err", err)
6665
os.Exit(1)
6766
}
6867

@@ -94,9 +93,9 @@ func startConfigRefresh() {
9493
}
9594

9695
for range time.NewTicker(interval).C {
97-
level.Info(logger).Log("msg", "ReLoading config")
96+
logger.Info("msg", "ReLoading config")
9897
if err := sc.ReloadConfig(logger, *configFile); err != nil {
99-
level.Error(logger).Log("msg", "Reloading config skipped", "err", err)
98+
logger.Error("msg", "Reloading config skipped", "err", err)
10099
continue
101100
} else {
102101
monitorPING.DelTargets()
@@ -132,7 +131,7 @@ func startServer() {
132131
})
133132

134133
if *enableProfileing {
135-
level.Info(logger).Log("msg", "Profiling enabled")
134+
logger.Info("msg", "Profiling enabled")
136135
mux.Handle("/debug/vars", http.HandlerFunc(expVars))
137136
mux.HandleFunc("/debug/fgprof", fgprof.Handler().(http.HandlerFunc))
138137
mux.HandleFunc("/debug/pprof/", pprof.Index)
@@ -146,26 +145,26 @@ func startServer() {
146145
Handler: mux,
147146
}
148147

149-
level.Info(logger).Log("msg", "Starting network_exporter", "version", version)
150-
level.Info(logger).Log("msg", fmt.Sprintf("Listening for %s on %s", webMetricsPath, *WebListenAddresses))
148+
logger.Info("msg", "Starting network_exporter", "version", version)
149+
logger.Info("msg", fmt.Sprintf("Listening for %s on %s", webMetricsPath, *WebListenAddresses))
151150

152151
serverFlags := web.FlagConfig{
153152
WebConfigFile: WebConfigFile,
154153
WebSystemdSocket: WebSystemdSocket,
155154
WebListenAddresses: WebListenAddresses,
156155
}
157156
if err := web.ListenAndServe(server, &serverFlags, logger); err != nil {
158-
level.Error(logger).Log("msg", "Could not start HTTP server", "err", err)
157+
logger.Error("msg", "Could not start HTTP server", "err", err)
159158
}
160159
}
161160

162161
func getResolver() *config.Resolver {
163162
if sc.Cfg.Conf.Nameserver == "" {
164-
level.Info(logger).Log("msg", "Configured default DNS resolver")
163+
logger.Info("msg", "Configured default DNS resolver")
165164
return &config.Resolver{Resolver: net.DefaultResolver, Timeout: sc.Cfg.Conf.NameserverTimeout.Duration()}
166165
}
167166

168-
level.Info(logger).Log("msg", "Configured custom DNS resolver")
167+
logger.Info("msg", "Configured custom DNS resolver")
169168
dialer := func(ctx context.Context, network, address string) (net.Conn, error) {
170169
d := net.Dialer{Timeout: sc.Cfg.Conf.NameserverTimeout.Duration()}
171170
return d.DialContext(ctx, "udp", sc.Cfg.Conf.Nameserver)

0 commit comments

Comments
 (0)