Fix httproute counts

nginxinc · May 2, 2024 · eafa4c2 · eafa4c2
1 parent 012fa57
commit eafa4c2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/internal/mode/static/telemetry/collector.go b/internal/mode/static/telemetry/collector.go
@@ -174,7 +174,7 @@ func collectGraphResourceCount(
 		ngfResourceCounts.GatewayCount++
 	}
 
-	ngfResourceCounts.HTTPRouteCount = int64(len(g.Routes))
+	ngfResourceCounts.HTTPRouteCount = computeRouteCount(g.Routes)
 	ngfResourceCounts.SecretCount = int64(len(g.ReferencedSecrets))
 	ngfResourceCounts.ServiceCount = int64(len(g.ReferencedServices))
 
@@ -187,6 +187,15 @@ func collectGraphResourceCount(
 	return ngfResourceCounts, nil
 }
 
+func computeRouteCount(routes map[graph.RouteKey]*graph.L7Route) (httpRouteCount int64) {
+	for _, r := range routes {
+		if r.RouteType == graph.RouteTypeHTTP {
+			httpRouteCount = httpRouteCount + 1
+		}
+	}
+	return httpRouteCount
+}
+
 func getPodReplicaSet(
 	ctx context.Context,
 	k8sClient client.Reader,

diff --git a/internal/mode/static/telemetry/collector_test.go b/internal/mode/static/telemetry/collector_test.go
@@ -279,9 +279,10 @@ var _ = Describe("Collector", Ordered, func() {
 						{Name: "ignoredGw2"}: {},
 					},
 					Routes: map[graph.RouteKey]*graph.L7Route{
-						{NamespacedName: types.NamespacedName{Namespace: "test", Name: "hr-1"}, RouteType: graph.RouteTypeHTTP}: {},
-						{NamespacedName: types.NamespacedName{Namespace: "test", Name: "hr-2"}, RouteType: graph.RouteTypeHTTP}: {},
-						{NamespacedName: types.NamespacedName{Namespace: "test", Name: "hr-3"}, RouteType: graph.RouteTypeHTTP}: {},
+						{NamespacedName: types.NamespacedName{Namespace: "test", Name: "hr-1"}}: {RouteType: graph.RouteTypeHTTP},
+						{NamespacedName: types.NamespacedName{Namespace: "test", Name: "hr-2"}}: {RouteType: graph.RouteTypeHTTP},
+						{NamespacedName: types.NamespacedName{Namespace: "test", Name: "hr-3"}}: {RouteType: graph.RouteTypeHTTP},
+						{NamespacedName: types.NamespacedName{Namespace: "test", Name: "gr-1"}}: {RouteType: graph.RouteTypeGRPC},
 					},
 					ReferencedSecrets: map[types.NamespacedName]*graph.Secret{
 						client.ObjectKeyFromObject(secret1): {
@@ -476,7 +477,7 @@ var _ = Describe("Collector", Ordered, func() {
 				GatewayClass: &graph.GatewayClass{},
 				Gateway:      &graph.Gateway{},
 				Routes: map[graph.RouteKey]*graph.L7Route{
-					{NamespacedName: types.NamespacedName{Namespace: "test", Name: "hr-1"}, RouteType: graph.RouteTypeHTTP}: {},
+					{NamespacedName: types.NamespacedName{Namespace: "test", Name: "hr-1"}}: {RouteType: graph.RouteTypeHTTP},
 				},
 				ReferencedSecrets: map[types.NamespacedName]*graph.Secret{
 					client.ObjectKeyFromObject(secret): {