fixup! feat(dogstatsd): activate Origin Detection with UDP

fix(dogstatsd): add missing envvar usage Signed-off-by: Wassim DHIF <[email protected]>
DataDog · Feb 14, 2024 · c5ef18c · c5ef18c
1 parent 08aeaf3
commit c5ef18c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/apis/datadoghq/common/const.go b/apis/datadoghq/common/const.go
@@ -56,6 +56,8 @@ const (
 	DefaultAdmissionControllerTargetPort = 8000
 	// DefaultAdmissionControllerWebhookName default admission controller webhook name
 	DefaultAdmissionControllerWebhookName string = "datadog-webhook"
+	// DefaultDogstatsdOriginDetection default Origin Detection
+	DefaultDogstatsdOriginDetection = "false"
 	// DefaultDogstatsdPort default dogstatsd port
 	DefaultDogstatsdPort = 8125
 	// DefaultDogstatsdPortName default dogstatsd port name

diff --git a/controllers/datadogagent/agent_test.go b/controllers/datadogagent/agent_test.go
@@ -841,8 +841,12 @@ func defaultEnvVars(extraEnv map[string]string) []corev1.EnvVar {
 			Value: fmt.Sprintf("%s-leader-election", testDdaName),
 		},
 		{
-			Name:  "DD_DOGSTATSD_ORIGIN_DETECTION",
-			Value: "false",
+			Name:  apicommon.DDDogstatsdOriginDetection,
+			Value: apicommon.DefaultDogstatsdOriginDetection,
+		},
+		{
+			Name:  apicommon.DDDogstatsdOriginDetectionClient,
+			Value: apicommon.DefaultDogstatsdOriginDetection,
 		},
 		{
 			Name:  "DD_DOGSTATSD_SOCKET",
@@ -1931,8 +1935,12 @@ func customKubeletConfigPodSpec(kubeletConfig *commonv1.KubeletConfig) corev1.Po
 			Value: fmt.Sprintf("%s-leader-election", testDdaName),
 		},
 		{
-			Name:  "DD_DOGSTATSD_ORIGIN_DETECTION",
-			Value: "false",
+			Name:  apicommon.DDDogstatsdOriginDetection,
+			Value: apicommon.DefaultDogstatsdOriginDetection,
+		},
+		{
+			Name:  apicommon.DDDogstatsdOriginDetectionClient,
+			Value: apicommon.DefaultDogstatsdOriginDetection,
 		},
 		{
 			Name:  "DD_DOGSTATSD_SOCKET",

diff --git a/controllers/datadogagent/utils.go b/controllers/datadogagent/utils.go
@@ -884,12 +884,16 @@ func getEnvVarsForAgent(logger logr.Logger, dda *datadoghqv1alpha1.DatadogAgent)
 	envVars = append(envVars, commonEnvVars...)
 
 	if isDogstatsdConfigured(&spec) {
-		envVars = append(envVars,
-			corev1.EnvVar{
+		envVars = append(envVars, []corev1.EnvVar{
+			{
 				Name:  apicommon.DDDogstatsdOriginDetection,
 				Value: strconv.FormatBool(*spec.Agent.Config.Dogstatsd.DogstatsdOriginDetection),
 			},
-		)
+			{
+				Name:  apicommon.DDDogstatsdOriginDetectionClient,
+				Value: strconv.FormatBool(*spec.Agent.Config.Dogstatsd.DogstatsdOriginDetection),
+			},
+		}...)
 		// Always add DD_DOGSTATSD_SOCKET env var, to allow JMX-Fetch to use it inside pod's containers.
 		envVars = append(envVars, getEnvVarDogstatsdSocket(dda))