Reorder schema

Author: bjee19

internal/controller/telemetry/collector.go

@@ -66,6 +66,8 @@ type Data struct {
 	ControlPlanePodCount int64
 	// NginxOneConnectionEnabled is a boolean that indicates whether the connection to the Nginx One Console is enabled.
 	NginxOneConnectionEnabled bool
+	// InferencePoolCount is the number of InferencePools that are referenced by at least one Route.
+	InferencePoolCount int64
 }
 
 // NGFResourceCounts stores the counts of all relevant resources that NGF processes and generates configuration from.
@@ -105,8 +107,6 @@ type NGFResourceCounts struct {
 	UpstreamSettingsPolicyCount int64
 	// GatewayAttachedNpCount is the total number of NginxProxy resources that are attached to a Gateway.
 	GatewayAttachedNpCount int64
-	// InferencePoolCount is the number of InferencePools that are referenced by at least one Route.
-	InferencePoolCount int64
 }
 
 // DataCollectorConfig holds configuration parameters for DataCollectorImpl.
@@ -176,6 +176,8 @@ func (c DataCollectorImpl) Collect(ctx context.Context) (Data, error) {
 
 	nginxPodCount := getNginxPodCount(g, clusterInfo.NodeCount)
 
+	inferencePoolCount := int64(len(g.ReferencedInferencePools))
+
 	data := Data{
 		Data: tel.Data{
 			ProjectName:         "NGF",
@@ -196,6 +198,7 @@ func (c DataCollectorImpl) Collect(ctx context.Context) (Data, error) {
 		NginxPodCount:                  nginxPodCount,
 		ControlPlanePodCount:           int64(replicaCount),
 		NginxOneConnectionEnabled:      c.cfg.NginxOneConsoleConnection,
+		InferencePoolCount:             inferencePoolCount,
 	}
 
 	return data, nil
@@ -267,8 +270,6 @@ func collectGraphResourceCount(
 
 	ngfResourceCounts.GatewayAttachedNpCount = gatewayAttachedNPCount
 
-	ngfResourceCounts.InferencePoolCount = int64(len(g.ReferencedInferencePools))
-
 	return ngfResourceCounts
 }
 

internal/controller/telemetry/collector_test.go

@@ -492,7 +492,6 @@ var _ = Describe("Collector", Ordered, func() {
 					SnippetsFilterCount:                      3,
 					UpstreamSettingsPolicyCount:              1,
 					GatewayAttachedNpCount:                   2,
-					InferencePoolCount:                       3,
 				}
 				expData.ClusterVersion = "1.29.2"
 				expData.ClusterPlatform = "kind"
@@ -526,6 +525,8 @@ var _ = Describe("Collector", Ordered, func() {
 				expData.ControlPlanePodCount = int64(2)
 				expData.NginxOneConnectionEnabled = true
 
+				expData.InferencePoolCount = 3
+
 				data, err := dataCollector.Collect(ctx)
 				Expect(err).ToNot(HaveOccurred())
 
@@ -790,9 +791,9 @@ var _ = Describe("Collector", Ordered, func() {
 					UpstreamSettingsPolicyCount:              1,
 					GatewayAttachedNpCount:                   1,
 					BackendTLSPolicyCount:                    1,
-					InferencePoolCount:                       1,
 				}
 				expData.NginxPodCount = 1
+				expData.InferencePoolCount = 1
 
 				data, err := dataCollector.Collect(ctx)
 

internal/controller/telemetry/data.avdl

@@ -105,9 +105,6 @@ attached at the Gateway level. */
 		/** GatewayAttachedNpCount is the total number of NginxProxy resources that are attached to a Gateway. */
 		long? GatewayAttachedNpCount = null;
 
-		/** InferencePoolCount is the number of InferencePools that are referenced by at least one Route. */
-		long? InferencePoolCount = null;
-		
 		/** NginxPodCount is the total number of Nginx data plane Pods. */
 		long? NginxPodCount = null;
 
@@ -117,5 +114,8 @@ attached at the Gateway level. */
 		/** NginxOneConnectionEnabled is a boolean that indicates whether the connection to the Nginx One Console is enabled. */
 		boolean? NginxOneConnectionEnabled = null;
 
+		/** InferencePoolCount is the number of InferencePools that are referenced by at least one Route. */
+		long? InferencePoolCount = null;
+		
 	}
 }

internal/controller/telemetry/data_attributes_generated.go

@@ -23,6 +23,7 @@ func (d *Data) Attributes() []attribute.KeyValue {
 	attrs = append(attrs, attribute.Int64("NginxPodCount", d.NginxPodCount))
 	attrs = append(attrs, attribute.Int64("ControlPlanePodCount", d.ControlPlanePodCount))
 	attrs = append(attrs, attribute.Bool("NginxOneConnectionEnabled", d.NginxOneConnectionEnabled))
+	attrs = append(attrs, attribute.Int64("InferencePoolCount", d.InferencePoolCount))
 
 	return attrs
 }

internal/controller/telemetry/data_test.go

@@ -41,13 +41,13 @@ func TestDataAttributes(t *testing.T) {
 			SnippetsFilterCount:                      13,
 			UpstreamSettingsPolicyCount:              14,
 			GatewayAttachedNpCount:                   15,
-			InferencePoolCount:                       16,
 		},
 		SnippetsFiltersDirectives:      []string{"main-three-count", "http-two-count", "server-one-count"},
 		SnippetsFiltersDirectivesCount: []int64{3, 2, 1},
 		NginxPodCount:                  3,
 		ControlPlanePodCount:           3,
 		NginxOneConnectionEnabled:      true,
+		InferencePoolCount:             16,
 	}
 
 	expected := []attribute.KeyValue{
@@ -84,10 +84,10 @@ func TestDataAttributes(t *testing.T) {
 		attribute.Int64("SnippetsFilterCount", 13),
 		attribute.Int64("UpstreamSettingsPolicyCount", 14),
 		attribute.Int64("GatewayAttachedNpCount", 15),
-		attribute.Int64("InferencePoolCount", 16),
 		attribute.Int64("NginxPodCount", 3),
 		attribute.Int64("ControlPlanePodCount", 3),
 		attribute.Bool("NginxOneConnectionEnabled", true),
+		attribute.Int64("InferencePoolCount", 16),
 	}
 
 	result := data.Attributes()
@@ -131,10 +131,10 @@ func TestDataAttributesWithEmptyData(t *testing.T) {
 		attribute.Int64("SnippetsFilterCount", 0),
 		attribute.Int64("UpstreamSettingsPolicyCount", 0),
 		attribute.Int64("GatewayAttachedNpCount", 0),
-		attribute.Int64("InferencePoolCount", 0),
 		attribute.Int64("NginxPodCount", 0),
 		attribute.Int64("ControlPlanePodCount", 0),
 		attribute.Bool("NginxOneConnectionEnabled", false),
+		attribute.Int64("InferencePoolCount", 0),
 	}
 
 	result := data.Attributes()

internal/controller/telemetry/ngfresourcecounts_attributes_generated.go

@@ -28,7 +28,6 @@ func (d *NGFResourceCounts) Attributes() []attribute.KeyValue {
 	attrs = append(attrs, attribute.Int64("SnippetsFilterCount", d.SnippetsFilterCount))
 	attrs = append(attrs, attribute.Int64("UpstreamSettingsPolicyCount", d.UpstreamSettingsPolicyCount))
 	attrs = append(attrs, attribute.Int64("GatewayAttachedNpCount", d.GatewayAttachedNpCount))
-	attrs = append(attrs, attribute.Int64("InferencePoolCount", d.InferencePoolCount))
 
 	return attrs
 }

tests/suite/telemetry_test.go

@@ -93,10 +93,10 @@ var _ = Describe("Telemetry test with OTel collector", Label("telemetry"), func(
 				"SnippetsFilterCount: Int(0)",
 				"UpstreamSettingsPolicyCount: Int(0)",
 				"GatewayAttachedNpCount: Int(0)",
-				"InferencePoolCount: Int(0)",
 				"NginxPodCount: Int(0)",
 				"ControlPlanePodCount: Int(1)",
 				"NginxOneConnectionEnabled: Bool(false)",
+				"InferencePoolCount: Int(0)",
 			},
 		)
 	})