chore: remove ust tagging for agent container

Author: Mathew-Estafanous

modules/ecs_fargate/datadog.tf

@@ -183,9 +183,8 @@ locals {
         ),
         # Merge UST docker labels with any existing docker labels.
         dockerLabels = merge(
-          local.ust_docker_labels,
-          // Placing this after local.ust_docker_labels ensures user defined UST labels are not overwritten.
           lookup(container, "dockerLabels", {}),
+          local.ust_docker_labels,
         ),
         # Append new volume mounts to any existing mountPoints.
         mountPoints = concat(
@@ -306,15 +305,9 @@ locals {
     local.dynamic_env,
     local.origin_detection_vars,
     local.cws_vars,
-    local.ust_env_vars,
     local.dd_environment,
   )
 
-  dd_agent_docker_labels = merge(
-    local.ust_docker_labels,
-    var.dd_docker_labels,
-  )
-
   # Datadog Agent container definition
   dd_agent_container = [
     merge(
@@ -323,7 +316,7 @@ locals {
         image        = "${var.dd_registry}:${var.dd_image_version}"
         essential    = var.dd_essential
         environment  = local.dd_agent_env
-        dockerLabels = local.dd_agent_docker_labels
+        dockerLabels = var.dd_docker_labels
         cpu          = var.dd_cpu
         memory       = var.dd_memory_limit_mib
         secrets = var.dd_api_key_secret != null ? [
@@ -364,11 +357,6 @@ locals {
 
   dd_log_environment = var.dd_log_collection.fluentbit_config.environment != null ? var.dd_log_collection.fluentbit_config.environment : []
 
-  dd_log_agent_env = concat(
-    local.ust_env_vars,
-    local.dd_log_environment
-  )
-
   # Datadog log router container definition
   dd_log_container = local.is_fluentbit_supported ? [
     merge(
@@ -390,8 +378,8 @@ locals {
         memory_limit_mib = var.dd_log_collection.fluentbit_config.memory_limit_mib
         user             = "0"
         mountPoints      = var.dd_log_collection.fluentbit_config.mountPoints
-        environment      = local.dd_log_agent_env
-        dockerLabels     = local.dd_agent_docker_labels
+        environment      = local.dd_log_environment
+        dockerLabels     = var.dd_docker_labels
         portMappings     = []
         systemControls   = []
         volumesFrom      = []
@@ -422,7 +410,7 @@ locals {
       command          = ["/cws-instrumentation", "setup", "--cws-volume-mount", "/cws-instrumentation-volume"]
       mountPoints      = local.cws_mount
       environment      = local.ust_env_vars
-      dockerLabels     = local.dd_agent_docker_labels
+      dockerLabels     = var.dd_docker_labels
       portMappings     = []
       systemControls   = []
       volumesFrom      = []

smoke_tests/ecs_fargate/ust-docker-labels.tf

@@ -31,6 +31,8 @@ module "dd_task_ust_docker_labels" {
 
   dd_docker_labels = {
     "com.datadoghq.tags.service" : "docker-agent-service",
+    "com.datadoghq.tags.env": "agent-dev",
+    "com.datadoghq.tags.version": "v1.2.3"
   }
 
   # Configure Task Definition with multiple containers
@@ -41,15 +43,6 @@ module "dd_task_ust_docker_labels" {
       image     = "nginx:latest",
       essential = true,
     },
-    {
-      name      = "app-overwritten-ust",
-      image     = "nginx:latest",
-      essential = false,
-      dockerLabels = {
-        "com.datadoghq.tags.service" : "overwritten_name",
-        "custom.label" = "custom-value"
-      }
-    }
   ])
 
   requires_compatibilities = ["FARGATE"]

tests/all_dd_disabled_test.go

@@ -42,7 +42,6 @@ func (s *ECSFargateSuite) TestAllDDDisabled() {
 	expectedAgentEnvVars := map[string]string{
 		"DD_API_KEY":                     "test-api-key",
 		"DD_SITE":                        "datadoghq.com",
-		"DD_SERVICE":                     "test-service",
 		"DD_TAGS":                        "team:cont-p, owner:container-monitoring",
 		"DD_DOGSTATSD_TAG_CARDINALITY":   "orchestrator",
 		"DD_ECS_TASK_COLLECTION_ENABLED": "true",

tests/all_dd_inputs_test.go

@@ -51,7 +51,6 @@ func (s *ECSFargateSuite) TestAllDDInputs() {
 		"DD_API_KEY":                                  "test-api-key",
 		"DD_SITE":                                     "datadoghq.com",
 		"ECS_FARGATE":                                 "true",
-		"DD_SERVICE":                                  "test-service",
 		"DD_RUNTIME_SECURITY_CONFIG_EBPFLESS_ENABLED": "true",
 		"DD_INSTALL_INFO_TOOL":                        "terraform",
 		// "DD_INSTALL_INFO_INSTALLER_VERSION":        "0.0.0",
@@ -61,7 +60,6 @@ func (s *ECSFargateSuite) TestAllDDInputs() {
 	expectedLogOptions := map[string]string{
 		"apikey":      "test-api-key",
 		"provider":    "ecs",
-		"dd_service":  "dd-test",
 		"Host":        "http-intake.logs.datadoghq.com",
 		"TLS":         "on",
 		"dd_source":   "dd-test",

tests/apm_dsd_tcp_udp_test.go

@@ -42,7 +42,6 @@ func (s *ECSFargateSuite) TestApmDsdTcpUdp() {
 	expectedAgentEnvVars := map[string]string{
 		"DD_API_KEY":                           "test-api-key",
 		"DD_SITE":                              "datadoghq.com",
-		"DD_SERVICE":                           "test-service",
 		"DD_TAGS":                              "team:cont-p, owner:container-monitoring",
 		"DD_DOGSTATSD_TAG_CARDINALITY":         "orchestrator",
 		"DD_ECS_TASK_COLLECTION_ENABLED":       "true",

tests/logging_only_test.go

@@ -42,7 +42,6 @@ func (s *ECSFargateSuite) TestLoggingOnly() {
 	expectedAgentEnvVars := map[string]string{
 		"DD_API_KEY":                     "test-api-key",
 		"DD_SITE":                        "datadoghq.com",
-		"DD_SERVICE":                     "test-service",
 		"DD_DOGSTATSD_TAG_CARDINALITY":   "orchestrator",
 		"DD_ECS_TASK_COLLECTION_ENABLED": "true",
 		"ECS_FARGATE":                    "true",
@@ -87,7 +86,6 @@ func (s *ECSFargateSuite) TestLoggingOnly() {
 
 	// Verify log router environment variables
 	expectedLogRouterEnvVars := map[string]string{
-		"DD_SERVICE":                           "test-service",
 		"DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL": "true",
 	}
 	AssertEnvVars(s.T(), logRouterContainer, expectedLogRouterEnvVars)

tests/ust_docker_labels_test.go

@@ -25,7 +25,7 @@ func (s *ECSFargateSuite) TestUSTDockerLabels() {
 
 	err := json.Unmarshal([]byte(task["container_definitions"]), &containers)
 	s.NoError(err, "Failed to parse container definitions")
-	s.Equal(5, len(containers), "Expected 4 containers in the task definition (3 app containers + 1 agent)")
+	s.Equal(4, len(containers), "Expected 4 containers in the task definition (1 app container + 3 agent sidecar)")
 
 	// Expected UST docker labels that should be present on all application containers
 	expectedUSTLabels := map[string]string{
@@ -41,18 +41,14 @@ func (s *ECSFargateSuite) TestUSTDockerLabels() {
 	// Expect UST docker labels to be present on all Datadog containers with
 	// overwritten labels when UST docker labels are specified.
 	datadogContainers := []string{"datadog-agent", "datadog-log-router", "cws-instrumentation-init"}
-	expectedUSTLabels["com.datadoghq.tags.service"] = "docker-agent-service"
+	expectedAgentUSTLabels := map[string]string{
+		"com.datadoghq.tags.service": "docker-agent-service",
+		"com.datadoghq.tags.env":     "agent-dev",
+		"com.datadoghq.tags.version": "v1.2.3",
+	}
 	for _, containerName := range datadogContainers {
 		container, found := GetContainer(containers, containerName)
 		s.True(found, "Container %s not found in definitions", containerName)
-		AssertDockerLabels(s.T(), container, expectedUSTLabels)
+		AssertDockerLabels(s.T(), container, expectedAgentUSTLabels)
 	}
-
-	// Expect UST docker labels to be overwritten on application container if docker labels
-	// are specified in the container definition.
-	overwrittenLabels, found := GetContainer(containers, "app-overwritten-ust")
-	s.True(found, "Container app-overwritten-ust not found in definitions")
-	expectedUSTLabels["com.datadoghq.tags.service"] = "overwritten_name"
-	AssertDockerLabels(s.T(), overwrittenLabels, expectedUSTLabels)
-
 }