Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: open-telemetry/opentelemetry-operator
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 994f2c0b20a14ada7a16d5b7cc845ed87ed31122
Choose a base ref
..
head repository: open-telemetry/opentelemetry-operator
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a3530883c51cff9993ca930d74987d731fd8daef
Choose a head ref
Showing with 12 additions and 5 deletions.
  1. +12 −5 internal/components/multi_endpoint.go
17 changes: 12 additions & 5 deletions internal/components/multi_endpoint.go
Original file line number Diff line number Diff line change
@@ -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
}
@@ -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()