refactor: Add subsystem to static metrics

strangelove-ventures · May 11, 2023 · 05ab298 · 05ab298
2 parents 8c8bdd9 + befd042
commit 05ab298
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/metrics/cosmos.go b/metrics/cosmos.go
@@ -15,15 +15,15 @@ func NewCosmos() *Cosmos {
 	return &Cosmos{
 		heightGauge: prometheus.NewGaugeVec(
 			prometheus.GaugeOpts{
-				Name: prometheus.BuildFQName(Namespace, CosmosSubsystem, "latest_block_height"),
+				Name: prometheus.BuildFQName(namespace, cosmosSubsystem, "latest_block_height"),
 				Help: "Latest block height of a cosmos node.",
 			},
 			// labels
 			[]string{"chain_id"},
 		),
 		valJailGauge: prometheus.NewGaugeVec(
 			prometheus.GaugeOpts{
-				Name: prometheus.BuildFQName(Namespace, CosmosValSubsystem, "latest_jailed_status"),
+				Name: prometheus.BuildFQName(namespace, cosmosValSubsystem, "latest_jailed_status"),
 				Help: "0 if the validator is not jailed. 1 if the validator is jailed. 2 if the validator is tombstoned.",
 			},
 			// labels

diff --git a/metrics/metrics.go b/metrics/metrics.go
@@ -1,8 +1,8 @@
 package metrics
 
 const (
-	Namespace          = "sl_exporter"
-	NoSubsystem        = ""
-	CosmosSubsystem    = "cosmos"
-	CosmosValSubsystem = CosmosSubsystem + "_val"
+	namespace          = "sl_exporter"
+	staticSubsystem    = "static"
+	cosmosSubsystem    = "cosmos"
+	cosmosValSubsystem = cosmosSubsystem + "_val"
 )
diff --git a/metrics/static.go b/metrics/static.go
@@ -19,7 +19,7 @@ func BuildStatic(gauges []StaticGauge) []prometheus.Collector {
 	metrics := make([]prometheus.Collector, len(gauges))
 	for i, g := range gauges {
 		gaugeVec := prometheus.NewGaugeVec(
-			prometheus.GaugeOpts{Name: prometheus.BuildFQName(Namespace, NoSubsystem, g.Name), Help: g.Description},
+			prometheus.GaugeOpts{Name: prometheus.BuildFQName(namespace, staticSubsystem, g.Name), Help: g.Description},
 			g.Labels,
 		)
 		for _, sample := range g.Samples {

diff --git a/metrics/static_test.go b/metrics/static_test.go
@@ -41,13 +41,13 @@ func TestBuildStatic(t *testing.T) {
 		r := httptest.NewRecorder()
 		h.ServeHTTP(r, stubRequest)
 
-		const want = `# HELP sl_exporter_gauge_1 desc_1
-# TYPE sl_exporter_gauge_1 gauge
-sl_exporter_gauge_1{chain="agoric-1",denom="ubld"} 1
-sl_exporter_gauge_1{chain="cosmoshub-4",denom="uatom"} 2
-# HELP sl_exporter_gauge_2 desc_2
-# TYPE sl_exporter_gauge_2 gauge
-sl_exporter_gauge_2 3`
+		const want = `# HELP sl_exporter_static_gauge_1 desc_1
+# TYPE sl_exporter_static_gauge_1 gauge
+sl_exporter_static_gauge_1{chain="agoric-1",denom="ubld"} 1
+sl_exporter_static_gauge_1{chain="cosmoshub-4",denom="uatom"} 2
+# HELP sl_exporter_static_gauge_2 desc_2
+# TYPE sl_exporter_static_gauge_2 gauge
+sl_exporter_static_gauge_2 3`
 		require.Equal(t, want, strings.TrimSpace(r.Body.String()))
 	})
 
@@ -58,7 +58,7 @@ sl_exporter_gauge_2 3`
 	t.Run("invalid labels", func(t *testing.T) {
 		gauges := []StaticGauge{
 			{
-				Name:        "sl_exporter_gauge_1",
+				Name:        "sl_exporter_static_gauge_1",
 				Description: "desc_1",
 				Labels:      []string{"chain", "denom"},
 				Samples: []StaticSample{