Skip to content

Commit 572e590

Browse files
dveedendveeden
committed
Update dependencies, CI, etc
1 parent c412c24 commit 572e590

7 files changed

Lines changed: 29 additions & 38 deletions

File tree

‎.github/workflows/licence.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626

2727
steps:
28-
- uses: actions/checkout@v2
28+
- uses: actions/checkout@v6
2929
- name: Check License Header
3030
uses: apache/skywalking-eyes/header@501a28d2fb4a9b962661987e50cf0219631b32ff
3131
with:

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ jobs:
2626
test:
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v6
3030

3131
- name: Set up Go
32-
uses: actions/setup-go@v2
32+
uses: actions/setup-go@v6
3333
with:
34-
go-version: 1.16
34+
go-version-file: 'go.mod'
3535

3636
- name: Test
3737
run: go test ./...

‎go.mod‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
module github.com/pingcap/log
22

33
require (
4-
github.com/pingcap/errors v0.11.0
5-
github.com/pkg/errors v0.8.1 // indirect
6-
github.com/stretchr/testify v1.8.1
4+
github.com/pingcap/errors v0.11.4
5+
github.com/stretchr/testify v1.11.1
76
go.uber.org/zap v1.27.1
87
gopkg.in/natefinch/lumberjack.v2 v2.2.1
98
)
109

11-
go 1.16
10+
require (
11+
github.com/davecgh/go-spew v1.1.1 // indirect
12+
github.com/pkg/errors v0.8.1 // indirect
13+
github.com/pmezard/go-difflib v1.0.0 // indirect
14+
go.uber.org/multierr v1.11.0 // indirect
15+
gopkg.in/yaml.v3 v3.0.1 // indirect
16+
)
17+
18+
go 1.25

‎go.sum‎

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,22 @@
1-
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
2-
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
31
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
42
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
6-
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
7-
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
8-
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
9-
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
10-
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
11-
github.com/pingcap/errors v0.11.0 h1:DCJQB8jrHbQ1VVlMFIrbj2ApScNNotVmkSNplu2yUt4=
12-
github.com/pingcap/errors v0.11.0/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
3+
github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
4+
github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
135
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
146
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
157
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
168
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
17-
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
18-
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
19-
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
20-
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
21-
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
22-
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
23-
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
24-
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
9+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
10+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
2511
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
2612
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
27-
go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
28-
go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
13+
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
14+
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
2915
go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
3016
go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
17+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
3118
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
32-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
33-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
3419
gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
3520
gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
36-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
3721
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
3822
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎log_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func TestTimeout(t *testing.T) {
136136
var h hang
137137
ws = LockWithTimeout(zapcore.AddSync(h), 3)
138138
panicCh := make(chan struct{}, 2)
139-
for i := 0; i < 2; i++ {
139+
for range 2 {
140140
go func() {
141141
defer func() {
142142
if x := recover(); x != nil {

‎zap_log_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ func TestBufferedLog(t *testing.T) {
229229
}, 5*time.Second, 100*time.Millisecond, "expected data flushed after interval")
230230

231231
longMsg := strings.Repeat("x", 200)
232-
for i := 0; i < 20; i++ { // Larger than buffer size
232+
for range 20 { // Larger than buffer size
233233
bufferedLogger.Info("big message", zap.String("msg", longMsg))
234234
}
235235

@@ -259,7 +259,7 @@ func TestBufferedLogWithRotate(t *testing.T) {
259259

260260
largeMsg := strings.Repeat("x", 200*1024)
261261

262-
for i := 0; i < 10; i++ {
262+
for range 10 {
263263
bufferedLogger.Info("rotating message", zap.String("msg", largeMsg))
264264
}
265265

@@ -468,7 +468,7 @@ func (t *testLogSpy) FailNow() {
468468
t.TB.FailNow()
469469
}
470470

471-
func (t *testLogSpy) Logf(format string, args ...interface{}) {
471+
func (t *testLogSpy) Logf(format string, args ...any) {
472472
// Log messages are in the format,
473473
//
474474
// 2017-10-27T13:03:01.000-0700 DEBUG your message here {data here}

‎zap_text_encoder.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func getCallerString(ec zapcore.EntryCaller) string {
9696
// For JSON-escaping; see textEncoder.safeAddString below.
9797
const _hex = "0123456789abcdef"
9898

99-
var _textPool = sync.Pool{New: func() interface{} {
99+
var _textPool = sync.Pool{New: func() any {
100100
return &textEncoder{}
101101
}}
102102

@@ -223,7 +223,7 @@ func (enc *textEncoder) resetReflectBuf() {
223223
}
224224
}
225225

226-
func (enc *textEncoder) AddReflected(key string, obj interface{}) error {
226+
func (enc *textEncoder) AddReflected(key string, obj any) error {
227227
enc.resetReflectBuf()
228228
err := enc.reflectEnc.Encode(obj)
229229
if err != nil {
@@ -321,7 +321,7 @@ func (enc *textEncoder) AppendInt64(val int64) {
321321
enc.buf.AppendInt(val)
322322
}
323323

324-
func (enc *textEncoder) AppendReflected(val interface{}) error {
324+
func (enc *textEncoder) AppendReflected(val any) error {
325325
enc.resetReflectBuf()
326326
err := enc.reflectEnc.Encode(val)
327327
if err != nil {

0 commit comments

Comments
 (0)