Merge pull request #962 from iotaledger/feat/add-engine-switching-met…

…rics Add engine-switching related metrics
iotaledger · May 7, 2024 · 973fe1e · 973fe1e
2 parents ed4f829 + 671de5a
commit 973fe1e
Show file tree

Hide file tree

Showing 10 changed files with 670 additions and 11,189 deletions.
diff --git a/components/prometheus/metrics_accounts.go b/components/prometheus/metrics_accounts.go
@@ -1,35 +1,16 @@
 package prometheus
 
 import (
-	"time"
-
-	"github.com/iotaledger/hive.go/runtime/event"
 	"github.com/iotaledger/iota-core/components/prometheus/collector"
-	"github.com/iotaledger/iota-core/pkg/protocol/engine/blocks"
 )
 
 const (
 	accountNamespace = "account"
 
-	credits     = "credits"
 	activeSeats = "active_seats"
 )
 
 var AccountMetrics = collector.NewCollection(accountNamespace,
-	collector.WithMetric(collector.NewMetric(credits,
-		collector.WithType(collector.Gauge),
-		collector.WithHelp("Credits per Account."),
-		collector.WithLabels("account"),
-		collector.WithPruningDelay(10*time.Minute),
-		collector.WithInitFunc(func() {
-			deps.Protocol.Events.Engine.BlockGadget.BlockAccepted.Hook(func(block *blocks.Block) {
-				accountData, exists, _ := deps.Protocol.Engines.Main.Get().Ledger.Account(block.IssuerID(), deps.Protocol.Engines.Main.Get().SyncManager.LatestCommitment().Slot())
-				if exists {
-					deps.Collector.Update(accountNamespace, credits, float64(accountData.Credits().Value()), accountData.ID().String())
-				}
-			}, event.WithWorkerPool(Component.WorkerPool))
-		}),
-	)),
 	collector.WithMetric(collector.NewMetric(activeSeats,
 		collector.WithType(collector.Gauge),
 		collector.WithHelp("Seats seen as active by the node."),

diff --git a/components/prometheus/metrics_commitments.go b/components/prometheus/metrics_commitments.go
@@ -7,6 +7,7 @@ import (
 	"github.com/iotaledger/hive.go/runtime/event"
 	"github.com/iotaledger/iota-core/components/prometheus/collector"
 	"github.com/iotaledger/iota-core/pkg/protocol"
+	"github.com/iotaledger/iota-core/pkg/protocol/engine"
 	"github.com/iotaledger/iota-core/pkg/protocol/engine/notarization"
 	iotago "github.com/iotaledger/iota.go/v4"
 )
@@ -20,6 +21,9 @@ const (
 	acceptedBlocks      = "accepted_blocks"
 	transactions        = "accepted_transactions"
 	validators          = "active_validators"
+	activeChainsCount   = "active_chains_count"
+	seenChainsCount     = "seen_chains_count"
+	spawnedEnginesCount = "spawned_engines_count"
 )
 
 var CommitmentsMetrics = collector.NewCollection(commitmentsNamespace,
@@ -54,6 +58,35 @@ var CommitmentsMetrics = collector.NewCollection(commitmentsNamespace,
 			})
 		}),
 	)),
+	collector.WithMetric(collector.NewMetric(spawnedEnginesCount,
+		collector.WithType(collector.Counter),
+		collector.WithHelp("Number spawned engines since the node started."),
+		collector.WithInitFunc(func() {
+			deps.Protocol.Chains.WithInitializedEngines(func(_ *protocol.Chain, _ *engine.Engine) (shutdown func()) {
+				Component.WorkerPool.Submit(func() { deps.Collector.Increment(commitmentsNamespace, spawnedEnginesCount) })
+
+				return nil
+			})
+		}),
+	)),
+	collector.WithMetric(collector.NewMetric(seenChainsCount,
+		collector.WithType(collector.Counter),
+		collector.WithHelp("Number chains seen since the node started."),
+		collector.WithInitFunc(func() {
+			deps.Protocol.Chains.WithElements(func(_ *protocol.Chain) (teardown func()) {
+				Component.WorkerPool.Submit(func() { deps.Collector.Increment(commitmentsNamespace, seenChainsCount) })
+
+				return nil
+			})
+		}),
+	)),
+	collector.WithMetric(collector.NewMetric(activeChainsCount,
+		collector.WithType(collector.Gauge),
+		collector.WithHelp("Number currently active chains."),
+		collector.WithCollectFunc(func() (metricValue float64, labelValues []string) {
+			return float64(deps.Protocol.Chains.Size()), nil
+		}),
+	)),
 	collector.WithMetric(collector.NewMetric(acceptedBlocks,
 		collector.WithType(collector.Gauge),
 		collector.WithHelp("Number of accepted blocks by the node per slot."),

diff --git a/components/prometheus/metrics_conflicts.go b/components/prometheus/metrics_conflicts.go
@@ -37,8 +37,11 @@ var ConflictMetrics = collector.NewCollection(conflictNamespace,
 		collector.WithType(collector.Counter),
 		collector.WithHelp("Number of resolved (accepted) conflicts"),
 		collector.WithInitFunc(func() {
-			//nolint:revive
-			deps.Protocol.Events.Engine.SpendDAG.SpenderAccepted.Hook(func(spendID iotago.TransactionID) {
+			deps.Protocol.Events.Engine.SpendDAG.SpenderAccepted.Hook(func(_ iotago.TransactionID) {
+				deps.Collector.Increment(conflictNamespace, resolvedConflictCount)
+			}, event.WithWorkerPool(Component.WorkerPool))
+
+			deps.Protocol.Events.Engine.SpendDAG.SpenderRejected.Hook(func(_ iotago.TransactionID) {
 				deps.Collector.Increment(conflictNamespace, resolvedConflictCount)
 			}, event.WithWorkerPool(Component.WorkerPool))
 		}),
@@ -47,8 +50,7 @@ var ConflictMetrics = collector.NewCollection(conflictNamespace,
 		collector.WithType(collector.Counter),
 		collector.WithHelp("Number of created conflicts"),
 		collector.WithInitFunc(func() {
-			//nolint:revive
-			deps.Protocol.Events.Engine.SpendDAG.SpenderCreated.Hook(func(spendID iotago.TransactionID) {
+			deps.Protocol.Events.Engine.SpendDAG.SpenderCreated.Hook(func(_ iotago.TransactionID) {
 				deps.Collector.Increment(conflictNamespace, allConflictCounts)
 			}, event.WithWorkerPool(Component.WorkerPool))
 		}),

diff --git a/components/prometheus/metrics_info.go b/components/prometheus/metrics_info.go
@@ -11,7 +11,6 @@ import (
 const (
 	infoNamespace = "info"
 
-	appName    = "app"
 	nodeOS     = "node_os"
 	syncStatus = "sync_status"
 	memUsage   = "memory_usage_bytes"

diff --git a/components/prometheus/metrics_slots.go b/components/prometheus/metrics_slots.go
@@ -12,17 +12,15 @@ import (
 )
 
 const (
-	slotNamespace             = "slots"
-	slotLabelName             = "slot"
-	metricEvictionOffset      = 6
-	totalBlocks               = "total_blocks"
-	acceptedBlocksInSlot      = "accepted_blocks"
-	invalidBlocks             = "invalid_blocks"
-	subjectivelyInvalidBlocks = "subjectively_invalid_blocks"
-	acceptedAttachments       = "accepted_attachments"
-	createdConflicts          = "created_conflicts"
-	acceptedConflicts         = "accepted_conflicts"
-	rejectedConflicts         = "rejected_conflicts"
+	slotNamespace        = "slots"
+	slotLabelName        = "slot"
+	totalBlocks          = "total_blocks"
+	acceptedBlocksInSlot = "accepted_blocks"
+	invalidBlocks        = "invalid_blocks"
+	acceptedAttachments  = "accepted_attachments"
+	createdConflicts     = "created_conflicts"
+	acceptedConflicts    = "accepted_conflicts"
+	rejectedConflicts    = "rejected_conflicts"
 )
 
 var SlotMetrics = collector.NewCollection(slotNamespace,