Merge pull request #491 from alphagov/add-source-labels

Add source label for router reload metrics
alphagov · Nov 4, 2024 · ea5fc42 · ea5fc42
2 parents 3597f55 + 9f1422c
commit ea5fc42
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/metrics.go b/lib/metrics.go
@@ -26,14 +26,15 @@ var (
 				0.99: 0.005,
 			},
 		},
-		[]string{"success"},
+		[]string{"success", "source"},
 	)
 
-	routesCountMetric = prometheus.NewGauge(
+	routesCountMetric = prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Name: "router_routes_loaded",
 			Help: "Number of routes currently loaded",
 		},
+		[]string{"source"},
 	)
 )
 

diff --git a/lib/router.go b/lib/router.go
@@ -217,7 +217,7 @@ type mongoDatabase interface {
 func (rt *Router) reloadRoutes(db *mgo.Database, currentOptime bson.MongoTimestamp) {
 	var success bool
 	timer := prometheus.NewTimer(prometheus.ObserverFunc(func(v float64) {
-		labels := prometheus.Labels{"success": strconv.FormatBool(success)}
+		labels := prometheus.Labels{"success": strconv.FormatBool(success), "source": "mongo"}
 		routeReloadDurationMetric.With(labels).Observe(v)
 	}))
 	defer func() {
@@ -246,7 +246,7 @@ func (rt *Router) reloadRoutes(db *mgo.Database, currentOptime bson.MongoTimesta
 	rt.lock.Unlock()
 
 	logInfo(fmt.Sprintf("router: reloaded %d routes", routeCount))
-	routesCountMetric.Set(float64(routeCount))
+	routesCountMetric.WithLabelValues("mongo").Set(float64(routeCount))
 }
 
 func (rt *Router) getCurrentMongoInstance(db mongoDatabase) (MongoReplicaSetMember, error) {