fix incorrect uptime history data

internal/metrics/uptime/uptime.go

@@ -17,7 +17,7 @@ import (
 
 type (
 	StatusByAlias struct {
-		Map       map[string]health.WithHealthInfo
+		Map       map[string]map[string]any
 		Timestamp time.Time
 	}
 	Status struct {
@@ -36,10 +36,9 @@ func init() {
 }
 
 func getStatuses(ctx context.Context, _ *StatusByAlias) (*StatusByAlias, error) {
-	now := time.Now()
 	return &StatusByAlias{
 		Map:       routequery.HealthInfo(),
-		Timestamp: now,
+		Timestamp: time.Now(),
 	}, nil
 }
 
@@ -52,8 +51,8 @@ func aggregateStatuses(entries []*StatusByAlias, query url.Values) (int, Aggrega
 	for _, entry := range entries {
 		for alias, status := range entry.Map {
 			statuses[alias] = append(statuses[alias], &Status{
-				Status:    status.Status(),
+				Status:    status["status"].(health.Status),
-				Latency:   status.Latency(),
+				Latency:   status["latency"].(time.Duration),
 				Timestamp: entry.Timestamp,
 			})
 		}

internal/route/routes/routequery/query.go

@@ -29,21 +29,32 @@ func getHealthInfo(r route.Route) map[string]string {
 	}
 }
 
+func getHealthInfoRaw(r route.Route) map[string]any {
+	mon := r.HealthMonitor()
+	if mon == nil {
+		return map[string]any{
+			"status":  health.StatusUnknown,
+			"latency": time.Duration(0),
+		}
+	}
+	return map[string]any{
+		"status":  mon.Status(),
+		"latency": mon.Latency(),
+	}
+}
+
 func HealthMap() map[string]map[string]string {
-	healthMap := make(map[string]map[string]string)
+	healthMap := make(map[string]map[string]string, routes.NumRoutes())
 	routes.RangeRoutes(func(alias string, r route.Route) {
 		healthMap[alias] = getHealthInfo(r)
 	})
 	return healthMap
 }
 
-func HealthInfo() map[string]health.WithHealthInfo {
+func HealthInfo() map[string]map[string]any {
-	healthMap := make(map[string]health.WithHealthInfo, routes.NumRoutes())
+	healthMap := make(map[string]map[string]any, routes.NumRoutes())
 	routes.RangeRoutes(func(alias string, r route.Route) {
-		mon := r.HealthMonitor()
+		healthMap[alias] = getHealthInfoRaw(r)
-		if mon != nil {
-			healthMap[alias] = mon
-		}
 	})
 	return healthMap
 }