Fix block gas metric (#846)

zjshen14 · zjshen14 · commit 3042d1844b8c · 2019-03-26T13:02:24.000-07:00
diff --git a/blockchain/blockchain.go b/blockchain/blockchain.go
@@ -554,7 +554,6 @@ func (bc *blockchain) MintNewBlock(
 	}
 
 	blockMtc.WithLabelValues("numActions").Set(float64(len(actions)))
-	blockMtc.WithLabelValues("gasConsumed").Set(float64(bc.config.Genesis.BlockGasLimit - gasLimitForContext))
 
 	sk := bc.config.ProducerPrivateKey()
 	ra := block.NewRunnableActionsBuilder().
@@ -1070,6 +1069,8 @@ func (bc *blockchain) pickAndRunActions(ctx context.Context, actionMap map[strin
 		executedActions = append(executedActions, grant)
 	}
 
+	blockMtc.WithLabelValues("gasConsumed").Set(float64(bc.config.Genesis.BlockGasLimit - raCtx.GasLimit))
+
 	return ws.UpdateBlockLevelInfo(raCtx.BlockHeight), receipts, executedActions, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,6 @@ func (bc *blockchain) MintNewBlock(`
`554`	`554`	`}`
`555`	`555`
`556`	`556`	`blockMtc.WithLabelValues("numActions").Set(float64(len(actions)))`
`557`		`- blockMtc.WithLabelValues("gasConsumed").Set(float64(bc.config.Genesis.BlockGasLimit - gasLimitForContext))`
`558`	`557`
`559`	`558`	`sk := bc.config.ProducerPrivateKey()`
`560`	`559`	`ra := block.NewRunnableActionsBuilder().`
`@@ -1070,6 +1069,8 @@ func (bc *blockchain) pickAndRunActions(ctx context.Context, actionMap map[strin`
`1070`	`1069`	`executedActions = append(executedActions, grant)`
`1071`	`1070`	`}`
`1072`	`1071`
	`1072`	`+ blockMtc.WithLabelValues("gasConsumed").Set(float64(bc.config.Genesis.BlockGasLimit - raCtx.GasLimit))`
	`1073`	`+`
`1073`	`1074`	`return ws.UpdateBlockLevelInfo(raCtx.BlockHeight), receipts, executedActions, nil`
`1074`	`1075`	`}`
`1075`	`1076`