feature_tracking : Update ExtractFeatures to receive both userUc and mergedUc for getOTelLoggingSupportedConfig. (#1899)

Author: franciscovalentecastro

confgenerator/confgenerator_test.go

@@ -255,7 +255,7 @@ func generateConfigs(pc platformConfig, testDir string) (got map[string]string,
 		}
 	}()
 
-	uc, err := confgenerator.MergeConfFiles(
+	mergedUc, err := confgenerator.MergeConfFiles(
 		ctx,
 		filepath.Join("testdata", testDir, inputFileName),
 		apps.BuiltInConfStructs,
@@ -266,7 +266,7 @@ func generateConfigs(pc platformConfig, testDir string) (got map[string]string,
 	got[builtinConfigFileName] = apps.BuiltInConfStructs[pc.platform.Name()].String()
 
 	// Fluent Bit configs
-	flbGeneratedConfigs, err := uc.GenerateFluentBitConfigs(ctx,
+	flbGeneratedConfigs, err := mergedUc.GenerateFluentBitConfigs(ctx,
 		pc.defaultLogsDir,
 		pc.defaultStateDir,
 	)
@@ -278,21 +278,21 @@ func generateConfigs(pc platformConfig, testDir string) (got map[string]string,
 	}
 
 	// Otel configs
-	otelGeneratedConfig, err := uc.GenerateOtelConfig(ctx)
+	otelGeneratedConfig, err := mergedUc.GenerateOtelConfig(ctx)
 	if err != nil {
 		return
 	}
 	got["otel.yaml"] = otelGeneratedConfig
 
 	inputBytes, err := os.ReadFile(filepath.Join("testdata", testDir, inputFileName))
 
-	userConf, err := confgenerator.UnmarshalYamlToUnifiedConfig(ctx, inputBytes)
+	userUc, err := confgenerator.UnmarshalYamlToUnifiedConfig(ctx, inputBytes)
 	if err != nil {
 		return
 	}
 
 	// Feature Tracking
-	extractedFeatures, err := confgenerator.ExtractFeatures(ctx, userConf)
+	extractedFeatures, err := confgenerator.ExtractFeatures(ctx, userUc, mergedUc)
 	if err != nil {
 		return
 	}

confgenerator/feature_tracking.go

@@ -72,43 +72,43 @@ type CustomFeatures interface {
 // ExtractFeatures fields that containing a tracking tag will be tracked.
 // Automatic collection of bool or int fields. Any value that exists on tracking
 // tag will be used instead of value from UnifiedConfig.
-func ExtractFeatures(ctx context.Context, uc *UnifiedConfig) ([]Feature, error) {
-	allFeatures := getOverriddenDefaultPipelines(uc)
-	allFeatures = append(allFeatures, getSelfLogCollection(uc))
-	allFeatures = append(allFeatures, getOTelLoggingSupportedConfig(ctx, uc))
+func ExtractFeatures(ctx context.Context, userUc, mergedUc *UnifiedConfig) ([]Feature, error) {
+	allFeatures := getOverriddenDefaultPipelines(userUc)
+	allFeatures = append(allFeatures, getSelfLogCollection(userUc))
+	allFeatures = append(allFeatures, getOTelLoggingSupportedConfig(ctx, mergedUc))
 
 	var err error
 	var tempTrackedFeatures []Feature
-	if uc.HasMetrics() {
-		tempTrackedFeatures, err = trackedMappedComponents("metrics", "receivers", uc.Metrics.Receivers)
+	if userUc.HasMetrics() {
+		tempTrackedFeatures, err = trackedMappedComponents("metrics", "receivers", userUc.Metrics.Receivers)
 		if err != nil {
 			return nil, err
 		}
 		allFeatures = append(allFeatures, tempTrackedFeatures...)
 
-		tempTrackedFeatures, err = trackedMappedComponents("metrics", "processors", uc.Metrics.Processors)
+		tempTrackedFeatures, err = trackedMappedComponents("metrics", "processors", userUc.Metrics.Processors)
 		if err != nil {
 			return nil, err
 		}
 		allFeatures = append(allFeatures, tempTrackedFeatures...)
 	}
 
-	if uc.HasLogging() {
-		tempTrackedFeatures, err = trackedMappedComponents("logging", "receivers", uc.Logging.Receivers)
+	if userUc.HasLogging() {
+		tempTrackedFeatures, err = trackedMappedComponents("logging", "receivers", userUc.Logging.Receivers)
 		if err != nil {
 			return nil, err
 		}
 		allFeatures = append(allFeatures, tempTrackedFeatures...)
 
-		tempTrackedFeatures, err = trackedMappedComponents("logging", "processors", uc.Logging.Processors)
+		tempTrackedFeatures, err = trackedMappedComponents("logging", "processors", userUc.Logging.Processors)
 		if err != nil {
 			return nil, err
 		}
 		allFeatures = append(allFeatures, tempTrackedFeatures...)
 	}
 
-	if uc.HasCombined() {
-		tempTrackedFeatures, err = trackedMappedComponents("combined", "receivers", uc.Combined.Receivers)
+	if userUc.HasCombined() {
+		tempTrackedFeatures, err = trackedMappedComponents("combined", "receivers", userUc.Combined.Receivers)
 		if err != nil {
 			return nil, err
 		}
@@ -439,7 +439,8 @@ func getMetadata(field reflect.StructField) metadata {
 	}
 }
 
-func getOTelLoggingSupportedConfig(ctx context.Context, uc *UnifiedConfig) Feature {
+// TODO: b/399354366 - Cleanup when OTel Logging Support is fully released.
+func getOTelLoggingSupportedConfig(ctx context.Context, mergedUc *UnifiedConfig) Feature {
 	feature := Feature{
 		Module: "logging",
 		Kind:   "service",
@@ -448,7 +449,7 @@ func getOTelLoggingSupportedConfig(ctx context.Context, uc *UnifiedConfig) Featu
 		Value:  "false",
 	}
 
-	if uc.OTelLoggingSupported(ctx) {
+	if mergedUc.OTelLoggingSupported(ctx) {
 		feature.Value = "true"
 	}