Skip to content

Commit a63f4c4

Browse files
authored
Switch from github.com/go-kit/kit to github.com/go-kit/log interfaces (#426)
1 parent 6465c16 commit a63f4c4

13 files changed

+21
-25
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ myServer := grpc.NewServer(
5858
* [`grpc_ctxtags`](tags/) - a library that adds a `Tag` map to context, with data populated from request body
5959
* [`grpc_zap`](logging/zap/) - integration of [zap](https://github.com/uber-go/zap) logging library into gRPC handlers.
6060
* [`grpc_logrus`](logging/logrus/) - integration of [logrus](https://github.com/sirupsen/logrus) logging library into gRPC handlers.
61-
* [`grpc_kit`](logging/kit/) - integration of [go-kit](https://github.com/go-kit/kit/tree/master/log) logging library into gRPC handlers.
61+
* [`grpc_kit`](logging/kit/) - integration of [go-kit/log](https://github.com/go-kit/log) logging library into gRPC handlers.
6262
* [`grpc_grpc_logsettable`](logging/settable/) - a wrapper around `grpclog.LoggerV2` that allows to replace loggers in runtime (thread-safe).
6363

6464
#### Monitoring

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
module github.com/grpc-ecosystem/go-grpc-middleware
22

33
require (
4-
github.com/go-kit/kit v0.9.0
5-
github.com/go-logfmt/logfmt v0.4.0 // indirect
6-
github.com/go-stack/stack v1.8.0 // indirect
4+
github.com/go-kit/log v0.1.0
75
github.com/gogo/protobuf v1.3.2
86
github.com/golang/protobuf v1.3.3
97
github.com/opentracing/opentracing-go v1.1.0

go.sum

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
1111
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
1212
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
1313
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
14-
github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk=
15-
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
16-
github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA=
17-
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
14+
github.com/go-kit/log v0.1.0 h1:DGJh0Sm43HbOeYDNnVZFl8BvcYVvjD5bqYJvp0REbwQ=
15+
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
16+
github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=
17+
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
1818
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
1919
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
2020
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -31,8 +31,6 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
3131
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
3232
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
3333
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
34-
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
35-
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
3634
github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
3735
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
3836
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=

logging/kit/client_interceptors.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"context"
88

9-
"github.com/go-kit/kit/log"
9+
"github.com/go-kit/log"
1010
"google.golang.org/grpc"
1111
)
1212

logging/kit/client_interceptors_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"strings"
77
"testing"
88

9-
"github.com/go-kit/kit/log"
10-
"github.com/go-kit/kit/log/level"
9+
"github.com/go-kit/log"
10+
"github.com/go-kit/log/level"
1111
grpc_kit "github.com/grpc-ecosystem/go-grpc-middleware/logging/kit"
1212
pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/testing/testproto"
1313
"github.com/stretchr/testify/assert"

logging/kit/ctxkit/context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ctxkit
33
import (
44
"context"
55

6-
"github.com/go-kit/kit/log"
6+
"github.com/go-kit/log"
77
grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags"
88
)
99

logging/kit/examples_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package kit_test
33
import (
44
"time"
55

6-
"github.com/go-kit/kit/log"
6+
"github.com/go-kit/log"
77
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
88
"github.com/grpc-ecosystem/go-grpc-middleware/logging/kit"
99
grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags"

logging/kit/options.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package kit
33
import (
44
"time"
55

6-
"github.com/go-kit/kit/log"
7-
"github.com/go-kit/kit/log/level"
6+
"github.com/go-kit/log"
7+
"github.com/go-kit/log/level"
88
grpc_logging "github.com/grpc-ecosystem/go-grpc-middleware/logging"
99
"google.golang.org/grpc/codes"
1010
)

logging/kit/payload_interceptors.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66

77
"context"
88

9-
"github.com/go-kit/kit/log"
10-
"github.com/go-kit/kit/log/level"
9+
"github.com/go-kit/log"
10+
"github.com/go-kit/log/level"
1111
"github.com/golang/protobuf/jsonpb"
1212
"github.com/golang/protobuf/proto"
1313
grpc_logging "github.com/grpc-ecosystem/go-grpc-middleware/logging"

logging/kit/payload_interceptors_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"context"
1010

11-
"github.com/go-kit/kit/log"
11+
"github.com/go-kit/log"
1212
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
1313
grpc_kit "github.com/grpc-ecosystem/go-grpc-middleware/logging/kit"
1414
grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags"

0 commit comments

Comments
 (0)