Fix handler routes test

Author: mna

server/service/endpoint_utils.go

@@ -448,9 +448,12 @@ var pathReplacer = strings.NewReplacer(
 	"}", "_",
 )
 
-func getNameFromPathAndVerb(verb, path string) string {
-	return strings.ToLower(verb) + "_" +
-		pathReplacer.Replace(strings.TrimPrefix(strings.TrimRight(path, "/"), "/api/_version_/fleet/"))
+func getNameFromPathAndVerb(verb, path, startAt string) string {
+	prefix := strings.ToLower(verb) + "_"
+	if startAt != "" {
+		prefix += pathReplacer.Replace(startAt) + "_"
+	}
+	return prefix + pathReplacer.Replace(strings.TrimPrefix(strings.TrimRight(path, "/"), "/api/_version_/fleet/"))
 }
 
 func capabilitiesResponseFunc(capabilities fleet.CapabilityMap) kithttp.ServerOption {
@@ -560,14 +563,14 @@ func (e *authEndpointer) handlePathHandler(path string, pathHandler func(path st
 	}
 
 	versionedPath := strings.Replace(path, "/_version_/", fmt.Sprintf("/{fleetversion:(?:%s)}/", strings.Join(versions, "|")), 1)
-	nameAndVerb := getNameFromPathAndVerb(verb, path)
+	nameAndVerb := getNameFromPathAndVerb(verb, path, e.startingAtVersion)
 	if e.usePathPrefix {
 		e.r.PathPrefix(versionedPath).Handler(pathHandler(versionedPath)).Name(nameAndVerb).Methods(verb)
 	} else {
 		e.r.Handle(versionedPath, pathHandler(versionedPath)).Name(nameAndVerb).Methods(verb)
 	}
 	for _, alias := range e.alternativePaths {
-		nameAndVerb := getNameFromPathAndVerb(verb, alias)
+		nameAndVerb := getNameFromPathAndVerb(verb, alias, e.startingAtVersion)
 		versionedPath := strings.Replace(alias, "/_version_/", fmt.Sprintf("/{fleetversion:(?:%s)}/", strings.Join(versions, "|")), 1)
 		if e.usePathPrefix {
 			e.r.PathPrefix(versionedPath).Handler(pathHandler(versionedPath)).Name(nameAndVerb).Methods(verb)

server/service/handler_test.go

@@ -76,7 +76,6 @@ func TestAPIRoutesConflicts(t *testing.T) {
 }
 
 func TestAPIRoutesMetrics(t *testing.T) {
-	t.Skip()
 	ds := new(mock.Store)
 
 	svc, _ := newTestService(t, ds, nil, nil)
@@ -108,7 +107,8 @@ func TestAPIRoutesMetrics(t *testing.T) {
 	routeNames := make(map[string]bool)
 	err = router.Walk(func(route *mux.Route, _ *mux.Router, _ []*mux.Route) error {
 		if _, ok := routeNames[route.GetName()]; ok {
-			t.Errorf("duplicate route name: %s", route.GetName())
+			path, _ := route.GetPathTemplate()
+			t.Errorf("duplicate route name: %s (%s)", route.GetName(), path)
 		}
 		routeNames[route.GetName()] = true
 		return nil
@@ -194,7 +194,7 @@ func TestAPIRoutesMetrics(t *testing.T) {
 		"go_memstats_alloc_bytes_total":              1,
 		"go_memstats_buck_hash_sys_bytes":            1,
 		"go_memstats_frees_total":                    1,
-		"go_memstats_gc_cpu_fraction":                1,
+		"go_memstats_gc_cpu_fraction":                0, // does not appear to be reported anymore
 		"go_memstats_gc_sys_bytes":                   1,
 		"go_memstats_heap_alloc_bytes":               1,
 		"go_memstats_heap_idle_bytes":                1,