Dev 22 jul to mock contracts

api/groups/blockGroup.go

@@ -11,6 +11,7 @@ import (
 	"github.com/ElrondNetwork/elrond-go-core/data/api"
 	"github.com/ElrondNetwork/elrond-go/api/errors"
 	"github.com/ElrondNetwork/elrond-go/api/shared"
+	"github.com/ElrondNetwork/elrond-go/api/shared/logging"
 	"github.com/gin-gonic/gin"
 )
 
@@ -86,7 +87,7 @@ func (bg *blockGroup) getBlockByNonce(c *gin.Context) {
 
 	start := time.Now()
 	block, err := bg.getFacade().GetBlockByNonce(nonce, withTxs)
-	log.Debug(fmt.Sprintf("GetBlockByNonce took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetBlockByNonce")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -121,7 +122,7 @@ func (bg *blockGroup) getBlockByHash(c *gin.Context) {
 
 	start := time.Now()
 	block, err := bg.getFacade().GetBlockByHash(hash, withTxs)
-	log.Debug(fmt.Sprintf("GetBlockByHash took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetBlockByHash")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -155,7 +156,7 @@ func (bg *blockGroup) getBlockByRound(c *gin.Context) {
 
 	start := time.Now()
 	block, err := bg.getFacade().GetBlockByRound(round, withTxs)
-	log.Debug(fmt.Sprintf("GetBlockByRound took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetBlockByRound")
 	if err != nil {
 		shared.RespondWith(
 			c,

api/groups/internalGroup.go

@@ -10,6 +10,7 @@ import (
 	"github.com/ElrondNetwork/elrond-go-core/core/check"
 	"github.com/ElrondNetwork/elrond-go/api/errors"
 	"github.com/ElrondNetwork/elrond-go/api/shared"
+	"github.com/ElrondNetwork/elrond-go/api/shared/logging"
 	"github.com/ElrondNetwork/elrond-go/common"
 	"github.com/gin-gonic/gin"
 )
@@ -161,7 +162,7 @@ func (ib *internalBlockGroup) getRawMetaBlockByNonce(c *gin.Context) {
 
 	start := time.Now()
 	rawBlock, err := ib.getFacade().GetInternalMetaBlockByNonce(common.ApiOutputFormatProto, nonce)
-	log.Debug(fmt.Sprintf("GetInternalMetaBlockByNonce with proto took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetInternalMetaBlockByNonce with proto")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -187,7 +188,7 @@ func (ib *internalBlockGroup) getRawMetaBlockByHash(c *gin.Context) {
 
 	start := time.Now()
 	rawBlock, err := ib.getFacade().GetInternalMetaBlockByHash(common.ApiOutputFormatProto, hash)
-	log.Debug(fmt.Sprintf("GetInternalMetaBlockByHash with proto took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetInternalMetaBlockByHash with proto")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -213,7 +214,7 @@ func (ib *internalBlockGroup) getRawMetaBlockByRound(c *gin.Context) {
 
 	start := time.Now()
 	rawBlock, err := ib.getFacade().GetInternalMetaBlockByRound(common.ApiOutputFormatProto, round)
-	log.Debug(fmt.Sprintf("GetInternalMetaBlockByRound with proto took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetInternalMetaBlockByRound with proto")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -239,7 +240,7 @@ func (ib *internalBlockGroup) getRawStartOfEpochMetaBlock(c *gin.Context) {
 
 	start := time.Now()
 	rawBlock, err := ib.getFacade().GetInternalStartOfEpochMetaBlock(common.ApiOutputFormatProto, epoch)
-	log.Debug(fmt.Sprintf("GetInternalStartOfEpochMetaBlock with proto took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetInternalStartOfEpochMetaBlock with proto")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -265,7 +266,7 @@ func (ib *internalBlockGroup) getRawShardBlockByNonce(c *gin.Context) {
 
 	start := time.Now()
 	rawBlock, err := ib.getFacade().GetInternalShardBlockByNonce(common.ApiOutputFormatProto, nonce)
-	log.Debug(fmt.Sprintf("GetInternalShardBlockByNonce with proto took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetInternalShardBlockByNonce with proto")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -291,7 +292,7 @@ func (ib *internalBlockGroup) getRawShardBlockByHash(c *gin.Context) {
 
 	start := time.Now()
 	rawBlock, err := ib.getFacade().GetInternalShardBlockByHash(common.ApiOutputFormatProto, hash)
-	log.Debug(fmt.Sprintf("GetInternalShardBlockByHash with proto took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetInternalShardBlockByHash with proto")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -317,7 +318,7 @@ func (ib *internalBlockGroup) getRawShardBlockByRound(c *gin.Context) {
 
 	start := time.Now()
 	rawBlock, err := ib.getFacade().GetInternalShardBlockByRound(common.ApiOutputFormatProto, round)
-	log.Debug(fmt.Sprintf("GetInternalShardBlockByRound with proto took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetInternalShardBlockByRound with proto")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -343,7 +344,7 @@ func (ib *internalBlockGroup) getJSONMetaBlockByNonce(c *gin.Context) {
 
 	start := time.Now()
 	block, err := ib.getFacade().GetInternalMetaBlockByNonce(common.ApiOutputFormatJSON, nonce)
-	log.Debug(fmt.Sprintf("GetInternalMetaBlockByNonce took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetInternalMetaBlockByNonce")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -369,7 +370,7 @@ func (ib *internalBlockGroup) getJSONMetaBlockByHash(c *gin.Context) {
 
 	start := time.Now()
 	block, err := ib.getFacade().GetInternalMetaBlockByHash(common.ApiOutputFormatJSON, hash)
-	log.Debug(fmt.Sprintf("GetInternalMetaBlockByHash took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetInternalMetaBlockByHash")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -395,7 +396,7 @@ func (ib *internalBlockGroup) getJSONMetaBlockByRound(c *gin.Context) {
 
 	start := time.Now()
 	block, err := ib.getFacade().GetInternalMetaBlockByRound(common.ApiOutputFormatJSON, round)
-	log.Debug(fmt.Sprintf("GetInternalMetaBlockByRound took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetInternalMetaBlockByRound")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -421,7 +422,7 @@ func (ib *internalBlockGroup) getJSONStartOfEpochMetaBlock(c *gin.Context) {
 
 	start := time.Now()
 	block, err := ib.getFacade().GetInternalStartOfEpochMetaBlock(common.ApiOutputFormatJSON, epoch)
-	log.Debug(fmt.Sprintf("GetInternalStartOfEpochMetaBlock took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetInternalStartOfEpochMetaBlock")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -447,7 +448,7 @@ func (ib *internalBlockGroup) getJSONShardBlockByNonce(c *gin.Context) {
 
 	start := time.Now()
 	block, err := ib.getFacade().GetInternalShardBlockByNonce(common.ApiOutputFormatJSON, nonce)
-	log.Debug(fmt.Sprintf("GetInternalShardBlockByNonce took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetInternalShardBlockByNonce")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -473,7 +474,7 @@ func (ib *internalBlockGroup) getJSONShardBlockByHash(c *gin.Context) {
 
 	start := time.Now()
 	block, err := ib.getFacade().GetInternalShardBlockByHash(common.ApiOutputFormatJSON, hash)
-	log.Debug(fmt.Sprintf("GetInternalShardBlockByHash took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetInternalShardBlockByHash")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -499,7 +500,7 @@ func (ib *internalBlockGroup) getJSONShardBlockByRound(c *gin.Context) {
 
 	start := time.Now()
 	block, err := ib.getFacade().GetInternalShardBlockByRound(common.ApiOutputFormatJSON, round)
-	log.Debug(fmt.Sprintf("GetInternalShardBlockByRound took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetInternalShardBlockByRound")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -533,7 +534,7 @@ func (ib *internalBlockGroup) getRawMiniBlockByHash(c *gin.Context) {
 
 	start := time.Now()
 	miniBlock, err := ib.getFacade().GetInternalMiniBlockByHash(common.ApiOutputFormatProto, hash, epoch)
-	log.Debug(fmt.Sprintf("GetInternalMiniBlockByHash with proto took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetInternalMiniBlockByHash")
 	if err != nil {
 		shared.RespondWith(
 			c,
@@ -567,7 +568,7 @@ func (ib *internalBlockGroup) getJSONMiniBlockByHash(c *gin.Context) {
 
 	start := time.Now()
 	miniBlock, err := ib.getFacade().GetInternalMiniBlockByHash(common.ApiOutputFormatJSON, hash, epoch)
-	log.Debug(fmt.Sprintf("GetInternalMiniBlockByHash took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetInternalMiniBlockByHash")
 	if err != nil {
 		shared.RespondWith(
 			c,

api/groups/networkGroup.go

@@ -11,6 +11,7 @@ import (
 	"github.com/ElrondNetwork/elrond-go-core/data/api"
 	"github.com/ElrondNetwork/elrond-go/api/errors"
 	"github.com/ElrondNetwork/elrond-go/api/shared"
+	"github.com/ElrondNetwork/elrond-go/api/shared/logging"
 	"github.com/ElrondNetwork/elrond-go/common"
 	"github.com/ElrondNetwork/elrond-go/node/external"
 	"github.com/gin-gonic/gin"
@@ -392,7 +393,7 @@ func (ng *networkGroup) getRatingsConfig(c *gin.Context) {
 func (ng *networkGroup) getGenesisNodesConfig(c *gin.Context) {
 	start := time.Now()
 	eligibleNodesConfig, waitingNodesConfig, err := ng.getFacade().GetGenesisNodesPubKeys()
-	log.Debug(fmt.Sprintf("GetGenesisNodesPubKeys took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetGenesisNodesPubKeys")
 
 	if err != nil {
 		c.JSON(

api/shared/logging/logging.go

@@ -0,0 +1,19 @@
+package logging
+
+import (
+	"fmt"
+	"time"
+
+	logger "github.com/ElrondNetwork/elrond-go-logger"
+)
+
+var log = logger.GetOrCreate("api/shared/logging")
+const thresholdMinAPICallDurationToLog = 200 * time.Millisecond
+
+// LogAPIActionDurationIfNeeded will log the duration of an action triggered by an API call if it's above a threshold
+func LogAPIActionDurationIfNeeded(startTime time.Time, action string) {
+	duration := time.Since(startTime)
+	if duration > thresholdMinAPICallDurationToLog {
+		log.Debug(fmt.Sprintf("%s took %s", action, duration))
+	}
+}

node/external/blockAPI/baseBlock.go

@@ -3,10 +3,10 @@ package blockAPI
 import (
 	"bytes"
 	"encoding/hex"
-	"fmt"
 	"time"
 
 	"github.com/ElrondNetwork/elrond-go-core/data"
+	"github.com/ElrondNetwork/elrond-go/api/shared/logging"
 
 	"github.com/ElrondNetwork/elrond-go-core/core"
 	"github.com/ElrondNetwork/elrond-go-core/data/api"
@@ -159,7 +159,7 @@ func (bap *baseAPIBlockProcessor) getReceiptsFromMiniblock(miniblock *block.Mini
 		log.Warn("cannot get receipts from storage", "error", err.Error())
 		return []*transaction.ApiReceipt{}
 	}
-	log.Debug(fmt.Sprintf("GetBulkFromEpoch took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetBulkFromEpoch")
 
 	apiReceipts := make([]*transaction.ApiReceipt, 0)
 	for recHash, recBytes := range marshalizedReceipts {
@@ -192,7 +192,7 @@ func (bap *baseAPIBlockProcessor) getTxsFromMiniblock(
 			"error", err.Error())
 		return []*transaction.ApiTransactionResult{}
 	}
-	log.Debug(fmt.Sprintf("GetBulkFromEpoch took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "GetBulkFromEpoch")
 
 	start = time.Now()
 	txs := make([]*transaction.ApiTransactionResult, 0)
@@ -215,7 +215,7 @@ func (bap *baseAPIBlockProcessor) getTxsFromMiniblock(
 
 		txs = append(txs, tx)
 	}
-	log.Debug(fmt.Sprintf("UnmarshalTransactions took %s", time.Since(start)))
+	logging.LogAPIActionDurationIfNeeded(start, "UnmarshalTransactions")
 
 	return txs
 }