feat: support running in a dingo container (#364)

Signed-off-by: Chris Gianelloni <[email protected]>

Author: wolf31o2

config.yaml.example

@@ -21,8 +21,9 @@ node:
   # Name of the node you are running.
   #
   # Valid values are:
+  # - `amaru`
   # - `cardano-node`
-  # -  `amaru`
+  # - `dingo`
   #
   # This can also be set via the CARDANO_NODE_BINARY environment variable
   binary: cardano-node
@@ -59,13 +60,14 @@ node:
   # This can also be set via the CARDANO_NODE_SOCKET_PATH environment variable
   socketPath:
 
-  # The path to the PID File of your running node
+  # Path to the PID file for the node
   #
   # This is only used when the `binary` value is `amaru`.
   # Otherwise it is ignored.
+  #
+  # This can also be set via the CARDANO_NODE_PID_FILE environment variable
   pidFile:
 
-
 prometheus:
   # host/port for the node Prometheus metrics
   #

main.go

@@ -38,8 +38,9 @@ import (
 )
 
 const (
-	CARADNO_NODE_BINARY = "cardano-node"
 	AMARU_BINARY        = "amaru"
+	CARDANO_NODE_BINARY = "cardano-node"
+	DINGO_BINARY        = "dingo"
 )
 
 // Global command line flags
@@ -1187,14 +1188,45 @@ func getResourceText(ctx context.Context) string {
 func getProcessMetrics(ctx context.Context) (*process.Process, error) {
 	cfg := config.GetConfig()
 
-	if cfg.Node.Binary == AMARU_BINARY {
-		return getProcessMetricsByPidFile(cfg, ctx)
-	} else {
-		return getProcessMetricsByNameAndPort(cfg, ctx)
+	switch cfg.Node.Binary {
+	case AMARU_BINARY:
+		return getProcessMetricsByPidFile(ctx, cfg)
+	case DINGO_BINARY:
+		return getProcessMetricsByPid(ctx, 1)
+	default:
+		return getProcessMetricsByNameAndPort(ctx, cfg)
 	}
 }
 
-func getProcessMetricsByPidFile(cfg *config.Config, ctx context.Context) (*process.Process, error) {
+func getProcessMetricsByPid(
+	ctx context.Context,
+	pid int32,
+) (*process.Process, error) {
+	proc, err := process.NewProcessWithContext(ctx, pid)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get process %d: %w", pid, err)
+	}
+
+	exists, err := proc.IsRunning()
+	if err != nil {
+		return nil, fmt.Errorf(
+			"failed to check if process %d is running: %w",
+			pid,
+			err,
+		)
+	}
+
+	if !exists {
+		return nil, fmt.Errorf("process %d is not running", pid)
+	}
+
+	return proc, nil
+}
+
+func getProcessMetricsByPidFile(
+	ctx context.Context,
+	cfg *config.Config,
+) (*process.Process, error) {
 	data, err := os.ReadFile(cfg.Node.PidFile)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read pid file: %w", err)
@@ -1207,8 +1239,6 @@ func getProcessMetricsByPidFile(cfg *config.Config, ctx context.Context) (*proce
 	if pid <= 0 || pid > math.MaxInt32 {
 		return nil, fmt.Errorf("invalid pid %d: out of int32 range", pid)
 	}
-
-	// the overflow is checked above
 	//nolint:gosec
 	proc, err := process.NewProcessWithContext(ctx, int32(pid))
 	if err != nil {
@@ -1217,7 +1247,11 @@ func getProcessMetricsByPidFile(cfg *config.Config, ctx context.Context) (*proce
 
 	exists, err := proc.IsRunning()
 	if err != nil {
-		return nil, fmt.Errorf("failed to check if process %d is running: %w", pid, err)
+		return nil, fmt.Errorf(
+			"failed to check if process %d is running: %w",
+			pid,
+			err,
+		)
 	}
 
 	if !exists {
@@ -1227,7 +1261,10 @@ func getProcessMetricsByPidFile(cfg *config.Config, ctx context.Context) (*proce
 	return proc, nil
 }
 
-func getProcessMetricsByNameAndPort(cfg *config.Config, ctx context.Context) (*process.Process, error) {
+func getProcessMetricsByNameAndPort(
+	ctx context.Context,
+	cfg *config.Config,
+) (*process.Process, error) {
 	r, _ := process.NewProcessWithContext(ctx, 0)
 	processes, err := process.ProcessesWithContext(ctx)
 	if err != nil {

peers.go

@@ -208,6 +208,12 @@ func pingPeers(ctx context.Context) error {
 						return
 					}
 				}
+				if len(peerStats.RTTresultsMap) == 0 {
+					peerStats.RTTresultsMap = make(
+						peerRTTresultsMap,
+						len(peersFiltered),
+					)
+				}
 
 				// Start RTT loop
 				// for tool in ... return peerRTT

prometheus.go

@@ -23,6 +23,7 @@ import (
 
 	dto "github.com/prometheus/client_model/go"
 	"github.com/prometheus/common/expfmt"
+	"github.com/prometheus/common/model"
 )
 
 // Track current epoch
@@ -108,7 +109,7 @@ func prom2json(prom []byte) ([]byte, error) {
 	// {"name": 0}
 	out := make(map[string]any)
 	b := []byte{}
-	parser := &expfmt.TextParser{}
+	parser := expfmt.NewTextParser(model.UTF8Validation)
 	families, err := parser.TextToMetricFamilies(
 		strings.NewReader(string(prom)),
 	)