fix: dev에도 datadog을 포함하도록 수정

Author: lvalentine6

terraform/dev/locals.tf

@@ -74,6 +74,8 @@ locals {
         entryPoint = svc == "api-dev" ? ["java"] : null
         command    = svc == "api-dev" ? [
           "-javaagent:/app/dd-java-agent.jar",
+          "-Ddd.logs.injection=true",
+          "-Ddd.runtime-metrics.enabled=true",
           "-Ddd.service=eatda-api",
           "-Ddd.env=dev",
           "-Ddd.version=v1",
@@ -87,7 +89,9 @@ locals {
           { name = "${svc}-${port}-tcp", containerPort = port, hostPort = def.host_port[idx], protocol = "tcp" }
         ]
         environment = [for k, v in lookup(def, "environment", {}) : { name = k, value = v }]
-        secrets     = svc == "mysql-dev" ? [
+        secrets     = svc == "datadog-agent-task" ? [
+          { name = "DD_API_KEY", valueFrom = "/dev/DD_API_KEY" }
+        ] : (svc == "mysql-dev" ? [
           { name = "MYSQL_USER", valueFrom = "/dev/MYSQL_USER_NAME" },
           { name = "MYSQL_ROOT_PASSWORD", valueFrom = "/dev/MYSQL_ROOT_PASSWORD" },
           { name = "MYSQL_PASSWORD", valueFrom = "/dev/MYSQL_PASSWORD" }
@@ -96,7 +100,7 @@ locals {
             name      = s.name
             valueFrom = s.valueFrom
           }
-        ]
+        ])
         mountPoints = [
           for vol in lookup(def, "volumes", []) :{
             sourceVolume = vol.name, containerPath = lookup(var.volume_mount_paths, vol.name, "/logs"),

terraform/dev/terraform.tfvars

@@ -11,6 +11,11 @@ ecs_services = {
   mysql-dev = {
     task_definition = "mysql"
   }
+
+  datadog-agent-task = {
+    task_definition     = "datadog-agent-task"
+    scheduling_strategy = "DAEMON"
+  }
 }
 
 ecs_task_definitions_base = {
@@ -63,4 +68,55 @@ ecs_task_definitions_base = {
       }
     ]
   }
+
+  "datadog-agent-task" = {
+    cpu             = 100
+    memory          = 128
+    network_mode    = "bridge"
+    requires_compatibilities = ["EC2"]
+    container_image = "public.ecr.aws/datadog/agent:latest"
+    container_port = [8125, 8126]
+    host_port = [8125, 8126]
+
+    port_mappings = [
+      {
+        container_port = 8126,
+        host_port      = 8126,
+        protocol       = "tcp"
+      },
+      {
+        container_port = 8125,
+        host_port      = 8125,
+        protocol       = "udp"
+      }
+    ]
+
+    environment = {
+      DD_SITE                              = "us5.datadoghq.com"
+      DD_PROCESS_AGENT_ENABLED             = "true"
+      DD_APM_ENABLED                       = "true"
+      DD_LOGS_ENABLED                      = "true"
+      DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL = "true"
+      DD_EC2_USE_IMDSV2                    = "true"
+      DD_DOGSTATSD_NON_LOCAL_TRAFFIC       = "true"
+      DD_SERVICE                           = "eatda-api"
+      DD_ENV                               = "dev"
+      DD_VERSION                           = "v1"
+    }
+
+    volumes = [
+      {
+        name      = "docker_sock"
+        host_path = "/var/run/docker.sock"
+      },
+      {
+        name      = "proc"
+        host_path = "/proc/"
+      },
+      {
+        name      = "cgroup"
+        host_path = "/sys/fs/cgroup/"
+      }
+    ]
+  }
 }

terraform/prod/ecs/locals.tf

@@ -30,8 +30,11 @@ locals {
         DD_APM_ENABLED                       = "true"
         DD_LOGS_ENABLED                      = "true"
         DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL = "true"
-        DD_APM_RECEIVER_PORT                 = "8126"
-        DD_APM_NON_LOCAL_TRAFFIC             = "true"
+        DD_EC2_USE_IMDSV2                    = "true"
+        DD_DOGSTATSD_NON_LOCAL_TRAFFIC       = "true"
+        DD_SERVICE                           = "eatda-api"
+        DD_ENV                               = "prod"
+        DD_VERSION                           = "v1"
       }
       secrets = [
         {
@@ -74,9 +77,16 @@ locals {
 
         command = svc == "api-prod" ? [
           "java",
+          "-javaagent:/app/dd-java-agent.jar",
+          "-Ddd.logs.injection=true",
+          "-Ddd.runtime-metrics.enabled=true",
+          "-Ddd.service=eatda-api",
+          "-Ddd.env=dev",
+          "-Ddd.version=v1",
+          "-Ddd.agent.host=10.0.7.245",
           "-Dspring.profiles.active=prod",
           "-jar",
-          "/api.jar"
+          "/app/api.jar"
         ] : null
 
         portMappings = [