rpc: address comments

This commit is contained in:
rjl493456442 2020-04-01 18:21:40 +08:00
parent ad574507a6
commit c6cae32932
2 changed files with 9 additions and 9 deletions

View file

@ -333,14 +333,14 @@ func (h *handler) handleCall(cp *callProc, msg *jsonrpcMessage) *jsonrpcMessage
// Collect the statistics for RPC calls if metrics is enabled. // Collect the statistics for RPC calls if metrics is enabled.
// We only care about pure rpc call. Filter out subscription. // We only care about pure rpc call. Filter out subscription.
if callb != h.unsubscribeCb { if callb != h.unsubscribeCb {
jsonrpcRequestGauge.Inc(1) rpcRequestGauge.Inc(1)
if answer.Error != nil { if answer.Error != nil {
failedReqeustGauge.Inc(1) failedReqeustGauge.Inc(1)
} else { } else {
successfulRequestGauge.Inc(1) successfulRequestGauge.Inc(1)
} }
jsonrpcServingTimer.UpdateSince(start) rpcServingTimer.UpdateSince(start)
newJsonrpcServingTimer(msg.Method, answer.Error == nil).UpdateSince(start) newRPCServingTimer(msg.Method, answer.Error == nil).UpdateSince(start)
} }
return answer return answer
} }

View file

@ -23,17 +23,17 @@ import (
) )
var ( var (
jsonrpcRequestGauge = metrics.NewRegisteredGauge("rpc/jsonrpc/requests", nil) rpcRequestGauge = metrics.NewRegisteredGauge("rpc/requests", nil)
successfulRequestGauge = metrics.NewRegisteredGauge("rpc/jsonrpc/success", nil) successfulRequestGauge = metrics.NewRegisteredGauge("rpc/success", nil)
failedReqeustGauge = metrics.NewRegisteredGauge("rpc/jsonrpc/failure", nil) failedReqeustGauge = metrics.NewRegisteredGauge("rpc/failure", nil)
jsonrpcServingTimer = metrics.NewRegisteredTimer("rpc/jsonrpc/duration/all", nil) rpcServingTimer = metrics.NewRegisteredTimer("rpc/duration/all", nil)
) )
func newJsonrpcServingTimer(method string, valid bool) metrics.Timer { func newRPCServingTimer(method string, valid bool) metrics.Timer {
flag := "success" flag := "success"
if !valid { if !valid {
flag = "failure" flag = "failure"
} }
m := fmt.Sprintf("rpc/jsonrpc/duration/%s/%s", method, flag) m := fmt.Sprintf("rpc/duration/%s/%s", method, flag)
return metrics.GetOrRegisterTimer(m, nil) return metrics.GetOrRegisterTimer(m, nil)
} }