Updated mocks. Removed the ClusterBlockProposed function, replaced it with ClusterBlockCreated

Author: durkmurder

module/metrics.go

@@ -615,10 +615,6 @@ type CollectionMetrics interface {
 	// a tx->col span for the transaction.
 	TransactionIngested(txID flow.Identifier)
 
-	// ClusterBlockProposed is called when a new collection is proposed by us or
-	// any other node in the cluster.
-	ClusterBlockProposed(block *cluster.Block)
-
 	// ClusterBlockFinalized is called when a collection is finalized.
 	ClusterBlockFinalized(block *cluster.Block)
 

module/metrics/collection.go

@@ -15,7 +15,6 @@ type CollectionCollector struct {
 	transactionsIngested prometheus.Counter       // tracks the number of ingested transactions
 	finalizedHeight      *prometheus.GaugeVec     // tracks the finalized height
 	maxCollectionSize    prometheus.Gauge         // tracks the maximum collection size
-	proposals            *prometheus.HistogramVec // tracks the number/size of PROPOSED collections
 	guarantees           *prometheus.HistogramVec // counts the number/size of FINALIZED collections
 	collectionSize       *prometheus.HistogramVec
 	priorityTxns         *prometheus.HistogramVec
@@ -48,14 +47,6 @@ func NewCollectionCollector(tracer module.Tracer) *CollectionCollector {
 			Help:      "last used max collection size",
 		}),
 
-		proposals: promauto.NewHistogramVec(prometheus.HistogramOpts{
-			Namespace: namespaceCollection,
-			Subsystem: subsystemProposal,
-			Buckets:   []float64{1, 2, 5, 10, 20},
-			Name:      "proposals_size_transactions",
-			Help:      "size/number of proposed collections",
-		}, []string{LabelChain}),
-
 		guarantees: promauto.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: namespaceCollection,
 			Subsystem: subsystemProposal,
@@ -90,14 +81,6 @@ func (cc *CollectionCollector) TransactionIngested(txID flow.Identifier) {
 	cc.transactionsIngested.Inc()
 }
 
-// ClusterBlockProposed tracks the size and number of proposals, as well as
-// starting the collection->guarantee span.
-func (cc *CollectionCollector) ClusterBlockProposed(block *cluster.Block) {
-	cc.proposals.
-		With(prometheus.Labels{LabelChain: block.ChainID.String()}).
-		Observe(float64(block.Payload.Collection.Len()))
-}
-
 // ClusterBlockFinalized updates the guaranteed collection size gauge and
 // finishes the tx->collection span for each constituent transaction.
 func (cc *CollectionCollector) ClusterBlockFinalized(block *cluster.Block) {

module/metrics/noop.go

@@ -125,7 +125,6 @@ func (nc *NoopCollector) ValidatorProcessingDuration(duration time.Duration)
 func (nc *NoopCollector) PayloadProductionDuration(duration time.Duration)               {}
 func (nc *NoopCollector) TimeoutCollectorsRange(uint64, uint64, int)                     {}
 func (nc *NoopCollector) TransactionIngested(txID flow.Identifier)                       {}
-func (nc *NoopCollector) ClusterBlockProposed(*cluster.Block)                            {}
 func (nc *NoopCollector) ClusterBlockFinalized(*cluster.Block)                           {}
 func (nc *NoopCollector) CollectionMaxSize(uint)                                         {}
 func (nc *NoopCollector) ClusterBlockCreated(*cluster.Block, uint)                       {}