Fix failing unit tests

Author: shaun-nx

internal/controller/telemetry/collector.go

@@ -41,33 +41,17 @@ type ConfigurationGetter interface {
 //
 //go:generate go run -tags generator github.com/nginx/telemetry-exporter/cmd/generator -type=Data -scheme -scheme-protocol=NGFProductTelemetry -scheme-df-datatype=ngf-product-telemetry
 type Data struct {
-	// ImageSource tells whether the image was built by GitHub or locally (values are 'gha', 'local', or 'unknown')
 	ImageSource string
-	tel.Data    // embedding is required by the generator.
-	// FlagNames contains the command-line flag names.
-	FlagNames []string
-	// FlagValues contains the values of the command-line flags, where each value corresponds to the flag from FlagNames
-	// 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
-	// 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.
-	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.
+	BuildOS     string
+	tel.Data
+	FlagNames                      []string
+	FlagValues                     []string
+	SnippetsFiltersDirectives      []string
 	SnippetsFiltersDirectivesCount []int64
-	NGFResourceCounts              // embedding is required by the generator.
-	// NginxPodCount is the total number of Nginx data plane Pods.
-	NginxPodCount int64
-	// ControlPlanePodCount is the total number of NGF control plane Pods.
-	ControlPlanePodCount int64
-	// NginxOneConnectionEnabled is a boolean that indicates whether the connection to the Nginx One Console is enabled.
+	NGFResourceCounts
+	NginxPodCount             int64
+	ControlPlanePodCount      int64
 	NginxOneConnectionEnabled bool
-	// BuildOS is the OS the NGF and NGINX binary was built on.
-	BuildOS string
 }
 
 // NGFResourceCounts stores the counts of all relevant resources that NGF processes and generates configuration from.

internal/controller/telemetry/collector_test.go

@@ -172,6 +172,7 @@ var _ = Describe("Collector", Ordered, func() {
 			NGFResourceCounts:              telemetry.NGFResourceCounts{},
 			ControlPlanePodCount:           1,
 			ImageSource:                    "local",
+			BuildOS:                        "ubi",
 			FlagNames:                      flags.Names,
 			FlagValues:                     flags.Values,
 			SnippetsFiltersDirectives:      []string{},
@@ -193,9 +194,9 @@ var _ = Describe("Collector", Ordered, func() {
 			Version:                   version,
 			PodNSName:                 podNSName,
 			ImageSource:               "local",
+			BuildOS:                   "ubi",
 			Flags:                     flags,
 			NginxOneConsoleConnection: true,
-			BuildOS:                   "",
 		})
 
 		baseGetCalls = createGetCallsFunc(ngfPod, ngfReplicaSet, kubeNamespace)

internal/controller/telemetry/data_test.go

@@ -86,6 +86,7 @@ func TestDataAttributes(t *testing.T) {
 		attribute.Int64("NginxPodCount", 3),
 		attribute.Int64("ControlPlanePodCount", 3),
 		attribute.Bool("NginxOneConnectionEnabled", true),
+		attribute.String("BuildOS", ""),
 	}
 
 	result := data.Attributes()
@@ -132,6 +133,7 @@ func TestDataAttributesWithEmptyData(t *testing.T) {
 		attribute.Int64("NginxPodCount", 0),
 		attribute.Int64("ControlPlanePodCount", 0),
 		attribute.Bool("NginxOneConnectionEnabled", false),
+		attribute.String("BuildOS", ""),
 	}
 
 	result := data.Attributes()