feat: add ust docker labels

Author: Mathew-Estafanous

modules/ecs_fargate/datadog.tf

@@ -119,6 +119,18 @@ locals {
     ] : [],
   )
 
+  ust_docker_labels = merge(
+    var.dd_env != null ? {
+      "com.datadoghq.tags.env" = var.dd_env
+    } : {},
+    var.dd_service != null ? {
+      "com.datadoghq.tags.service" = var.dd_service
+    } : {},
+    var.dd_version != null ? {
+      "com.datadoghq.tags.version" = var.dd_version
+    } : {},
+  )
+
   application_env_vars = concat(
     var.dd_apm.profiling != null ? [
       {
@@ -169,6 +181,11 @@ locals {
           local.ust_env_vars,
           local.application_env_vars,
         ),
+        # Merge UST docker labels with any existing docker labels.
+        dockerLabels = merge(
+          lookup(container, "dockerLabels", {}),
+          local.ust_docker_labels,
+        ),
         # Append new volume mounts to any existing mountPoints.
         mountPoints = concat(
           lookup(container, "mountPoints", []),
@@ -296,12 +313,13 @@ locals {
   dd_agent_container = [
     merge(
       {
-        name        = "datadog-agent"
-        image       = "${var.dd_registry}:${var.dd_image_version}"
-        essential   = var.dd_essential
-        environment = local.dd_agent_env
-        cpu         = var.dd_cpu
-        memory      = var.dd_memory_limit_mib
+        name         = "datadog-agent"
+        image        = "${var.dd_registry}:${var.dd_image_version}"
+        essential    = var.dd_essential
+        environment  = local.dd_agent_env
+        dockerLabels = local.ust_docker_labels
+        cpu          = var.dd_cpu
+        memory       = var.dd_memory_limit_mib
         secrets = var.dd_api_key_secret != null ? [
           {
             name      = "DD_API_KEY"
@@ -349,9 +367,10 @@ locals {
   dd_log_container = local.is_fluentbit_supported ? [
     merge(
       {
-        name      = "datadog-log-router"
-        image     = "${var.dd_log_collection.fluentbit_config.registry}:${var.dd_log_collection.fluentbit_config.image_version}"
-        essential = var.dd_log_collection.fluentbit_config.is_log_router_essential
+        name         = "datadog-log-router"
+        image        = "${var.dd_log_collection.fluentbit_config.registry}:${var.dd_log_collection.fluentbit_config.image_version}"
+        essential    = var.dd_log_collection.fluentbit_config.is_log_router_essential
+        dockerLabels = local.ust_docker_labels
         firelensConfiguration = {
           type = "fluentbit"
           options = merge(
@@ -397,6 +416,7 @@ locals {
       command          = ["/cws-instrumentation", "setup", "--cws-volume-mount", "/cws-instrumentation-volume"]
       mountPoints      = local.cws_mount
       environment      = local.ust_env_vars
+      dockerLabels     = local.ust_docker_labels
       portMappings     = []
       systemControls   = []
       volumesFrom      = []