Set DD_OTELCOLLECTOR_ENABLED in otel-agent container (#1888)

* Set DD_OTELCOLLECTOR_ENABLED in otel-agent container

* add tests

---------

Co-authored-by: levan-m <[email protected]>

Author: songy23

internal/controller/datadogagent/feature/otelcollector/feature.go

@@ -232,10 +232,10 @@ func (o *otelCollectorFeature) ManageNodeAgent(managers feature.PodTemplateManag
 				Name:  DDOtelCollectorCoreConfigEnabled,
 				Value: apiutils.BoolToString(o.coreAgentConfig.enabled),
 			}
-			managers.EnvVar().AddEnvVarToContainers([]apicommon.AgentContainerName{apicommon.CoreAgentContainerName}, enableEnvVar)
+			managers.EnvVar().AddEnvVarToContainers([]apicommon.AgentContainerName{apicommon.CoreAgentContainerName, apicommon.OtelAgent}, enableEnvVar)
 		}
 	} else {
-		managers.EnvVar().AddEnvVarToContainers([]apicommon.AgentContainerName{apicommon.CoreAgentContainerName}, &corev1.EnvVar{
+		managers.EnvVar().AddEnvVarToContainers([]apicommon.AgentContainerName{apicommon.CoreAgentContainerName, apicommon.OtelAgent}, &corev1.EnvVar{
 			Name:  DDOtelCollectorCoreConfigEnabled,
 			Value: "true",
 		})

internal/controller/datadogagent/feature/otelcollector/feature_test.go

@@ -304,26 +304,39 @@ func testExpectedAgent(agentContainerName apicommon.AgentContainerName, expected
 
 			// check env vars
 			wantEnvVars := []*corev1.EnvVar{}
+			wantEnvVarsOTel := []*corev1.EnvVar{}
 
 			if expectedEnvVars.agent_ipc_port.present {
 				wantEnvVars = append(wantEnvVars, &corev1.EnvVar{
 					Name:  DDAgentIpcPort,
 					Value: expectedEnvVars.agent_ipc_port.value,
 				})
+				wantEnvVarsOTel = append(wantEnvVarsOTel, &corev1.EnvVar{
+					Name:  DDAgentIpcPort,
+					Value: expectedEnvVars.agent_ipc_port.value,
+				})
 			}
 
 			if expectedEnvVars.agent_ipc_refresh.present {
 				wantEnvVars = append(wantEnvVars, &corev1.EnvVar{
 					Name:  DDAgentIpcConfigRefreshInterval,
 					Value: expectedEnvVars.agent_ipc_refresh.value,
 				})
+				wantEnvVarsOTel = append(wantEnvVarsOTel, &corev1.EnvVar{
+					Name:  DDAgentIpcConfigRefreshInterval,
+					Value: expectedEnvVars.agent_ipc_refresh.value,
+				})
 			}
 
 			if expectedEnvVars.enabled.present {
 				wantEnvVars = append(wantEnvVars, &corev1.EnvVar{
 					Name:  DDOtelCollectorCoreConfigEnabled,
 					Value: expectedEnvVars.enabled.value,
 				})
+				wantEnvVarsOTel = append(wantEnvVarsOTel, &corev1.EnvVar{
+					Name:  DDOtelCollectorCoreConfigEnabled,
+					Value: expectedEnvVars.enabled.value,
+				})
 			}
 
 			if expectedEnvVars.extension_timeout.present {
@@ -345,7 +358,9 @@ func testExpectedAgent(agentContainerName apicommon.AgentContainerName, expected
 			}
 
 			agentEnvVars := mgr.EnvVarMgr.EnvVarsByC[apicommon.CoreAgentContainerName]
+			otelAgentEnvVars := mgr.EnvVarMgr.EnvVarsByC[apicommon.OtelAgent]
 			assert.True(t, apiutils.IsEqualStruct(agentEnvVars, wantEnvVars), "Agent envvars \ndiff = %s", cmp.Diff(agentEnvVars, wantEnvVars))
+			assert.True(t, apiutils.IsEqualStruct(otelAgentEnvVars, wantEnvVarsOTel), "OTel Agent envvars \ndiff = %s", cmp.Diff(otelAgentEnvVars, wantEnvVarsOTel))
 
 			// annotations
 			agentAnnotations := mgr.AnnotationMgr.Annotations