Merge pull request #6362 from onflow/ramtin/evm-expose-metrics-report…

…er-to-system-transaction

[FVM] Let the system transaction report metrics

engine/execution/computation/computer/computer.go

@@ -119,7 +119,7 @@ type blockComputer struct {
 	maxConcurrency        int
 }
 
-func SystemChunkContext(vmCtx fvm.Context) fvm.Context {
+func SystemChunkContext(vmCtx fvm.Context, metrics module.ExecutionMetrics) fvm.Context {
 	return fvm.NewContextFromParent(
 		vmCtx,
 		fvm.WithContractDeploymentRestricted(false),
@@ -131,6 +131,7 @@ func SystemChunkContext(vmCtx fvm.Context) fvm.Context {
 		fvm.WithMemoryAndInteractionLimitsDisabled(),
 		// only the system transaction is allowed to call the block entropy provider
 		fvm.WithRandomSourceHistoryCallAllowed(true),
+		fvm.WithMetricsReporter(metrics),
 	)
 }
 
@@ -158,7 +159,7 @@ func NewBlockComputer(
 		return nil, fmt.Errorf("program cache writes are not allowed in scripts on Execution nodes")
 	}
 
-	systemChunkCtx := SystemChunkContext(vmCtx)
+	systemChunkCtx := SystemChunkContext(vmCtx, metrics)
 	vmCtx = fvm.NewContextFromParent(
 		vmCtx,
 		fvm.WithMetricsReporter(metrics),

engine/execution/computation/computer/computer_test.go

@@ -1296,6 +1296,18 @@ func Test_ExecutingSystemCollection(t *testing.T) {
 		mock.Anything).
 		Return(nil)
 
+	metrics.On("RuntimeTransactionParsed", mock.Anything)
+	metrics.On("RuntimeTransactionProgramsCacheMiss")
+	metrics.On("RuntimeTransactionProgramsCacheHit")
+	metrics.On("RuntimeTransactionChecked", mock.Anything)
+	metrics.On("RuntimeTransactionInterpreted", mock.Anything)
+
+	metrics.On("EVMBlockExecuted",
+		mock.Anything,
+		mock.Anything,
+		mock.Anything,
+	)
+
 	bservice := requesterunit.MockBlobService(blockstore.NewBlockstore(dssync.MutexWrap(datastore.NewMapDatastore())))
 	trackerStorage := mocktracker.NewMockStorage()
 

module/chunks/chunkVerifier.go

@@ -21,6 +21,7 @@ import (
 	"github.com/onflow/flow-go/model/verification"
 	"github.com/onflow/flow-go/module/executiondatasync/execution_data"
 	"github.com/onflow/flow-go/module/executiondatasync/provider"
+	"github.com/onflow/flow-go/module/metrics"
 )
 
 // ChunkVerifier is a verifier based on the current definitions of the flow network
@@ -36,7 +37,7 @@ func NewChunkVerifier(vm fvm.VM, vmCtx fvm.Context, logger zerolog.Logger) *Chun
 	return &ChunkVerifier{
 		vm:             vm,
 		vmCtx:          vmCtx,
-		systemChunkCtx: computer.SystemChunkContext(vmCtx),
+		systemChunkCtx: computer.SystemChunkContext(vmCtx, metrics.NewNoopCollector()),
 		logger:         logger.With().Str("component", "chunk_verifier").Logger(),
 	}
 }