Change naming of directiveContext and count variables

Author: bjee19

internal/mode/static/telemetry/collector.go

@@ -50,16 +50,16 @@ type Data struct {
 	// at the same index.
 	// Each value is either 'true' or 'false' for boolean flags and 'default' or 'user-defined' for non-boolean flags.
 	FlagValues []string
-	// SnippetsFiltersDirectiveContexts contains the directive-context strings of all applied SnippetsFilters.
+	// SnippetsFiltersDirectives contains the directive-context strings of all applied SnippetsFilters.
 	// Both lists are ordered first by count, then by lexicographical order of the context string,
 	// then lastly by directive string.
-	SnippetsFiltersDirectiveContexts []string
-	// SnippetsFiltersDirectiveContextsCount contains the count of the directive-context strings, where each count
-	// corresponds to the string from SnippetsFiltersDirectiveContexts at the same index.
+	SnippetsFiltersDirectives []string
+	// SnippetsFiltersDirectivesCount contains the count of the directive-context strings, where each count
+	// corresponds to the string from SnippetsFiltersDirectives at the same index.
 	// Both lists are ordered first by count, then by lexicographical order of the context string,
 	// then lastly by directive string.
-	SnippetsFiltersDirectiveContextsCount []int64
-	NGFResourceCounts                     // embedding is required by the generator.
+	SnippetsFiltersDirectivesCount []int64
+	NGFResourceCounts              // embedding is required by the generator.
 	// NGFReplicaCount is the number of replicas of the NGF Pod.
 	NGFReplicaCount int64
 }
@@ -163,7 +163,7 @@ func (c DataCollectorImpl) Collect(ctx context.Context) (Data, error) {
 		return Data{}, fmt.Errorf("failed to get NGF deploymentID: %w", err)
 	}
 
-	snippetsFiltersDirectiveContexts, snippetsFiltersDirectiveContextsCount := collectSnippetsFilterSnippetsInfo(g)
+	snippetsFiltersDirectives, snippetsFiltersDirectivesCount := collectSnippetsFilterDirectives(g)
 
 	data := Data{
 		Data: tel.Data{
@@ -176,14 +176,13 @@ func (c DataCollectorImpl) Collect(ctx context.Context) (Data, error) {
 			InstallationID:      deploymentID,
 			ClusterNodeCount:    int64(clusterInfo.NodeCount),
 		},
-		NGFResourceCounts: graphResourceCount,
-		ImageSource:       c.cfg.ImageSource,
-		FlagNames:         c.cfg.Flags.Names,
-		FlagValues:        c.cfg.Flags.Values,
-		NGFReplicaCount:   int64(replicaCount),
-		// maybe SnippetValues?
-		SnippetsFiltersDirectiveContexts:      snippetsFiltersDirectiveContexts,
-		SnippetsFiltersDirectiveContextsCount: snippetsFiltersDirectiveContextsCount,
+		NGFResourceCounts:              graphResourceCount,
+		ImageSource:                    c.cfg.ImageSource,
+		FlagNames:                      c.cfg.Flags.Names,
+		FlagValues:                     c.cfg.Flags.Values,
+		NGFReplicaCount:                int64(replicaCount),
+		SnippetsFiltersDirectives:      snippetsFiltersDirectives,
+		SnippetsFiltersDirectivesCount: snippetsFiltersDirectivesCount,
 	}
 
 	return data, nil
@@ -406,7 +405,7 @@ type sfDirectiveContext struct {
 	context   string
 }
 
-func collectSnippetsFilterSnippetsInfo(g *graph.Graph) ([]string, []int64) {
+func collectSnippetsFilterDirectives(g *graph.Graph) ([]string, []int64) {
 	directiveContextMap := make(map[sfDirectiveContext]int)
 
 	for _, sf := range g.SnippetsFilters {

internal/mode/static/telemetry/collector_test.go

@@ -169,13 +169,13 @@ var _ = Describe("Collector", Ordered, func() {
 				InstallationID:      string(ngfReplicaSet.ObjectMeta.OwnerReferences[0].UID),
 				ClusterNodeCount:    1,
 			},
-			NGFResourceCounts:                     telemetry.NGFResourceCounts{},
-			NGFReplicaCount:                       1,
-			ImageSource:                           "local",
-			FlagNames:                             flags.Names,
-			FlagValues:                            flags.Values,
-			SnippetsFiltersDirectiveContexts:      []string{},
-			SnippetsFiltersDirectiveContextsCount: []int64{},
+			NGFResourceCounts:              telemetry.NGFResourceCounts{},
+			NGFReplicaCount:                1,
+			ImageSource:                    "local",
+			FlagNames:                      flags.Names,
+			FlagValues:                     flags.Values,
+			SnippetsFiltersDirectives:      []string{},
+			SnippetsFiltersDirectivesCount: []int64{},
 		}
 
 		k8sClientReader = &eventsfakes.FakeReader{}
@@ -416,7 +416,7 @@ var _ = Describe("Collector", Ordered, func() {
 				expData.ClusterVersion = "1.29.2"
 				expData.ClusterPlatform = "kind"
 
-				expData.SnippetsFiltersDirectiveContexts = []string{
+				expData.SnippetsFiltersDirectives = []string{
 					"auth_delay-server",
 					"aio-http",
 					"keepalive_time-location",
@@ -427,7 +427,7 @@ var _ = Describe("Collector", Ordered, func() {
 					"worker_rlimit_nofile-main",
 					"ignore_invalid_headers-server",
 				}
-				expData.SnippetsFiltersDirectiveContextsCount = []int64{
+				expData.SnippetsFiltersDirectivesCount = []int64{
 					3,
 					2,
 					2,

internal/mode/static/telemetry/data.avdl

@@ -45,16 +45,16 @@ at the same index.
 Each value is either 'true' or 'false' for boolean flags and 'default' or 'user-defined' for non-boolean flags. */
 		union {null, array<string>} FlagValues = null;
 
-		/** SnippetsFiltersDirectiveContexts contains the directive-context strings of all applied SnippetsFilters.
+		/** SnippetsFiltersDirectives contains the directive-context strings of all applied SnippetsFilters.
 Both lists are ordered first by count, then by lexicographical order of the context string,
 then lastly by directive string. */
-		union {null, array<string>} SnippetsFiltersDirectiveContexts = null;
+		union {null, array<string>} SnippetsFiltersDirectives = null;
 
-		/** SnippetsFiltersDirectiveContextsCount contains the count of the directive-context strings, where each count
-corresponds to the string from SnippetsFiltersDirectiveContexts at the same index.
+		/** SnippetsFiltersDirectivesCount contains the count of the directive-context strings, where each count
+corresponds to the string from SnippetsFiltersDirectives at the same index.
 Both lists are ordered first by count, then by lexicographical order of the context string,
 then lastly by directive string. */
-		union {null, array<long>} SnippetsFiltersDirectiveContextsCount = null;
+		union {null, array<long>} SnippetsFiltersDirectivesCount = null;
 
 		/** GatewayCount is the number of relevant Gateways. */
 		long? GatewayCount = null;

internal/mode/static/telemetry/data_attributes_generated.go

@@ -17,8 +17,8 @@ func (d *Data) Attributes() []attribute.KeyValue {
 	attrs = append(attrs, d.Data.Attributes()...)
 	attrs = append(attrs, attribute.StringSlice("FlagNames", d.FlagNames))
 	attrs = append(attrs, attribute.StringSlice("FlagValues", d.FlagValues))
-	attrs = append(attrs, attribute.StringSlice("SnippetsFiltersDirectiveContexts", d.SnippetsFiltersDirectiveContexts))
-	attrs = append(attrs, attribute.Int64Slice("SnippetsFiltersDirectiveContextsCount", d.SnippetsFiltersDirectiveContextsCount))
+	attrs = append(attrs, attribute.StringSlice("SnippetsFiltersDirectives", d.SnippetsFiltersDirectives))
+	attrs = append(attrs, attribute.Int64Slice("SnippetsFiltersDirectivesCount", d.SnippetsFiltersDirectivesCount))
 	attrs = append(attrs, d.NGFResourceCounts.Attributes()...)
 	attrs = append(attrs, attribute.Int64("NGFReplicaCount", d.NGFReplicaCount))
 

internal/mode/static/telemetry/data_test.go

@@ -40,9 +40,9 @@ func TestDataAttributes(t *testing.T) {
 			NginxProxyCount:                          12,
 			SnippetsFilterCount:                      13,
 		},
-		NGFReplicaCount:                       3,
-		SnippetsFiltersDirectiveContexts:      []string{"main-three-count", "http-two-count", "server-one-count"},
-		SnippetsFiltersDirectiveContextsCount: []int64{3, 2, 1},
+		NGFReplicaCount:                3,
+		SnippetsFiltersDirectives:      []string{"main-three-count", "http-two-count", "server-one-count"},
+		SnippetsFiltersDirectivesCount: []int64{3, 2, 1},
 	}
 
 	expected := []attribute.KeyValue{
@@ -59,10 +59,10 @@ func TestDataAttributes(t *testing.T) {
 		attribute.StringSlice("FlagNames", []string{"test-flag"}),
 		attribute.StringSlice("FlagValues", []string{"test-value"}),
 		attribute.StringSlice(
-			"SnippetsFiltersDirectiveContexts",
+			"SnippetsFiltersDirectives",
 			[]string{"main-three-count", "http-two-count", "server-one-count"},
 		),
-		attribute.IntSlice("SnippetsFiltersDirectiveContextsCount", []int{3, 2, 1}),
+		attribute.IntSlice("SnippetsFiltersDirectivesCount", []int{3, 2, 1}),
 		attribute.Int64("GatewayCount", 1),
 		attribute.Int64("GatewayClassCount", 2),
 		attribute.Int64("HTTPRouteCount", 3),
@@ -103,8 +103,8 @@ func TestDataAttributesWithEmptyData(t *testing.T) {
 		attribute.Int64("ClusterNodeCount", 0),
 		attribute.StringSlice("FlagNames", nil),
 		attribute.StringSlice("FlagValues", nil),
-		attribute.StringSlice("SnippetsFiltersDirectiveContexts", nil),
-		attribute.IntSlice("SnippetsFiltersDirectiveContextsCount", nil),
+		attribute.StringSlice("SnippetsFiltersDirectives", nil),
+		attribute.IntSlice("SnippetsFiltersDirectivesCount", nil),
 		attribute.Int64("GatewayCount", 0),
 		attribute.Int64("GatewayClassCount", 0),
 		attribute.Int64("HTTPRouteCount", 0),

tests/suite/telemetry_test.go

@@ -72,8 +72,8 @@ var _ = Describe("Telemetry test with OTel collector", Label("telemetry"), func(
 				fmt.Sprintf("ClusterNodeCount: Int(%d)", info.NodeCount),
 				"FlagNames: Slice",
 				"FlagValues: Slice",
-				"SnippetsFiltersDirectiveContexts: Slice",
-				"SnippetsFiltersDirectiveContextsCount: Slice",
+				"SnippetsFiltersDirectives: Slice",
+				"SnippetsFiltersDirectivesCount: Slice",
 				"GatewayCount: Int(0)",
 				"GatewayClassCount: Int(1)",
 				"HTTPRouteCount: Int(0)",