Skip to content

Commit 68d8ecd

Browse files
committed
fix: metrics-address duplication by adding telemetry.disableAddressFieldForInternalTelemetry feature-gate
Signed-off-by: Bence Csati <[email protected]>
1 parent 7e7c6c0 commit 68d8ecd

File tree

1 file changed

+27
-7
lines changed

1 file changed

+27
-7
lines changed

internal/controller/telemetry/otel_conf_gen/otel_conf_gen.go

+27-7
Original file line numberDiff line numberDiff line change
@@ -333,20 +333,40 @@ func (cfgInput *OtelColConfigInput) AssembleConfig(ctx context.Context) (otelv1b
333333

334334
func assembleAdditionalArgs(otelConfig *otelv1beta1.Config) map[string]string {
335335
const (
336-
featureGatesKey = "feature-gates"
337-
flattenLogsFeatureGateValue = "transform.flatten.logs"
338-
336+
featureGatesKey = "feature-gates"
339337
transformProcessorID = "transform"
340338
flattenDataKey = "flatten_data"
341339
)
340+
const (
341+
flattenLogsFeatureGateValue = "transform.flatten.logs"
342+
telemetryDisableAddressFieldForInternalTelemetry = "telemetry.disableAddressFieldForInternalTelemetry"
343+
)
342344

345+
type enableConstraint func() bool
343346
args := make(map[string]string)
344-
for processorName, processorConfig := range otelConfig.Processors.Object {
345-
if strings.Contains(processorName, transformProcessorID) && processorConfig.(processor.TransformProcessor).FlattenData {
346-
args[featureGatesKey] = flattenLogsFeatureGateValue
347-
break
347+
availableFeatureGates := map[string]enableConstraint{
348+
flattenLogsFeatureGateValue: func() bool {
349+
for processorName, processorConfig := range otelConfig.Processors.Object {
350+
if strings.Contains(processorName, transformProcessorID) && processorConfig.(processor.TransformProcessor).FlattenData {
351+
return true
352+
}
353+
}
354+
return false
355+
},
356+
telemetryDisableAddressFieldForInternalTelemetry: func() bool {
357+
return true
358+
},
359+
}
360+
361+
var enabledFeatureGates []string
362+
for featureGate, isFeatureGateEnabled := range availableFeatureGates {
363+
if isFeatureGateEnabled() {
364+
enabledFeatureGates = append(enabledFeatureGates, featureGate)
348365
}
349366
}
367+
if len(enabledFeatureGates) > 0 {
368+
args[featureGatesKey] = strings.Join(enabledFeatureGates, ",")
369+
}
350370

351371
return args
352372
}

0 commit comments

Comments
 (0)