[chore] Adapt to configoptional changes

Author: mx-psi

cmd/golden/main.go

@@ -12,6 +12,8 @@ import (
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenttest"
+	"go.opentelemetry.io/collector/config/configoptional"
+	"go.opentelemetry.io/collector/confmap"
 	"go.opentelemetry.io/collector/receiver"
 	"go.opentelemetry.io/collector/receiver/otlpreceiver"
 	noopmetric "go.opentelemetry.io/otel/metric/noop"
@@ -21,6 +23,16 @@ import (
 	"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/golden/internal"
 )
 
+// InsertDefault is a helper function to insert a default value for a configoptional.Optional type.
+func InsertDefault[T any](opt *configoptional.Optional[T]) error {
+	if opt.HasValue() {
+		return nil
+	}
+
+	empty := confmap.NewFromStringMap(map[string]any{})
+	return empty.Unmarshal(opt)
+}
+
 func main() {
 	if err := run(os.Args); err != nil {
 		log.Fatal(err)
@@ -41,14 +53,17 @@ func run(args []string) error {
 	factory := otlpreceiver.NewFactory()
 	receiverConfig := factory.CreateDefaultConfig().(*otlpreceiver.Config)
 	if cfg.OTLPHTTPEndoint != "" {
-		receiverConfig.HTTP.ServerConfig.Endpoint = cfg.OTLPHTTPEndoint
-	} else {
-		receiverConfig.HTTP = nil
+		if err := InsertDefault(&receiverConfig.HTTP); err != nil {
+			return err
+		}
+		receiverConfig.HTTP.Get().ServerConfig.Endpoint = cfg.OTLPHTTPEndoint
 	}
+
 	if cfg.OTLPEndpoint != "" {
-		receiverConfig.GRPC.NetAddr.Endpoint = cfg.OTLPEndpoint
-	} else {
-		receiverConfig.GRPC = nil
+		if err := InsertDefault(&receiverConfig.GRPC); err != nil {
+			return err
+		}
+		receiverConfig.GRPC.Get().NetAddr.Endpoint = cfg.OTLPEndpoint
 	}
 
 	logger, err := zap.NewDevelopment()

receiver/jmxreceiver/receiver.go

@@ -15,6 +15,8 @@ import (
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/confignet"
+	"go.opentelemetry.io/collector/config/configoptional"
+	"go.opentelemetry.io/collector/confmap"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/receiver"
 	"go.opentelemetry.io/collector/receiver/otlpreceiver"
@@ -138,6 +140,16 @@ func (jmx *jmxMetricReceiver) Shutdown(ctx context.Context) error {
 	return removeErr
 }
 
+// InsertDefault is a helper function to insert a default value for a configoptional.Optional type.
+func InsertDefault[T any](opt *configoptional.Optional[T]) error {
+	if opt.HasValue() {
+		return nil
+	}
+
+	empty := confmap.NewFromStringMap(map[string]any{})
+	return empty.Unmarshal(opt)
+}
+
 func (jmx *jmxMetricReceiver) buildOTLPReceiver() (receiver.Metrics, error) {
 	endpoint := jmx.config.OTLPExporterConfig.Endpoint
 	host, port, err := net.SplitHostPort(endpoint)
@@ -162,8 +174,10 @@ func (jmx *jmxMetricReceiver) buildOTLPReceiver() (receiver.Metrics, error) {
 
 	factory := otlpreceiver.NewFactory()
 	config := factory.CreateDefaultConfig().(*otlpreceiver.Config)
-	config.GRPC.NetAddr = confignet.AddrConfig{Endpoint: endpoint, Transport: confignet.TransportTypeTCP}
-	config.HTTP = nil
+	if err := InsertDefault(&config.GRPC); err != nil {
+		return nil, err
+	}
+	config.GRPC.Get().NetAddr = confignet.AddrConfig{Endpoint: endpoint, Transport: confignet.TransportTypeTCP}
 
 	params := receiver.Settings{
 		ID:                component.NewIDWithName(factory.Type(), jmx.params.ID.String()),

testbed/testbed/receivers.go

@@ -9,6 +9,8 @@ import (
 
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config/confignet"
+	"go.opentelemetry.io/collector/config/configoptional"
+	"go.opentelemetry.io/collector/confmap"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/receiver"
 	"go.opentelemetry.io/collector/receiver/otlpreceiver"
@@ -59,16 +61,31 @@ type BaseOTLPDataReceiver struct {
 	batcher         string
 }
 
+// InsertDefault is a helper function to insert a default value for a configoptional.Optional type.
+func InsertDefault[T any](opt *configoptional.Optional[T]) error {
+	if opt.HasValue() {
+		return nil
+	}
+
+	empty := confmap.NewFromStringMap(map[string]any{})
+	return empty.Unmarshal(opt)
+}
+
 func (bor *BaseOTLPDataReceiver) Start(tc consumer.Traces, mc consumer.Metrics, lc consumer.Logs) error {
 	factory := otlpreceiver.NewFactory()
 	cfg := factory.CreateDefaultConfig().(*otlpreceiver.Config)
 	if bor.exporterType == "otlp" {
-		cfg.GRPC.NetAddr = confignet.AddrConfig{Endpoint: fmt.Sprintf("127.0.0.1:%d", bor.Port), Transport: confignet.TransportTypeTCP}
-		cfg.HTTP = nil
+		if err := InsertDefault(&cfg.GRPC); err != nil {
+			return err
+		}
+		cfg.GRPC.Get().NetAddr = confignet.AddrConfig{Endpoint: fmt.Sprintf("127.0.0.1:%d", bor.Port), Transport: confignet.TransportTypeTCP}
 	} else {
-		cfg.HTTP.ServerConfig.Endpoint = fmt.Sprintf("127.0.0.1:%d", bor.Port)
-		cfg.GRPC = nil
+		if err := InsertDefault(&cfg.HTTP); err != nil {
+			return err
+		}
+		cfg.HTTP.Get().ServerConfig.Endpoint = fmt.Sprintf("127.0.0.1:%d", bor.Port)
 	}
+
 	var err error
 	set := receivertest.NewNopSettings(factory.Type())
 	if bor.traceReceiver, err = factory.CreateTraces(context.Background(), set, cfg, tc); err != nil {