diff --git a/rpc/handler.go b/rpc/handler.go index 1f1c9d0792..c8571ad795 100644 --- a/rpc/handler.go +++ b/rpc/handler.go @@ -333,14 +333,14 @@ func (h *handler) handleCall(cp *callProc, msg *jsonrpcMessage) *jsonrpcMessage // Collect the statistics for RPC calls if metrics is enabled. // We only care about pure rpc call. Filter out subscription. if callb != h.unsubscribeCb { - jsonrpcRequestGauge.Inc(1) + rpcRequestGauge.Inc(1) if answer.Error != nil { failedReqeustGauge.Inc(1) } else { successfulRequestGauge.Inc(1) } - jsonrpcServingTimer.UpdateSince(start) - newJsonrpcServingTimer(msg.Method, answer.Error == nil).UpdateSince(start) + rpcServingTimer.UpdateSince(start) + newRPCServingTimer(msg.Method, answer.Error == nil).UpdateSince(start) } return answer } diff --git a/rpc/metrics.go b/rpc/metrics.go index e76bbb04eb..7fb6fc0a17 100644 --- a/rpc/metrics.go +++ b/rpc/metrics.go @@ -23,17 +23,17 @@ import ( ) var ( - jsonrpcRequestGauge = metrics.NewRegisteredGauge("rpc/jsonrpc/requests", nil) - successfulRequestGauge = metrics.NewRegisteredGauge("rpc/jsonrpc/success", nil) - failedReqeustGauge = metrics.NewRegisteredGauge("rpc/jsonrpc/failure", nil) - jsonrpcServingTimer = metrics.NewRegisteredTimer("rpc/jsonrpc/duration/all", nil) + rpcRequestGauge = metrics.NewRegisteredGauge("rpc/requests", nil) + successfulRequestGauge = metrics.NewRegisteredGauge("rpc/success", nil) + failedReqeustGauge = metrics.NewRegisteredGauge("rpc/failure", 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" if !valid { 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) }