Fix prometheus metrics [#3463]

cmd/accumulated/cmd_init_dual_node.go

@@ -184,6 +184,8 @@ func finalizeDnn(bvnId string) (*cfg.Config, error) {
 		c.Consensus.CreateEmptyBlocks = false
 	}
 
+	c.Instrumentation.Namespace += "_" + strings.ToLower(c.Accumulate.PartitionId)
+
 	// if len(c.P2P.PersistentPeers) > 0 {
 	// 	c.P2P.BootstrapPeers = c.P2P.PersistentPeers
 	// 	c.P2P.PersistentPeers = ""
@@ -221,6 +223,8 @@ func finalizeBvnn() (*cfg.Config, error) {
 		c.Consensus.CreateEmptyBlocks = false
 	}
 
+	c.Instrumentation.Namespace += "_" + strings.ToLower(c.Accumulate.PartitionId)
+
 	//in dual mode, the key between bvn and dn is shared.
 	//This will be cleaned up when init system is overhauled with AC-1263
 	// if len(c.P2P.PersistentPeers) > 0 {

cmd/accumulated/program.go

@@ -13,6 +13,7 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
+	"strings"
 	"syscall"
 
 	"github.com/spf13/cobra"
@@ -105,8 +106,23 @@ func (p *Program) Start() (err error) {
 		return err
 	}
 
-	// Only one node can run Prometheus
-	p.secondary.Config.Instrumentation.Prometheus = false
+	{
+		a := p.primary.Config.Instrumentation
+		b := p.secondary.Config.Instrumentation
+
+		// If both sub-nodes have the default instrumentation namespace,
+		// dynamically append the partition ID to it
+		if (a.Namespace == "tendermint" || a.Namespace == "cometbft") && (b.Namespace == "tendermint" || b.Namespace == "cometbft") {
+			a.Namespace += "_" + strings.ToLower(p.primary.Config.Accumulate.PartitionId)
+			b.Namespace += "_" + strings.ToLower(p.secondary.Config.Accumulate.PartitionId)
+		}
+
+		// If both sub-nodes still have the same instrumentation namespace,
+		// disable the second one to prevent conflicts
+		if a.Namespace == b.Namespace {
+			b.Prometheus = false
+		}
+	}
 
 	if flagRun.EnableTimingLogs {
 		p.secondary.Config.Accumulate.AnalysisLog.Enabled = true

internal/node/daemon/init.go

@@ -90,6 +90,9 @@ func BuildNodesConfig(network *NetworkInit, mkcfg MakeConfigFunc) [][][]*config.
 				Type:    node.BvnnType,
 			})
 
+			dnn.Instrumentation.Namespace += fmt.Sprintf("_directory_%d", i)
+			bvnn.Instrumentation.Namespace += fmt.Sprintf("_%s_%d", strings.ToLower(bvn.Id), i)
+
 			if dnn.P2P.ExternalAddress == "" {
 				dnn.P2P.ExternalAddress = node.Peer().TendermintP2P().Directory().String()
 			}