Remove blazar_upgrade_step metric and add validator_address, chain_id labels to blazar_blocks_to_upgrade_height

cmd/run.go

@@ -34,10 +34,7 @@ var runCmd = &cobra.Command{
 
 		// setup metrics
 		hostname := util.GetHostname()
-		metrics, err := metrics.NewMetrics(cfg.ComposeFile, hostname, BinVersion)
-		if err != nil {
-			return errors.Wrapf(err, "error creating metrics server")
-		}
+		metrics := metrics.NewMetrics(cfg.ComposeFile, hostname, BinVersion)
 
 		// setup notifier
 		notifier := notification.NewFallbackNotifier(cfg, metrics, lg, hostname)

internal/pkg/daemon/daemon.go

@@ -48,8 +48,12 @@ type Daemon struct {
 
 	// initial counters
 	startupHeight int64
-	nodeAddress   bytes.HexBytes
-	nodeInfo      *tmservice.GetNodeInfoResponse
+
+	// node information
+	nodeAddress      bytes.HexBytes
+	nodeInfo         *tmservice.GetNodeInfoResponse
+	validatorAddress string
+	chainID          string
 
 	// tracking current height
 	currHeight          int64
@@ -131,6 +135,9 @@ func (d *Daemon) Init(ctx context.Context, cfg *config.Config) error {
 		return errors.Wrapf(err, "failed to get status response")
 	}
 
+	d.chainID = status.NodeInfo.Network
+	d.validatorAddress = status.ValidatorInfo.Address.String()
+
 	// display information about the node
 	d.nodeInfo, err = d.cosmosClient.NodeInfo(ctx)
 	if err != nil {

internal/pkg/daemon/daemon_test.go

@@ -75,8 +75,7 @@ func TestIntegrationDaemon(t *testing.T) {
 	}()
 
 	// we can't register 2 metrics, but this sharing this should probably cause no problems
-	metrics, err := metrics.NewMetrics("/path/to/docker-compose.yml", "dummy", "test")
-	require.NoError(t, err)
+	metrics := metrics.NewMetrics("/path/to/docker-compose.yml", "dummy", "test")
 
 	ports := getFreePorts(t, 6)
 

internal/pkg/daemon/metrics.go

@@ -6,15 +6,14 @@ import (
 
 func (d *Daemon) updateMetrics() {
 	// the upgrade state may change, we don't want to persist the metric with the old status
-	d.metrics.Step.Reset()
 	d.metrics.BlocksToUpgrade.Reset()
 
 	upcomingUpgrades := d.ur.GetUpcomingUpgradesWithCache(d.currHeight)
 	for _, upgrade := range upcomingUpgrades {
 		upgradeHeight := strconv.FormatInt(upgrade.Height, 10)
 		status := d.stateMachine.GetStatus(upgrade.Height)
 
-		d.metrics.Step.WithLabelValues(upgradeHeight, upgrade.Name, status.String()).Set(float64(d.stateMachine.GetStep(upgrade.Height)))
-		d.metrics.BlocksToUpgrade.WithLabelValues(upgradeHeight, upgrade.Name, status.String()).Set(float64(upgrade.Height - d.currHeight))
+		d.metrics.BlocksToUpgrade.WithLabelValues(upgradeHeight, upgrade.Name, status.String(),
+			d.stateMachine.GetStep(upgrade.Height).String(), d.chainID, d.validatorAddress).Set(float64(upgrade.Height - d.currHeight))
 	}
 }

internal/pkg/metrics/metrics.go

@@ -15,15 +15,14 @@ const (
 
 type Metrics struct {
 	Up              prometheus.Gauge
-	Step            *prometheus.GaugeVec
 	BlocksToUpgrade *prometheus.GaugeVec
 	UpwErrs         prometheus.Counter
 	UiwErrs         prometheus.Counter
 	HwErrs          prometheus.Counter
 	NotifErrs       prometheus.Counter
 }
 
-func NewMetrics(composeFile string, hostname string, version string) (*Metrics, error) {
+func NewMetrics(composeFile, hostname, version string) *Metrics {
 	labels := prometheus.Labels{"hostname": hostname, "compose_file": composeFile, "version": version}
 
 	metrics := &Metrics{
@@ -35,23 +34,14 @@ func NewMetrics(composeFile string, hostname string, version string) (*Metrics,
 				ConstLabels: labels,
 			},
 		),
-		Step: promauto.NewGaugeVec(
-			prometheus.GaugeOpts{
-				Namespace:   namespace,
-				Name:        "upgrade_step",
-				Help:        "ID of the current step of the upgrade process",
-				ConstLabels: labels,
-			},
-			[]string{"upgrade_height", "upgrade_name", "upgrade_status"},
-		),
 		BlocksToUpgrade: promauto.NewGaugeVec(
 			prometheus.GaugeOpts{
 				Namespace:   namespace,
 				Name:        "blocks_to_upgrade_height",
 				Help:        "Number of blocks to the upgrade height",
 				ConstLabels: labels,
 			},
-			[]string{"upgrade_height", "upgrade_name", "upgrade_status"},
+			[]string{"upgrade_height", "upgrade_name", "upgrade_status", "upgrade_step", "chain_id", "validator_address"},
 		),
 		UpwErrs: promauto.NewCounter(
 			prometheus.CounterOpts{
@@ -87,7 +77,7 @@ func NewMetrics(composeFile string, hostname string, version string) (*Metrics,
 		),
 	}
 
-	return metrics, nil
+	return metrics
 }
 
 func RegisterHandler(mux *runtime.ServeMux) error {