Skip to content

Commit e67098f

Browse files
phanyzewskiphanyzewski
committed
feat: replace logrus with slog
1 parent 969b48f commit e67098f

12 files changed

+73
-88
lines changed

Diff for: ‎connectiontest.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"net"
1010
"time"
1111

12-
log "github.com/sirupsen/logrus"
12+
log "golang.org/x/exp/slog"
1313
)
1414

1515
type dialer struct {
@@ -48,9 +48,9 @@ func (d *dialer) Collect(ctx context.Context, pingAddrs []string) []pingStats {
4848
d.address = pingAddress(pingAddrs, d.avoidAddrs)
4949

5050
d.checkConnectivity(ctx)
51-
log.Debugf("result: %v", d.connected)
51+
log.Debug("check connectivity", "result", d.connected)
5252
if d.connected < 0 {
53-
log.Infof("unable to verify connectivity at %s: avoid ip next check", d.address)
53+
log.Info("unable to verify connectivity, avoid ip next check", "address", d.address)
5454
// avoid current ping addr for next attempt
5555
d.avoidAddrs[d.address] = true
5656
}
@@ -104,7 +104,7 @@ func (d *dialer) checkConnectivity(ctx context.Context) {
104104

105105
connected, err := d.run()
106106
if err != nil {
107-
log.Error(err)
107+
log.Error("error", err)
108108
}
109109

110110
d.connected += connected

Diff for: ‎environment.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"os"
99
"path/filepath"
1010

11-
log "github.com/sirupsen/logrus"
11+
log "golang.org/x/exp/slog"
1212
)
1313

1414
// NOTE: ClientVersion is set via build flags
@@ -19,49 +19,49 @@ var ClientVersion = "dev"
1919
func toUserCache(data sendDataJob) {
2020
cache, err := os.UserCacheDir()
2121
if err != nil {
22-
log.Error(err)
22+
log.Error("error", err)
2323
}
2424

2525
targetDir := filepath.Join(cache, "imup")
2626
if err := os.MkdirAll(targetDir, 0755); err != nil {
27-
log.Error(err)
27+
log.Error("error", err)
2828
}
2929

3030
b, err := json.Marshal(data)
3131
if err != nil {
32-
log.Error(err)
32+
log.Error("error", err)
3333
}
3434

3535
h := md5.New()
3636
_, err = io.WriteString(h, string(b))
3737
if err != nil {
38-
log.Error(err)
38+
log.Error("error", err)
3939
}
4040

4141
if err := os.WriteFile(fmt.Sprintf("%s/%x.json", targetDir, h.Sum(nil)), b, 0666); err != nil {
42-
log.Error(err)
42+
log.Error("error", err)
4343
}
4444
}
4545

4646
func fromCacheDir() ([]sendDataJob, bool) {
4747
data := []sendDataJob{}
4848
cache, err := os.UserCacheDir()
4949
if err != nil {
50-
log.Error(err)
50+
log.Error("error", err)
5151
return data, false
5252
}
5353

5454
targetDir := filepath.Join(cache, "imup")
5555

5656
// check to see if path exists before reading
5757
if _, err := os.Stat(targetDir); err != nil {
58-
log.Debug(err)
58+
log.Debug("debug level error", err)
5959
return data, false
6060
}
6161

6262
files, err := os.ReadDir(targetDir)
6363
if err != nil {
64-
log.Error(err)
64+
log.Error("error", err)
6565
return data, false
6666
}
6767

@@ -81,7 +81,7 @@ func fromCache(name string) (sendDataJob, bool) {
8181
var err error
8282
var file *os.File
8383
if file, err = os.Open(name); err != nil {
84-
log.Error(err)
84+
log.Error("error", err)
8585
return data, false
8686
}
8787
defer file.Close()
@@ -96,14 +96,14 @@ func fromCache(name string) (sendDataJob, bool) {
9696
func clearCache() {
9797
cache, err := os.UserCacheDir()
9898
if err != nil {
99-
log.Error(err)
99+
log.Error("error", err)
100100
return
101101
}
102102

103103
targetDir := filepath.Join(cache, "imup")
104104
files, err := os.ReadDir(targetDir)
105105
if err != nil {
106-
log.Error(err)
106+
log.Error("error", err)
107107
return
108108
}
109109

Diff for: ‎go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ require (
1111
github.com/matryer/is v1.4.1
1212
github.com/olekukonko/tablewriter v0.0.5
1313
github.com/prometheus-community/pro-bing v0.1.0
14-
github.com/sirupsen/logrus v1.9.0
14+
github.com/sirupsen/logrus v1.8.1
15+
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0
1516
)
1617

1718
require (

Diff for: ‎go.sum

+5-14
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,9 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
187187
github.com/m-lab/access v0.0.3/go.mod h1:gZ7YN3SeMTZYeRv5EFaLdG+XVI/F/X4njM1G1BfwuE4=
188188
github.com/m-lab/access v0.0.11 h1:i2aoal7zgdzXAA7pGL5mXpM8yybURDJGZLwBMmA4Le8=
189189
github.com/m-lab/go v0.1.43/go.mod h1:+C0ZBlRKsF7wIbqHRtiL8bqD6cOwlZXDTK/KQ7Iv434=
190-
github.com/m-lab/go v0.1.54 h1:z5FxSrcMT0RJF/EDNjeo77pmvzvhGHJMiyPl4N9Mbzo=
191-
github.com/m-lab/go v0.1.54/go.mod h1:O1D/EoVarJ8lZt9foANcqcKtwxHatBzUxXFFyC87aQQ=
192190
github.com/m-lab/go v0.1.59 h1:vJlaN2mwIe3cR81VCyBOSR8VT9kjRzsX635aizq/pD8=
193191
github.com/m-lab/go v0.1.59/go.mod h1:O1D/EoVarJ8lZt9foANcqcKtwxHatBzUxXFFyC87aQQ=
194192
github.com/m-lab/locate v0.4.1/go.mod h1:Uo4lB9QHCEBMTpFA/VnsXxH8fG/YCOYCyOe4g+Vbj04=
195-
github.com/m-lab/locate v0.14.1 h1:Ub4KQJhPa+/fYCwMOFQpu1Vjt0TkMSLi7BiwTxAu7as=
196-
github.com/m-lab/locate v0.14.1/go.mod h1:o7FXeLRW0FcIvBWdS6ehvHtZWmQIJnxm7xHKAiK1Wdk=
197193
github.com/m-lab/locate v0.14.12 h1:WDB7Qi4OA6RRbmRvzDCesikr/vyVzZ3iGxF8ljSiNe8=
198194
github.com/m-lab/locate v0.14.12/go.mod h1:AzAGFTLA4FHstubRBYsBQU5T5s8eibybD2OoI2IfmV8=
199195
github.com/m-lab/ndt-server v0.20.2/go.mod h1:ZLVRCEbCBkhh0pwNjnLpwaZnHOHGEH76H/fzIIVFRWw=
@@ -270,8 +266,6 @@ github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5
270266
github.com/prometheus/prometheus v2.5.0+incompatible/go.mod h1:oAIUtOny2rjMX0OWN5vPR5/q/twIROJvdqnQKDdil/s=
271267
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
272268
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
273-
github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
274-
github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
275269
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
276270
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
277271
github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
@@ -284,8 +278,8 @@ github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMT
284278
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
285279
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
286280
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
287-
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
288-
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
281+
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
282+
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
289283
github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
290284
github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
291285
github.com/smartystreets/gunit v1.0.0/go.mod h1:qwPWnhz6pn0NnRBP++URONOVyNkPyr4SauJk4cUOwJs=
@@ -333,6 +327,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
333327
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
334328
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
335329
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
330+
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 h1:pVgRXcIictcr+lBQIFeiwuwtDIs4eL21OuM9nyAADmo=
331+
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
336332
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
337333
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
338334
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -374,8 +370,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
374370
golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
375371
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
376372
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
377-
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
378-
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
379373
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
380374
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
381375
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -427,16 +421,13 @@ golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7w
427421
golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
428422
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
429423
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
430-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
431-
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
432-
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
433424
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
434425
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
435426
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
436427
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
437428
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
438429
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
439-
golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
430+
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
440431
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
441432
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
442433
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

Diff for: ‎helpers.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"math/rand"
55
"time"
66

7-
log "github.com/sirupsen/logrus"
7+
log "golang.org/x/exp/slog"
88
)
99

1010
// https://github.com/m-lab/ndt-server/blob/master/spec/ndt7-protocol.md#requirements-for-non-interactive-clients
@@ -21,11 +21,11 @@ func sleepTime() time.Duration {
2121

2222
func drain(c chan sendDataJob) {
2323
toDrain := len(c)
24-
log.Debugf("channel depth at shutdown: %v", toDrain)
24+
log.Debug("unprocessed jobs at shutdown", "channel depth", toDrain)
2525
i := 0
2626
for job := range c {
2727
i++
28-
log.Debugf("draining: %v of %v jobs", i, toDrain)
28+
log.Debug("draining unsent data", "jobs", i, "left to drain", toDrain)
2929
toUserCache(job)
3030

3131
if i >= toDrain {

Diff for: ‎imup.go

+10-18
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import (
1616
"github.com/imup-io/client/config"
1717
"github.com/imup-io/client/util"
1818

19-
log "github.com/sirupsen/logrus"
19+
"golang.org/x/exp/slog"
20+
log "golang.org/x/exp/slog"
2021
)
2122

2223
type sendDataJob struct {
@@ -95,7 +96,7 @@ type imup struct {
9596
func newApp() *imup {
9697
cfg, err := config.New()
9798
if err != nil {
98-
log.Error(err)
99+
log.Error("error", err)
99100
os.Exit(1)
100101
}
101102

@@ -157,31 +158,22 @@ func newApp() *imup {
157158
// TODO replace this logger with a configurable logger
158159
func configureLogger(debug bool) {
159160
if debug {
160-
log.SetFormatter(&log.TextFormatter{
161-
FullTimestamp: true,
162-
DisableLevelTruncation: true,
163-
PadLevelText: true,
164-
})
165-
log.SetLevel(log.DebugLevel)
166-
} else {
167-
log.SetFormatter(&log.TextFormatter{
168-
DisableColors: true,
169-
FullTimestamp: true,
170-
})
171-
log.SetLevel(log.InfoLevel)
161+
// https://pkg.go.dev/golang.org/x/exp/slog#hdr-Levels
162+
h := slog.HandlerOptions{Level: slog.LevelDebug}.NewJSONHandler(os.Stderr)
163+
slog.SetDefault(slog.New(h))
172164
}
173165
}
174166

175167
func sendImupData(ctx context.Context, job sendDataJob) {
176168
b, err := json.Marshal(job.IMUPData)
177169
if err != nil {
178-
log.Error(err)
170+
log.Error("error", err)
179171
return
180172
}
181173

182174
req, err := retryablehttp.NewRequest("POST", job.IMUPAddress, bytes.NewBuffer(b))
183175
if err != nil {
184-
log.Error(err)
176+
log.Error("error", err)
185177
}
186178
req = req.WithContext(ctx)
187179
req.Header.Set("Content-Type", "application/json")
@@ -199,7 +191,7 @@ func sendImupData(ctx context.Context, job sendDataJob) {
199191
toUserCache(job)
200192
}
201193

202-
log.Error(err)
194+
log.Error("error", err)
203195
}
204196
}
205197

@@ -241,7 +233,7 @@ func pingAddress(addresses []string, avoidAddrs map[string]bool) string {
241233

242234
func (i *imup) reloadConfig(data []byte) {
243235
if cfg, err := config.Reload(data); err != nil {
244-
log.Info(err)
236+
log.Info("cannot reload config", "error", err)
245237
} else {
246238
i.cfg = cfg
247239
}

Diff for: ‎main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"os/signal"
77
"syscall"
88

9-
log "github.com/sirupsen/logrus"
9+
log "golang.org/x/exp/slog"
1010
)
1111

1212
func main() {

Diff for: ‎pingtest.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"time"
1010

1111
ping "github.com/prometheus-community/pro-bing"
12-
log "github.com/sirupsen/logrus"
12+
log "golang.org/x/exp/slog"
1313
)
1414

1515
type pingTest struct {
@@ -77,11 +77,11 @@ func (p *pingTest) Collect(ctx context.Context, pingAddrs []string) []pingStats
7777
}
7878

7979
if internalSuccess {
80-
log.Infof("No external endpoint could be reached but gateway at '%s' was reachable", p.addressInternal)
80+
log.Info("No external endpoint could be reached, internal gateway responding", "gateway address", p.addressInternal)
8181
// TODO: implement an app wide file logger
8282
// fileLogger.Info("Pinging external endpoint failed but gateway was reachable")
8383
} else {
84-
log.Infof("No external endpoint could be reached and gateway at '%s' was unreachable", p.addressInternal)
84+
log.Info("No internal or external endpoint could be reached ", "gateway address", p.addressInternal)
8585
// TODO: implement an app wide file logger
8686
// fileLogger.Info("Pinging external endpoint failed and gateway was unreachable")
8787
}
@@ -122,12 +122,12 @@ func (p *pingTest) checkConnectivity(ctx context.Context, testType string, pingA
122122
var pinger *ping.Pinger
123123
if testType == "external" {
124124
if pinger, err = p.setupExternalPinger(ctx, pingAddrs, nil); err != nil {
125-
log.Errorf("failed to setup external pinger: %s", err)
125+
log.Error("failed to setup external pinger", "error", err)
126126
return pingStats{PacketsSent: 0, PacketsRecv: 0, PacketLoss: 100.0, TimeStamp: timestamp}, false
127127
}
128128
} else {
129129
if pinger, err = p.setupInternalPinger(ctx, p.addressInternal, nil); err != nil {
130-
log.Errorf("failed to setup internal pinger: %s", err)
130+
log.Error("failed to setup internal pinger", "error", err)
131131
return pingStats{PacketsSent: 0, PacketsRecv: 0, PacketLoss: 100.0, TimeStamp: timestamp}, false
132132
}
133133
}
@@ -139,7 +139,7 @@ func (p *pingTest) checkConnectivity(ctx context.Context, testType string, pingA
139139
var info error
140140
var stats *ping.Statistics
141141
if stats, info = p.run(ctx, pinger); info != nil {
142-
log.Warnf("error sending ping to: %s: err: %s", stats.Addr, info)
142+
log.Warn("error sending ping", "address", stats.Addr, "error", info)
143143
}
144144

145145
loss := 100.0
@@ -196,7 +196,7 @@ func (p *pingTest) setupInternalPinger(ctx context.Context, pingAddr string, err
196196
if pinger, err := ping.NewPinger(pingAddr); err != nil {
197197
return nil, fmt.Errorf("pinger could not be created: %v: %v", err, errs)
198198
} else {
199-
log.Debugf("successfully created pinger to test against %s", pinger.Addr())
199+
log.Debug("successfully created pinger", "address", pinger.Addr())
200200
return pinger, nil
201201
}
202202
}
@@ -222,7 +222,7 @@ func (p *pingTest) setupExternalPinger(ctx context.Context, pingAddrs []string,
222222
pinger.Count = 1
223223

224224
if stats, err := p.run(ctx, pinger); stats.PacketsRecv == 0 {
225-
log.Debugf("avoiding pinging external endpoint at: %s next check", randomPingAddr)
225+
log.Debug("avoiding pinging external endpoint next check", "address", randomPingAddr)
226226
p.avoidAddrs[randomPingAddr] = true
227227

228228
for i, addr := range pingAddrs {
@@ -237,7 +237,7 @@ func (p *pingTest) setupExternalPinger(ctx context.Context, pingAddrs []string,
237237
if pinger, err := ping.NewPinger(randomPingAddr); err != nil {
238238
return p.setupExternalPinger(ctx, pingAddrs, fmt.Errorf("ping succeeds but creating new pinger failed: %s : %v : %v", randomPingAddr, err, errs))
239239
} else {
240-
log.Debugf("successfully created pinger to test against %s", pinger.Addr())
240+
log.Debug("successfully created pinger to test", "address", pinger.Addr())
241241
return pinger, nil
242242
}
243243
}
@@ -246,12 +246,12 @@ func (p *pingTest) setupExternalPinger(ctx context.Context, pingAddrs []string,
246246
func (p *pingTest) run(ctx context.Context, pinger *ping.Pinger) (*ping.Statistics, error) {
247247
pinger.Debug = true
248248
pinger.OnRecv = func(pkt *ping.Packet) {
249-
log.Tracef("%d bytes sent %s: icmp_seq=%d time=%v\n", pkt.Nbytes, pkt.IPAddr, pkt.Seq, pkt.Rtt)
249+
log.Debug("pinger onRecv", fmt.Sprintf("%d bytes sent %s: icmp_seq=%d time=%v\n", pkt.Nbytes, pkt.IPAddr, pkt.Seq, pkt.Rtt))
250250
}
251251

252252
pinger.OnFinish = func(stats *ping.Statistics) {
253-
log.Tracef("\n--- %s ping statistics ---\n", stats.Addr)
254-
log.Tracef("%d packets transmitted, %d packets received, %v%% packet loss\n", stats.PacketsSent, stats.PacketsRecv, stats.PacketLoss)
253+
log.Debug("pinger on finish", fmt.Sprintf("\n--- %s ping statistics ---\n", stats.Addr))
254+
log.Debug("pinger on finish", fmt.Sprintf("%d packets transmitted, %d packets received, %v%% packet loss\n", stats.PacketsSent, stats.PacketsRecv, stats.PacketLoss))
255255
}
256256

257257
// required for linux and windows: https://github.com/sparrc/go-ping/issues/4

0 commit comments

Comments
 (0)