Skip to content

Zap custom jsonpb to allow optional gogo JSONPb serialization #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Zap custom jsonpb to allow optional gogo JSONPb serialization #149

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e375512
Proof of concept
antoniomo Jul 3, 2018
124f5a0
Bugfix from goimports
antoniomo Jul 3, 2018
23d94e9
Autogenerated docs
antoniomo Jul 3, 2018
82cb20e
Merge remote-tracking branch 'upstream/master' into zap_custom_jsonpb
antoniomo Mar 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions logging/zap/payload_interceptors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
package grpc_zap

import (
"bytes"
"fmt"

"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
"github.com/grpc-ecosystem/go-grpc-middleware/logging"
"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"golang.org/x/net/context"
"google.golang.org/grpc"
)

// Marshaler interface for JsonPbMarshaler
type Marshaler interface {
Marshal(v interface{}) ([]byte, error)
}

var (
// JsonPbMarshaller is the marshaller used for serializing protobuf messages.
JsonPbMarshaller = &jsonpb.Marshaler{}
// JsonPbMarshaler is the marshaler used for serializing protobuf messages.
JsonPbMarshaler Marshaler = &runtime.JSONPb{}
)

// PayloadUnaryServerInterceptor returns a new unary server interceptors that logs the payloads of requests.
Expand Down Expand Up @@ -141,9 +145,9 @@ func (j *jsonpbObjectMarshaler) MarshalLogObject(e zapcore.ObjectEncoder) error
}

func (j *jsonpbObjectMarshaler) MarshalJSON() ([]byte, error) {
b := &bytes.Buffer{}
if err := JsonPbMarshaller.Marshal(b, j.pb); err != nil {
bytes, err := JsonPbMarshaler.Marshal(j.pb)
if err != nil {
return nil, fmt.Errorf("jsonpb serializer failed: %v", err)
}
return b.Bytes(), nil
return bytes, nil
}