Merge pull request #145 from kube-logging/chore/bump-axo-otelcol

chore: bump axoflow-otelcol version to v0.120.0

Author: csatib02

internal/controller/telemetry/collector_controller.go

@@ -50,7 +50,7 @@ import (
 const (
 	otelCollectorKind            = "OpenTelemetryCollector"
 	requeueDelayOnFailedTenant   = 20 * time.Second
-	axoflowOtelCollectorImageRef = "ghcr.io/axoflow/axoflow-otel-collector/axoflow-otel-collector:0.112.0-dev12"
+	axoflowOtelCollectorImageRef = "ghcr.io/axoflow/axoflow-otel-collector/axoflow-otel-collector:0.120.0"
 )
 
 var (
@@ -507,7 +507,7 @@ func (r *CollectorReconciler) reconcileClusterRole(ctx context.Context, collecto
 			{
 				Verbs:     []string{"get", "watch", "list"},
 				APIGroups: []string{""},
-				Resources: []string{"pods", "namespaces"},
+				Resources: []string{"pods", "namespaces", "nodes"},
 			},
 			{
 				Verbs:     []string{"get", "watch", "list"},

internal/controller/telemetry/otel_conf_gen/otel_conf_gen.go

@@ -333,20 +333,40 @@ func (cfgInput *OtelColConfigInput) AssembleConfig(ctx context.Context) (otelv1b
 
 func assembleAdditionalArgs(otelConfig *otelv1beta1.Config) map[string]string {
 	const (
-		featureGatesKey             = "feature-gates"
-		flattenLogsFeatureGateValue = "transform.flatten.logs"
-
+		featureGatesKey      = "feature-gates"
 		transformProcessorID = "transform"
 		flattenDataKey       = "flatten_data"
 	)
+	const (
+		flattenLogsFeatureGateValue                      = "transform.flatten.logs"
+		telemetryDisableAddressFieldForInternalTelemetry = "telemetry.disableAddressFieldForInternalTelemetry"
+	)
 
+	type enableConstraint func() bool
 	args := make(map[string]string)
-	for processorName, processorConfig := range otelConfig.Processors.Object {
-		if strings.Contains(processorName, transformProcessorID) && processorConfig.(processor.TransformProcessor).FlattenData {
-			args[featureGatesKey] = flattenLogsFeatureGateValue
-			break
+	availableFeatureGates := map[string]enableConstraint{
+		flattenLogsFeatureGateValue: func() bool {
+			for processorName, processorConfig := range otelConfig.Processors.Object {
+				if strings.Contains(processorName, transformProcessorID) && processorConfig.(processor.TransformProcessor).FlattenData {
+					return true
+				}
+			}
+			return false
+		},
+		telemetryDisableAddressFieldForInternalTelemetry: func() bool {
+			return true
+		},
+	}
+
+	var enabledFeatureGates []string
+	for featureGate, isFeatureGateEnabled := range availableFeatureGates {
+		if isFeatureGateEnabled() {
+			enabledFeatureGates = append(enabledFeatureGates, featureGate)
 		}
 	}
+	if len(enabledFeatureGates) > 0 {
+		args[featureGatesKey] = strings.Join(enabledFeatureGates, ",")
+	}
 
 	return args
 }