close_issue_1
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

internal/jsonrpc2: adding rpc trace tasks 

Change-Id: I101957f7aeb95034a71ab2db47e0422721c500f6
Reviewed-on: https://go-review.googlesource.com/c/tools/+/179717
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
This commit is contained in:
Ian Cottrell 2019-03-13 20:45:59 -04:00
parent 37dc81f201
commit 359a0754b7
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/jsonrpc2/jsonrpc2.go
View File

@ -11,6 +11,7 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"runtime/trace"
"sync" "sync"
"sync/atomic" "sync/atomic"
"time" "time"
@ -103,6 +104,8 @@ func (c *Conn) Cancel(id ID) {
// It will return as soon as the notification has been sent, as no response is // It will return as soon as the notification has been sent, as no response is
// possible. // possible.
func (c *Conn) Notify(ctx context.Context, method string, params interface{}) error { func (c *Conn) Notify(ctx context.Context, method string, params interface{}) error {
ctx, task := trace.NewTask(ctx, "jsonrpc2.Notify "+method)
defer task.End()
jsonParams, err := marshalToRaw(params) jsonParams, err := marshalToRaw(params)
if err != nil { if err != nil {
return fmt.Errorf("marshalling notify parameters: %v", err) return fmt.Errorf("marshalling notify parameters: %v", err)
@ -123,12 +126,15 @@ func (c *Conn) Notify(ctx context.Context, method string, params interface{}) er
// If the response is not an error, it will be decoded into result. // If the response is not an error, it will be decoded into result.
// result must be of a type you an pass to json.Unmarshal. // result must be of a type you an pass to json.Unmarshal.
func (c *Conn) Call(ctx context.Context, method string, params, result interface{}) error { func (c *Conn) Call(ctx context.Context, method string, params, result interface{}) error {
ctx, task := trace.NewTask(ctx, "jsonrpc2.Call "+method)
defer task.End()
jsonParams, err := marshalToRaw(params) jsonParams, err := marshalToRaw(params)
if err != nil { if err != nil {
return fmt.Errorf("marshalling call parameters: %v", err) return fmt.Errorf("marshalling call parameters: %v", err)
} }
// generate a new request identifier // generate a new request identifier
id := ID{Number: atomic.AddInt64(&c.seq, 1)} id := ID{Number: atomic.AddInt64(&c.seq, 1)}
trace.Logf(ctx, "jsonrpc2", "request id %v", id)
request := &Request{ request := &Request{
ID: &id, ID: &id,
Method: method, Method: method,
@ -186,6 +192,8 @@ func (c *Conn) Call(ctx context.Context, method string, params, result interface
// You must call this exactly once for any given request. // You must call this exactly once for any given request.
// If err is set then result will be ignored. // If err is set then result will be ignored.
func (c *Conn) Reply(ctx context.Context, req *Request, result interface{}, err error) error { func (c *Conn) Reply(ctx context.Context, req *Request, result interface{}, err error) error {
ctx, task := trace.NewTask(ctx, "jsonrpc2.Reply "+req.Method)
defer task.End()
if req.IsNotify() { if req.IsNotify() {
return fmt.Errorf("reply not invoked with a valid call") return fmt.Errorf("reply not invoked with a valid call")
} }
@ -273,7 +281,12 @@ func (c *Conn) Run(ctx context.Context) error {
if e.ctx.Err() != nil { if e.ctx.Err() != nil {
continue continue
} }
c.Handler(e.ctx, e.c, e.r) ctx, task := trace.NewTask(e.ctx, "jsonrpc2.Handle "+e.r.Method)
if !e.r.IsNotify() {
trace.Logf(ctx, "jsonrpc2", "request id %v", e.r.ID)
}
c.Handler(ctx, e.c, e.r)
task.End()
} }
}() }()
for { for {