Apply changes requested in code review

Signed-off-by: Israel Blancas <[email protected]>

Author: Israel Blancas

apis/v1beta1/config.go

@@ -93,16 +93,9 @@ func (c AnyConfig) MarshalJSON() ([]byte, error) {
 		return []byte("{}"), nil
 	}
 
-	nonNilMap := make(map[string]interface{})
-
+	nonNilMap := make(map[string]interface{}, len(c.Object))
 	for k, v := range c.Object {
-		if v == nil {
-			nonNilMap[k] = nil
-		} else if emptyMap, ok := v.(map[string]interface{}); ok && len(emptyMap) == 0 {
-			nonNilMap[k] = emptyMap
-		} else {
-			nonNilMap[k] = v
-		}
+		nonNilMap[k] = v
 	}
 
 	return json.Marshal(nonNilMap)
@@ -251,8 +244,14 @@ func (c *Config) Yaml() (string, error) {
 	return buf.String(), nil
 }
 
+// MarshalJSON marshalls the Config field.
 func (c Config) MarshalJSON() ([]byte, error) {
+	// When you marshal a struct that embeds itself or a type that directly or indirectly refers back to itself,
+	// Go's JSON marshaling can lead to infinite recursion. To avoid this, we create an alias of the struct
+	// (Config), so Go no longer considers it the same type.
+	// This allows you to embed the struct safely within itself without triggering that infinite loop.
 	type Alias Config
+	// Ensure we call the custom marshaller for AnyConfig for the Receivers
 	receiversJSON, err := json.Marshal(c.Receivers)
 	if err != nil {
 		return nil, err

apis/v1beta1/config_test.go

@@ -85,6 +85,11 @@ func TestCreateConfigInKubernetesEmptyValues(t *testing.T) {
 						},
 					},
 				},
+				Processors: &AnyConfig{
+					Object: map[string]interface{}{
+						"resourcedetection": map[string]interface{}{},
+					},
+				},
 				Service: Service{
 					Pipelines: map[string]*Pipeline{
 						"traces": {
@@ -119,6 +124,7 @@ func TestCreateConfigInKubernetesEmptyValues(t *testing.T) {
 	}
 
 	require.Contains(t, string(jsonData), "{\"grpc\":{},\"http\":{}}")
+	require.Contains(t, string(jsonData), "\"resourcedetection\":{}")
 
 	unmarshalledCollector := &OpenTelemetryCollector{}
 	err = json.Unmarshal(jsonData, &unmarshalledCollector.Spec)
@@ -138,6 +144,11 @@ func TestCreateConfigInKubernetesEmptyValues(t *testing.T) {
 	http, ok := protocols["http"]
 	require.True(t, ok, "http protocol should exist")
 	require.NotNil(t, http, "http protocol should be nil")
+
+	require.NotNil(t, unmarshalledCollector.Spec.Config.Receivers.Object["otlp"])
+
+	_, ok = unmarshalledCollector.Spec.Config.Processors.Object["resourcedetection"].(map[string]interface{})
+	require.True(t, ok, "resourcedetector processor should be a map")
 }
 
 func TestCreateConfigInKubernetesNullValues(t *testing.T) {

apis/v1beta1/opentelemetrycollector_types.go

@@ -54,8 +54,14 @@ type OpenTelemetryCollector struct {
 // Hub exists to allow for conversion.
 func (*OpenTelemetryCollector) Hub() {}
 
+// MarshalJSON marshalls the OpenTelemetry Collector to JSON.
 func (o *OpenTelemetryCollector) MarshalJSON() ([]byte, error) {
+	// When you marshal a struct that embeds itself or a type that directly or indirectly refers back to itself,
+	// Go's JSON marshaling can lead to infinite recursion. To avoid this, we create an alias of the struct
+	// (Config), so Go no longer considers it the same type.
+	// This allows you to embed the struct safely within itself without triggering that infinite loop.
 	type Alias OpenTelemetryCollector
+	// Ensure we call the custom marshaller for Spec
 	specJSON, err := json.Marshal(&o.Spec)
 	if err != nil {
 		return nil, err
@@ -160,8 +166,14 @@ type OpenTelemetryCollectorSpec struct {
 	DeploymentUpdateStrategy appsv1.DeploymentStrategy `json:"deploymentUpdateStrategy,omitempty"`
 }
 
+// MarshalJSON marshalls the OpenTelemetryCollectorSpec field.
 func (s *OpenTelemetryCollectorSpec) MarshalJSON() ([]byte, error) {
+	// When you marshal a struct that embeds itself or a type that directly or indirectly refers back to itself,
+	// Go's JSON marshaling can lead to infinite recursion. To avoid this, we create an alias of the struct
+	// (Config), so Go no longer considers it the same type.
+	// This allows you to embed the struct safely within itself without triggering that infinite loop.
 	type Alias OpenTelemetryCollectorSpec
+	// Ensure we call the custom marshaller for Config
 	configJSON, err := json.Marshal(s.Config)
 	if err != nil {
 		return nil, err