Skip to content

Commit e482ad4

Browse files
authored
Add support for the zerolog logging provider (#299)
1 parent 4664c92 commit e482ad4

File tree

8 files changed

+285
-2
lines changed

8 files changed

+285
-2
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ test: vet
3232
cd ./providers/kit/ && go test -v -race ./...
3333
cd ./providers/logrus/ && go test -v -race ./...
3434
cd ./providers/zap/ && go test -v -race ./...
35+
cd ./providers/zerolog/ && go test -v -race ./...
3536
./scripts/test_all.sh
3637

3738
.PHONY: all test

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
## Middleware
1717

1818
[gRPC Go](https://github.com/grpc/grpc-go) recently acquired support for
19-
Interceptors, i.e. [middleware](https://medium.com/@matryer/writing-middleware-in-golang-and-how-go-makes-it-so-much-fun-4375c1246e81#.gv7tdlghs)
19+
Interceptors, i.e. [middleware](https://medium.com/@matryer/writing-middleware-in-golang-and-how-go-makes-it-so-much-fun-4375c1246e81#.gv7tdlghs)
2020
that is executed either on the gRPC Server before the request is passed onto the user's application logic, or on the gRPC client either around the user call. It is a perfect way to implement
2121
common patterns: auth, logging, message, validation, retries or monitoring.
2222

@@ -54,13 +54,14 @@ myServer := grpc.NewServer(
5454
*Please send a PR to add new interceptors or middleware to this list*
5555

5656
#### Auth
57-
* [`auth`](auth) - a customizable (via `AuthFunc`) piece of auth middleware
57+
* [`auth`](auth) - a customizable (via `AuthFunc`) piece of auth middleware
5858

5959
#### Logging
6060
* [`tags`](interceptors/tags) - a library that adds a `Tag` map to context, with data populated from request body
6161
* [`zap`](providers/zap) - integration of [zap](https://github.com/uber-go/zap) logging library into gRPC handlers.
6262
* [`logrus`](providers/logrus) - integration of [logrus](https://github.com/sirupsen/logrus) logging library into gRPC handlers.
6363
* [`kit`](providers/kit) - integration of [go-kit](https://github.com/go-kit/kit/tree/master/log) logging library into gRPC handlers.
64+
* [`zerolog`](providers/zerolog) - integration of [zerolog](https://github.com/rs/zerolog) logging Library into gRPC handlers.
6465

6566
#### Monitoring
6667
* [`grpc_prometheus`](https://github.com/grpc-ecosystem/go-grpc-prometheus) - Prometheus client-side and server-side monitoring middleware

interceptors/logging/doc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Implementations:
2929
* providers/logrus
3030
* providers/zap
3131
* providers/kit
32+
* providers/zerolog
3233
3334
See relevant packages below.
3435
*/

providers/zerolog/doc.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/*
2+
Package zerolog provides a small adapter required to use zerolog in logging gRPC middlewares.
3+
Please see examples for examples of use.
4+
*/
5+
package zerolog

providers/zerolog/examples_test.go

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
package zerolog_test
2+
3+
import (
4+
"context"
5+
"os"
6+
"testing"
7+
8+
"github.com/rs/zerolog"
9+
"google.golang.org/grpc"
10+
11+
middleware "github.com/grpc-ecosystem/go-grpc-middleware/v2"
12+
"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging"
13+
"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/tags"
14+
grpczerolog "github.com/grpc-ecosystem/go-grpc-middleware/v2/providers/zerolog"
15+
)
16+
17+
var (
18+
customFunc logging.CodeToLevel
19+
customDurationToFields logging.DurationToFields
20+
)
21+
22+
func Example_initializationWithCustomLevels() {
23+
// Logger is used, allowing pre-definition of certain fields by the user.
24+
logger := zerolog.New(os.Stderr)
25+
// Shared options for the logger, with a custom gRPC code to log level function.
26+
opts := []logging.Option{
27+
logging.WithLevels(customFunc),
28+
}
29+
// Create a server, make sure we put the tags context before everything else.
30+
_ = grpc.NewServer(
31+
middleware.WithUnaryServerChain(
32+
tags.UnaryServerInterceptor(),
33+
logging.UnaryServerInterceptor(grpczerolog.InterceptorLogger(logger), opts...),
34+
),
35+
middleware.WithStreamServerChain(
36+
tags.StreamServerInterceptor(),
37+
logging.StreamServerInterceptor(grpczerolog.InterceptorLogger(logger), opts...),
38+
),
39+
)
40+
}
41+
42+
func Example_initializationWithDurationFieldOverride() {
43+
// Logger is used, allowing pre-definition of certain fields by the user.
44+
logger := zerolog.New(os.Stderr)
45+
// Shared options for the logger, with a custom duration to log field function.
46+
opts := []logging.Option{
47+
logging.WithDurationField(customDurationToFields),
48+
}
49+
// Create a server, make sure we put the tags context before everything else.
50+
_ = grpc.NewServer(
51+
middleware.WithUnaryServerChain(
52+
tags.UnaryServerInterceptor(),
53+
logging.UnaryServerInterceptor(grpczerolog.InterceptorLogger(logger), opts...),
54+
),
55+
middleware.WithStreamServerChain(
56+
tags.StreamServerInterceptor(),
57+
logging.StreamServerInterceptor(grpczerolog.InterceptorLogger(logger), opts...),
58+
),
59+
)
60+
}
61+
62+
func Example_initializationWithCodeGenRequestFieldExtractor() {
63+
// Logger is used, allowing pre-definition of certain fields by the user.
64+
logger := zerolog.New(os.Stderr)
65+
// Create a server, make sure we put the tags context before everything else.
66+
_ = grpc.NewServer(
67+
middleware.WithUnaryServerChain(
68+
tags.UnaryServerInterceptor(tags.WithFieldExtractor(tags.CodeGenRequestFieldExtractor)),
69+
logging.UnaryServerInterceptor(grpczerolog.InterceptorLogger(logger)),
70+
),
71+
middleware.WithStreamServerChain(
72+
tags.StreamServerInterceptor(tags.WithFieldExtractor(tags.CodeGenRequestFieldExtractor)),
73+
logging.StreamServerInterceptor(grpczerolog.InterceptorLogger(logger)),
74+
),
75+
)
76+
}
77+
78+
func ExampleWithDecider() {
79+
// Logger is used, allowing pre-definition of certain fields by the user.
80+
logger := zerolog.New(os.Stderr)
81+
// Shared options for the logger, with a custom decider that log everything except successful
82+
// calls from "/blah.foo.healthcheck/Check" method.
83+
opts := []logging.Option{
84+
logging.WithDecider(func(methodFullName string, err error) bool {
85+
// will not log gRPC calls if it was a call to healthcheck and no error was raised
86+
if err == nil && methodFullName == "/blah.foo.healthcheck/Check" {
87+
return false
88+
}
89+
90+
// by default you will log all calls
91+
return true
92+
}),
93+
}
94+
// Create a server, make sure we put the tags context before everything else.
95+
_ = []grpc.ServerOption{
96+
middleware.WithUnaryServerChain(
97+
tags.UnaryServerInterceptor(),
98+
logging.UnaryServerInterceptor(grpczerolog.InterceptorLogger(logger), opts...),
99+
),
100+
middleware.WithStreamServerChain(
101+
tags.StreamServerInterceptor(),
102+
logging.StreamServerInterceptor(grpczerolog.InterceptorLogger(logger), opts...),
103+
),
104+
}
105+
}
106+
107+
func ExampleWithPayloadLogging() {
108+
// Logger is used, allowing pre-definition of certain fields by the user.
109+
logger := zerolog.New(os.Stderr)
110+
// Expect payload from "/blah.foo.healthcheck/Check" call to be logged.
111+
payloadDecider := func(ctx context.Context, fullMethodName string, servingObject interface{}) bool {
112+
return fullMethodName == "/blah.foo.healthcheck/Check"
113+
}
114+
115+
// Create a server, make sure we put the tags context before everything else.
116+
_ = []grpc.ServerOption{
117+
middleware.WithUnaryServerChain(
118+
tags.UnaryServerInterceptor(),
119+
logging.UnaryServerInterceptor(grpczerolog.InterceptorLogger(logger)),
120+
logging.PayloadUnaryServerInterceptor(grpczerolog.InterceptorLogger(logger), payloadDecider),
121+
),
122+
middleware.WithStreamServerChain(
123+
tags.StreamServerInterceptor(),
124+
logging.StreamServerInterceptor(grpczerolog.InterceptorLogger(logger)),
125+
logging.PayloadStreamServerInterceptor(grpczerolog.InterceptorLogger(logger), payloadDecider),
126+
),
127+
}
128+
}
129+
130+
func TestExamplesBuildable(t *testing.T) {
131+
Example_initializationWithCustomLevels()
132+
Example_initializationWithDurationFieldOverride()
133+
Example_initializationWithCodeGenRequestFieldExtractor()
134+
ExampleWithDecider()
135+
ExampleWithPayloadLogging()
136+
}

providers/zerolog/go.mod

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module github.com/grpc-ecosystem/go-grpc-middleware/v2/providers/zerolog
2+
3+
go 1.14
4+
5+
require (
6+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-20200501113911-9a95f0fdbfea
7+
github.com/rs/zerolog v1.19.0
8+
google.golang.org/grpc v1.19.0
9+
)

providers/zerolog/go.sum

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
2+
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
3+
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
4+
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
5+
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
6+
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
7+
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
8+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9+
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
10+
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
11+
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
12+
github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
13+
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
14+
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
15+
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
16+
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
17+
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
18+
github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
19+
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
20+
github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
21+
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
22+
github.com/grpc-ecosystem/go-grpc-middleware v1.2.0 h1:0IKlLyQ3Hs9nDaiK5cSHAGmcQEIC8l2Ts1u6x5Dfrqg=
23+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-20200501113911-9a95f0fdbfea h1:1Tk1IbruXbunEnaIZEFb+Hpv9BIZti3OxKwKn5wWyKk=
24+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-20200501113911-9a95f0fdbfea/go.mod h1:GugMBs30ZSAkckqXEAIEGyYdDH6EgqowG8ppA3Zt+AY=
25+
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
26+
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
27+
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
28+
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
29+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
30+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
31+
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
32+
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
33+
github.com/rs/zerolog v1.19.0 h1:hYz4ZVdUgjXTBUmrkrw55j1nHx68LfOKIQk5IYtyScg=
34+
github.com/rs/zerolog v1.19.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo=
35+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
36+
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
37+
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
38+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
39+
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
40+
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
41+
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
42+
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
43+
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
44+
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
45+
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
46+
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
47+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
48+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
49+
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
50+
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
51+
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
52+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
53+
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
54+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
55+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
56+
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
57+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
58+
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
59+
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
60+
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
61+
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
62+
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
63+
golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
64+
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
65+
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
66+
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
67+
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
68+
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
69+
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
70+
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
71+
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
72+
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
73+
google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4=
74+
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
75+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
76+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
77+
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
78+
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
79+
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
80+
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

providers/zerolog/logger.go

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
package zerolog
2+
3+
import (
4+
"fmt"
5+
6+
"github.com/rs/zerolog"
7+
8+
"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging"
9+
)
10+
11+
// Compatibility check.
12+
var _ logging.Logger = &Logger{}
13+
14+
// Logger is a zerolog logging adapter compatible with logging middlewares.
15+
type Logger struct {
16+
zerolog.Context
17+
}
18+
19+
// InterceptorLogger is a zerolog.Logger to Logger adapter.
20+
func InterceptorLogger(logger zerolog.Logger) *Logger {
21+
return &Logger{logger.With()}
22+
}
23+
24+
// Log implements the logging.Logger interface.
25+
func (l *Logger) Log(lvl logging.Level, msg string) {
26+
cl := l.Logger()
27+
switch lvl {
28+
case logging.DEBUG:
29+
cl.Debug().Msg(msg)
30+
case logging.INFO:
31+
cl.Info().Msg(msg)
32+
case logging.WARNING:
33+
cl.Warn().Msg(msg)
34+
case logging.ERROR:
35+
cl.Error().Msg(msg)
36+
default:
37+
// TODO(kb): Perhaps this should be a logged warning, defaulting to ERROR to get attention
38+
// without interrupting code flow?
39+
panic(fmt.Sprintf("zerolog: unknown level %s", lvl))
40+
}
41+
}
42+
43+
// With implements the logging.Logger interface.
44+
func (l *Logger) With(fields ...string) logging.Logger {
45+
vals := make(map[string]interface{}, len(fields)/2)
46+
for i := 0; i < len(fields); i += 2 {
47+
vals[fields[i]] = fields[i+1]
48+
}
49+
return InterceptorLogger(l.Fields(vals).Logger())
50+
}

0 commit comments

Comments
 (0)