internal/components: move default address

Signed-off-by: Benedikt Bongartz <[email protected]>

Author: frzifus

internal/components/multi_endpoint.go

@@ -38,7 +38,8 @@ type MultiPortOption func(parser *MultiPortReceiver)
 
 // MultiPortReceiver is a special parser for components with endpoints for each protocol.
 type MultiPortReceiver struct {
-	name string
+	name           string
+	defaultRecAddr string
 
 	addrMappings map[string]string
 	portMappings map[string]*corev1.ServicePort
@@ -85,7 +86,7 @@ func (m *MultiPortReceiver) GetDefaultConfig(logger logr.Logger, config interfac
 			if ec != nil {
 				port = ec.GetPortNumOrDefault(logger, port)
 			}
-			var addr string
+			addr := m.defaultRecAddr
 			if defaultAddr, ok := m.addrMappings[protocol]; ok {
 				addr = defaultAddr
 			}
@@ -118,7 +119,7 @@ func (m *MultiPortReceiver) GetRBACRules(logr.Logger, interface{}) ([]rbacv1.Pol
 type MultiPortBuilder[ComponentConfigType any] []Builder[ComponentConfigType]
 
 func NewMultiPortReceiverBuilder(name string) MultiPortBuilder[*MultiProtocolEndpointConfig] {
-	return append(MultiPortBuilder[*MultiProtocolEndpointConfig]{}, NewBuilder[*MultiProtocolEndpointConfig]().WithName(name))
+	return append(MultiPortBuilder[*MultiProtocolEndpointConfig]{}, NewBuilder[*MultiProtocolEndpointConfig]().WithName(name).WithDefaultRecAddress("0.0.0.0"))
 }
 
 func NewProtocolBuilder(name string, port int32) Builder[*MultiProtocolEndpointConfig] {
@@ -134,10 +135,16 @@ func (mp MultiPortBuilder[ComponentConfigType]) Build() (*MultiPortReceiver, err
 		return nil, fmt.Errorf("must provide at least one port mapping")
 	}
 
+	defaultRecAddr := ""
+	if mp[0].MustBuild().settings != nil {
+		defaultRecAddr = mp[0].MustBuild().settings.defaultRecAddr
+	}
+
 	multiReceiver := &MultiPortReceiver{
-		name:         mp[0].MustBuild().name,
-		addrMappings: map[string]string{},
-		portMappings: map[string]*corev1.ServicePort{},
+		name:           mp[0].MustBuild().name,
+		defaultRecAddr: defaultRecAddr,
+		addrMappings:   map[string]string{},
+		portMappings:   map[string]*corev1.ServicePort{},
 	}
 	for _, bu := range mp[1:] {
 		built, err := bu.Build()

internal/components/receivers/helpers.go

@@ -52,112 +52,88 @@ var (
 		components.NewMultiPortReceiverBuilder("otlp").
 			AddPortMapping(components.NewProtocolBuilder("grpc", 4317).
 				WithAppProtocol(&components.GrpcProtocol).
-				WithDefaultRecAddress("0.0.0.0").
 				WithTargetPort(4317)).
 			AddPortMapping(components.NewProtocolBuilder("http", 4318).
 				WithAppProtocol(&components.HttpProtocol).
-				WithDefaultRecAddress("0.0.0.0").
 				WithTargetPort(4318)).
 			MustBuild(),
 		components.NewMultiPortReceiverBuilder("skywalking").
 			AddPortMapping(components.NewProtocolBuilder(components.GrpcProtocol, 11800).
-				WithDefaultRecAddress("0.0.0.0").
 				WithTargetPort(11800).
 				WithAppProtocol(&components.GrpcProtocol)).
 			AddPortMapping(components.NewProtocolBuilder(components.HttpProtocol, 12800).
-				WithDefaultRecAddress("0.0.0.0").
 				WithTargetPort(12800).
 				WithAppProtocol(&components.HttpProtocol)).
 			MustBuild(),
 		components.NewMultiPortReceiverBuilder("jaeger").
 			AddPortMapping(components.NewProtocolBuilder(components.GrpcProtocol, 14250).
-				WithDefaultRecAddress("0.0.0.0").
 				WithTargetPort(14250).
 				WithProtocol(corev1.ProtocolTCP).
 				WithAppProtocol(&components.GrpcProtocol)).
 			AddPortMapping(components.NewProtocolBuilder("thrift_http", 14268).
-				WithDefaultRecAddress("0.0.0.0").
 				WithTargetPort(14268).
 				WithProtocol(corev1.ProtocolTCP).
 				WithAppProtocol(&components.HttpProtocol)).
 			AddPortMapping(components.NewProtocolBuilder("thrift_compact", 6831).
-				WithDefaultRecAddress("0.0.0.0").
 				WithTargetPort(6831).
 				WithProtocol(corev1.ProtocolUDP)).
 			AddPortMapping(components.NewProtocolBuilder("thrift_binary", 6832).
-				WithDefaultRecAddress("0.0.0.0").
 				WithTargetPort(6832).
 				WithProtocol(corev1.ProtocolUDP)).
 			MustBuild(),
 		components.NewMultiPortReceiverBuilder("loki").
 			AddPortMapping(components.NewProtocolBuilder(components.GrpcProtocol, 9095).
-				WithDefaultRecAddress("0.0.0.0").
 				WithTargetPort(9095).
 				WithAppProtocol(&components.GrpcProtocol)).
 			AddPortMapping(components.NewProtocolBuilder(components.HttpProtocol, 3100).
-				WithDefaultRecAddress("0.0.0.0").
 				WithTargetPort(3100).
 				WithAppProtocol(&components.HttpProtocol)).
 			MustBuild(),
 		components.NewSinglePortParserBuilder("awsxray", 2000).
-			WithDefaultRecAddress("0.0.0.0").
 			WithTargetPort(2000).
 			WithProtocol(corev1.ProtocolUDP).
 			MustBuild(),
 		components.NewSinglePortParserBuilder("carbon", 2003).
-			WithDefaultRecAddress("0.0.0.0").
 			WithTargetPort(2003).
 			MustBuild(),
 		components.NewSinglePortParserBuilder("collectd", 8081).
-			WithDefaultRecAddress("0.0.0.0").
 			WithTargetPort(8081).
 			MustBuild(),
 		components.NewSinglePortParserBuilder("fluentforward", 8006).
-			WithDefaultRecAddress("0.0.0.0").
 			WithTargetPort(8006).
 			MustBuild(),
 		components.NewSinglePortParserBuilder("influxdb", 8086).
-			WithDefaultRecAddress("0.0.0.0").
 			WithTargetPort(8086).
 			MustBuild(),
 		components.NewSinglePortParserBuilder("opencensus", 55678).
 			WithAppProtocol(nil).
-			WithDefaultRecAddress("0.0.0.0").
 			WithTargetPort(55678).
 			MustBuild(),
 		components.NewSinglePortParserBuilder("sapm", 7276).
-			WithDefaultRecAddress("0.0.0.0").
 			WithTargetPort(7276).
 			MustBuild(),
 		components.NewSinglePortParserBuilder("signalfx", 9943).
-			WithDefaultRecAddress("0.0.0.0").
 			WithTargetPort(9943).
 			MustBuild(),
 		components.NewSinglePortParserBuilder("splunk_hec", 8088).
-			WithDefaultRecAddress("0.0.0.0").
 			WithTargetPort(8088).
 			MustBuild(),
 		components.NewSinglePortParserBuilder("statsd", 8125).
-			WithDefaultRecAddress("0.0.0.0").
 			WithProtocol(corev1.ProtocolUDP).
 			WithTargetPort(8125).
 			MustBuild(),
 		components.NewSinglePortParserBuilder("tcplog", components.UnsetPort).
-			WithDefaultRecAddress("0.0.0.0").
 			WithProtocol(corev1.ProtocolTCP).
 			MustBuild(),
 		components.NewSinglePortParserBuilder("udplog", components.UnsetPort).
-			WithDefaultRecAddress("0.0.0.0").
 			WithProtocol(corev1.ProtocolUDP).
 			MustBuild(),
 		components.NewSinglePortParserBuilder("wavefront", 2003).
-			WithDefaultRecAddress("0.0.0.0").
 			WithTargetPort(2003).
 			MustBuild(),
 		components.NewSinglePortParserBuilder("zipkin", 9411).
 			WithAppProtocol(&components.HttpProtocol).
 			WithProtocol(corev1.ProtocolTCP).
-			WithDefaultRecAddress("0.0.0.0").
 			WithTargetPort(3100).
 			MustBuild(),
 		NewScraperParser("prometheus"),

internal/components/single_endpoint.go

@@ -84,11 +84,11 @@ func internalParseSingleEndpoint(logger logr.Logger, name string, failSilently b
 }
 
 func NewSinglePortParserBuilder(name string, port int32) Builder[*SingleEndpointConfig] {
-	return NewBuilder[*SingleEndpointConfig]().WithPort(port).WithName(name).WithPortParser(ParseSingleEndpoint).WithDefaultsApplier(AddressDefaulter)
+	return NewBuilder[*SingleEndpointConfig]().WithPort(port).WithName(name).WithPortParser(ParseSingleEndpoint).WithDefaultsApplier(AddressDefaulter).WithDefaultRecAddress("0.0.0.0")
 }
 
 func NewSilentSinglePortParserBuilder(name string, port int32) Builder[*SingleEndpointConfig] {
-	return NewBuilder[*SingleEndpointConfig]().WithPort(port).WithName(name).WithPortParser(ParseSingleEndpointSilent).WithDefaultsApplier(AddressDefaulter)
+	return NewBuilder[*SingleEndpointConfig]().WithPort(port).WithName(name).WithPortParser(ParseSingleEndpointSilent).WithDefaultsApplier(AddressDefaulter).WithDefaultRecAddress("0.0.0.0")
 }
 
 func AddressDefaulter(logger logr.Logger, defaultRecAddr string, port int32, config *SingleEndpointConfig) (map[string]interface{}, error) {