Skip to content

Commit 4785c70

Browse files
thaJeztahthaJeztah
committed
switch to github.com/containerd/log for logs
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 19d523c commit 4785c70

4 files changed

Lines changed: 28 additions & 18 deletions

File tree

‎client.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"syscall"
2828
"time"
2929

30-
"github.com/sirupsen/logrus"
30+
"github.com/containerd/log"
3131
"google.golang.org/grpc/codes"
3232
"google.golang.org/grpc/status"
3333
"google.golang.org/protobuf/proto"
@@ -368,15 +368,15 @@ func (c *Client) receiveLoop() error {
368368
sid := streamID(msg.header.StreamID)
369369
s := c.getStream(sid)
370370
if s == nil {
371-
logrus.WithField("stream", sid).Errorf("ttrpc: received message on inactive stream")
371+
log.G(c.ctx).WithField("stream", sid).Error("ttrpc: received message on inactive stream")
372372
continue
373373
}
374374

375375
if err != nil {
376376
s.closeWithError(err)
377377
} else {
378378
if err := s.receive(c.ctx, msg); err != nil {
379-
logrus.WithError(err).WithField("stream", sid).Errorf("ttrpc: failed to handle message")
379+
log.G(c.ctx).WithFields(log.Fields{"error": err, "stream": sid}).Error("ttrpc: failed to handle message")
380380
}
381381
}
382382
}

‎go.mod‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ module github.com/containerd/ttrpc
33
go 1.19
44

55
require (
6+
github.com/containerd/log v0.1.0
67
github.com/gogo/protobuf v1.3.2
78
github.com/golang/protobuf v1.5.3
89
github.com/prometheus/procfs v0.6.0
9-
github.com/sirupsen/logrus v1.8.1
1010
golang.org/x/sys v0.18.0
1111
google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d
1212
google.golang.org/grpc v1.57.1
1313
google.golang.org/protobuf v1.33.0
1414
)
1515

16-
require golang.org/x/net v0.23.0 // indirect
16+
require (
17+
github.com/sirupsen/logrus v1.9.3 // indirect
18+
golang.org/x/net v0.23.0 // indirect
19+
)

‎go.sum‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
2+
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
3+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
14
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
25
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
36
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -14,10 +17,11 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
1417
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1518
github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
1619
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
17-
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
18-
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
19-
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
20-
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
20+
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
21+
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
22+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
23+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
24+
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
2125
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
2226
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
2327
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -37,9 +41,9 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
3741
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
3842
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
3943
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
40-
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4144
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4245
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
46+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4347
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
4448
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
4549
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -61,3 +65,6 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
6165
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
6266
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
6367
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
68+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
69+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
70+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎server.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"syscall"
2828
"time"
2929

30-
"github.com/sirupsen/logrus"
30+
"github.com/containerd/log"
3131
"google.golang.org/grpc/codes"
3232
"google.golang.org/grpc/status"
3333
)
@@ -109,7 +109,7 @@ func (s *Server) Serve(ctx context.Context, l net.Listener) error {
109109
}
110110

111111
sleep := time.Duration(rand.Int63n(int64(backoff)))
112-
logrus.WithError(err).Errorf("ttrpc: failed accept; backoff %v", sleep)
112+
log.G(ctx).WithError(err).Errorf("ttrpc: failed accept; backoff %v", sleep)
113113
time.Sleep(sleep)
114114
continue
115115
}
@@ -121,14 +121,14 @@ func (s *Server) Serve(ctx context.Context, l net.Listener) error {
121121

122122
approved, handshake, err := handshaker.Handshake(ctx, conn)
123123
if err != nil {
124-
logrus.WithError(err).Error("ttrpc: refusing connection after handshake")
124+
log.G(ctx).WithError(err).Error("ttrpc: refusing connection after handshake")
125125
conn.Close()
126126
continue
127127
}
128128

129129
sc, err := s.newConn(approved, handshake)
130130
if err != nil {
131-
logrus.WithError(err).Error("ttrpc: create connection failed")
131+
log.G(ctx).WithError(err).Error("ttrpc: create connection failed")
132132
conn.Close()
133133
continue
134134
}
@@ -513,12 +513,12 @@ func (c *serverConn) run(sctx context.Context) {
513513
Payload: response.data,
514514
})
515515
if err != nil {
516-
logrus.WithError(err).Error("failed marshaling response")
516+
log.G(ctx).WithError(err).Error("failed marshaling response")
517517
return
518518
}
519519

520520
if err := ch.send(response.id, messageTypeResponse, 0, p); err != nil {
521-
logrus.WithError(err).Error("failed sending message on channel")
521+
log.G(ctx).WithError(err).Error("failed sending message on channel")
522522
return
523523
}
524524
} else {
@@ -530,7 +530,7 @@ func (c *serverConn) run(sctx context.Context) {
530530
flags = flags | flagNoData
531531
}
532532
if err := ch.send(response.id, messageTypeData, flags, response.data); err != nil {
533-
logrus.WithError(err).Error("failed sending message on channel")
533+
log.G(ctx).WithError(err).Error("failed sending message on channel")
534534
return
535535
}
536536
}
@@ -552,7 +552,7 @@ func (c *serverConn) run(sctx context.Context) {
552552
// requests, so that the client connection is closed
553553
return
554554
}
555-
logrus.WithError(err).Error("error receiving message")
555+
log.G(ctx).WithError(err).Error("error receiving message")
556556
// else, initiate shutdown
557557
case <-shutdown:
558558
return

0 commit comments

Comments
 (0)