Skip to content

rework the grpc callinfo to include the peer remote address #4151

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

Merged
sougou merged 1 commit into from
Aug 24, 2018
Merged

rework the grpc callinfo to include the peer remote address #4151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 15 additions & 6 deletions go/vt/callinfo/plugin_grpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (

"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/peer"
)

// GRPCCallInfo returns an augmented context with a CallInfo structure,
Expand All @@ -33,27 +34,35 @@ func GRPCCallInfo(ctx context.Context) context.Context {
if !ok {
return ctx
}
return NewContext(ctx, &gRPCCallInfoImpl{

callinfo := &gRPCCallInfoImpl{
method: method,
})
}
peer, ok := peer.FromContext(ctx)
if ok {
callinfo.remoteAddr = peer.Addr.String()
}

return NewContext(ctx, callinfo)
}

type gRPCCallInfoImpl struct {
method string
method string
remoteAddr string
}

func (gci *gRPCCallInfoImpl) RemoteAddr() string {
return "remote"
return gci.remoteAddr
}

func (gci *gRPCCallInfoImpl) Username() string {
return "gRPC"
}

func (gci *gRPCCallInfoImpl) Text() string {
return fmt.Sprintf("%s(gRPC)", gci.method)
return fmt.Sprintf("%s:%s(gRPC)", gci.remoteAddr, gci.method)
}

func (gci *gRPCCallInfoImpl) HTML() template.HTML {
return template.HTML("<b>Method:</b> " + gci.method)
return template.HTML("<b>Method:</b> " + gci.method + " <b>Remote Addr:</b> " + gci.remoteAddr)
}