core/tracker: add participation counter (#1175)

Adds participation counter metric.
Fixes unexpected event logic for `DutyPrepareAggreagtor`.
Updates simnet dashboard.

category: feature
ticket: #1109

core/tracker/metrics.go

@@ -29,11 +29,18 @@ var (
 		Help:      "Set to 1 if peer participated successfully for the given duty or else 0",
 	}, []string{"duty", "peer"})
 
+	participationCounter = promauto.NewCounterVec(prometheus.CounterOpts{
+		Namespace: "core",
+		Subsystem: "tracker",
+		Name:      "participation_total",
+		Help:      "Total number of successful participations by peer and duty type",
+	}, []string{"duty", "peer"})
+
 	failedCounter = promauto.NewCounterVec(prometheus.CounterOpts{
 		Namespace: "core",
 		Subsystem: "tracker",
 		Name:      "failed_duties_total",
-		Help:      "Total number of failed duties by component",
+		Help:      "Total number of failed duties by type and component",
 	}, []string{"duty", "component"})
 
 	unexpectedEventsCounter = promauto.NewCounterVec(prometheus.CounterOpts{

core/tracker/tracker.go

@@ -315,7 +315,7 @@ func analyseFetcherFailed(duty core.Duty, allEvents map[core.Duty][]event) (bool
 		//  and "failed fetching aggregated attestation from BN".
 		//
 		// Assume no aggregators for slot as this is very common.
-		return false, zero, ""
+		return false, fetcher, ""
 	}
 
 	return true, fetcher, msg
@@ -393,6 +393,15 @@ func isParSigEventExpected(duty core.Duty, pubkey core.PubKey, allEvents map[cor
 		}
 	}
 
+	if duty.Type == core.DutyPrepareAggregator {
+		// Check that if we got DutyAttester event from scheduler.
+		for _, e := range allEvents[core.NewAttesterDuty(duty.Slot)] {
+			if e.component == scheduler && e.pubkey == pubkey {
+				return true
+			}
+		}
+	}
+
 	// For all other duties check for scheduler event.
 	for _, e := range allEvents[duty] {
 		if e.component == scheduler && e.pubkey == pubkey {
@@ -414,9 +423,9 @@ func newParticipationReporter(peers []p2p.Peer) func(context.Context, core.Duty,
 		for _, peer := range peers {
 			if participatedShares[peer.ShareIdx()] {
 				participationGauge.WithLabelValues(duty.Type.String(), peer.Name).Set(1)
+				participationCounter.WithLabelValues(duty.Type.String(), peer.Name).Inc()
 			} else if unexpectedShares[peer.ShareIdx()] {
-				// TODO(corver): Enable with https://github.com/ObolNetwork/charon/issues/993
-				// log.Warn(ctx, "Unexpected event found", nil, z.Str("peer", peer.Name), z.Str("duty", duty.String()))
+				log.Warn(ctx, "Unexpected event found", nil, z.Str("peer", peer.Name), z.Str("duty", duty.String()))
 				unexpectedEventsCounter.WithLabelValues(peer.Name).Inc()
 			} else {
 				absentPeers = append(absentPeers, peer.Name)

testutil/compose/compose/main.go

@@ -282,6 +282,7 @@ func newNewCmd() *cobra.Command {
 	splitKeys := cmd.Flags().String("split-keys-dir", conf.SplitKeysDir, "Directory containing keys to split for keygen==create, or empty not to split.")
 	featureSet := cmd.Flags().String("feature-set", conf.FeatureSet, "Minimum feature set to enable: alpha, beta, stable")
 	numVals := cmd.Flags().Int("num-validators", conf.NumValidators, "Number of distributed validators.")
+	vcTypes := cmd.Flags().StringSlice("validator-types", conf.VCStrings(), "Validator types to include.")
 
 	cmd.RunE = func(cmd *cobra.Command, _ []string) error {
 		conf.KeyGen = compose.KeyGen(*keygen)
@@ -292,6 +293,12 @@ func newNewCmd() *cobra.Command {
 		conf.ExternalBootnode = *extBootnode
 		conf.NumValidators = *numVals
 
+		var vcs []compose.VCType
+		for _, vc := range *vcTypes {
+			vcs = append(vcs, compose.VCType(vc))
+		}
+		conf.VCs = vcs
+
 		ctx := log.WithTopic(cmd.Context(), "new")
 		if err := compose.New(ctx, *dir, conf); err != nil {
 			log.Error(ctx, "Fatal error", err)

testutil/compose/config.go

@@ -119,6 +119,16 @@ type Config struct {
 	DisableLoki bool `json:"disable_loki"`
 }
 
+// VCStrings returns the VCs field as a slice of strings.
+func (c Config) VCStrings() []string {
+	var resp []string
+	for _, vc := range c.VCs {
+		resp = append(resp, string(vc))
+	}
+
+	return resp
+}
+
 // entrypoint returns the path to the charon binary based on the BuildLocal field.
 func (c Config) entrypoint() string {
 	if c.BuildBinary || c.PrebuiltBinary {