Merge PR ：fix rpc monitor error (#892)

* fix rpc monitor error * fix rpc monitor elapse time Co-authored-by: KamiD <[email protected]>
okx · Jun 1, 2021 · b87806e · b87806e
1 parent 4b67a15
commit b87806e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/app/rpc/monitor/monitor.go b/app/rpc/monitor/monitor.go
@@ -33,5 +33,6 @@ func (m *Monitor) OnBegin(metrics map[string]metrics.Counter) {
 
 func (m *Monitor) OnEnd(args ...interface{}) {
 	now := time.Now().UnixNano()
-	m.logger.Debug(fmt.Sprintf("RPC: Method<%s>, Interval<%dms>, Params<%v>", m.method, (now-m.lastTimestamp)/1000, args))
+	unit := int64(1e6)
+	m.logger.Debug(fmt.Sprintf("RPC: Method<%s>, Interval<%dms>, Params<%v>", m.method, (now-m.lastTimestamp)/unit, args))
 }
diff --git a/app/rpc/namespaces/eth/api.go b/app/rpc/namespaces/eth/api.go
@@ -226,6 +226,10 @@ func (api *PublicEthereumAPI) Accounts() ([]common.Address, error) {
 	monitor := monitor.GetMonitor("eth_accounts", api.logger)
 	monitor.OnBegin(api.Metrics)
 	defer monitor.OnEnd()
+	return api.accounts()
+}
+
+func (api *PublicEthereumAPI) accounts() ([]common.Address, error) {
 	api.keyringLock.Lock()
 	defer api.keyringLock.Unlock()
 
@@ -687,7 +691,7 @@ func (api *PublicEthereumAPI) doCall(
 	var addr common.Address
 
 	if args.From == nil {
-		addrs, err := api.Accounts()
+		addrs, err := api.accounts()
 		if err == nil && len(addrs) > 0 {
 			addr = addrs[0]
 		}

diff --git a/app/rpc/namespaces/eth/filters/api.go b/app/rpc/namespaces/eth/filters/api.go
@@ -445,7 +445,7 @@ func (api *PublicFilterAPI) NewFilter(criteria filters.FilterCriteria) (rpc.ID,
 //
 // https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_getLogs
 func (api *PublicFilterAPI) GetLogs(ctx context.Context, criteria filters.FilterCriteria) ([]*ethtypes.Log, error) {
-	monitor := monitor.GetMonitor("eth_getBalance", api.logger)
+	monitor := monitor.GetMonitor("eth_getLogs", api.logger)
 	monitor.OnBegin(api.Metrics)
 	defer monitor.OnEnd("args", criteria)
 	rateLimiter := api.backend.GetRateLimiter("eth_getLogs")