From a883db8784b0ca08f65e34278406c8bfec7c443e Mon Sep 17 00:00:00 2001 From: jihwan2da Date: Tue, 17 Oct 2023 17:56:37 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20Datadog=20=ED=99=98=EA=B2=BD=EB=B3=80?= =?UTF-8?q?=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .aws/task-definition.json | 40 +++++++++++++++++++++++++++++++++------ Dockerfile_prd | 4 ++-- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/.aws/task-definition.json b/.aws/task-definition.json index 25551397..ec674898 100644 --- a/.aws/task-definition.json +++ b/.aws/task-definition.json @@ -1,5 +1,5 @@ { - "taskDefinitionArn": "arn:aws:ecs:ap-northeast-2:750773866215:task-definition/gloddy-prd-spring-task-test:18", + "taskDefinitionArn": "arn:aws:ecs:ap-northeast-2:750773866215:task-definition/gloddy-prd-spring-task-test:24", "containerDefinitions": [ { "name": "springboot", @@ -39,7 +39,7 @@ { "name": "datadog-agent", "image": "public.ecr.aws/datadog/agent:latest", - "cpu": 203, + "cpu": 198, "memory": 512, "portMappings": [ { @@ -47,10 +47,28 @@ "containerPort": 8126, "hostPort": 8126, "protocol": "tcp" + }, + { + "containerPort": 8125, + "hostPort": 8125, + "protocol": "udp" } ], "essential": false, - "environment": [], + "environment": [ + { + "name": "DD_SITE", + "value": "us5.datadoghq.com" + }, + { + "name": "DD_APM_ENABLED", + "value": "true" + }, + { + "name": "DD_DOGSTATSD_NON_LOCAL_TRAFFIC", + "value": "true" + } + ], "environmentFiles": [ { "value": "arn:aws:s3:::gloddy-env/env/datadog.env", @@ -58,13 +76,23 @@ } ], "mountPoints": [], - "volumesFrom": [] + "volumesFrom": [], + "logConfiguration": { + "logDriver": "awslogs", + "options": { + "awslogs-create-group": "true", + "awslogs-group": "/ecs/datadog-agent", + "awslogs-region": "ap-northeast-2", + "awslogs-stream-prefix": "ecs" + }, + "secretOptions": [] + } } ], "family": "gloddy-prd-spring-task-test", "executionRoleArn": "arn:aws:iam::750773866215:role/ecsTaskExecutionRole", "networkMode": "awsvpc", - "revision": 18, + "revision": 24, "volumes": [], "status": "ACTIVE", "requiresAttributes": [ @@ -110,7 +138,7 @@ "cpuArchitecture": "X86_64", "operatingSystemFamily": "LINUX" }, - "registeredAt": "2023-10-16T07:41:48.083Z", + "registeredAt": "2023-10-17T08:45:15.389Z", "registeredBy": "arn:aws:iam::750773866215:root", "tags": [] } \ No newline at end of file diff --git a/Dockerfile_prd b/Dockerfile_prd index 50b9d8e4..92ef2a92 100644 --- a/Dockerfile_prd +++ b/Dockerfile_prd @@ -11,6 +11,6 @@ COPY ${JAR_FILE_PATH} app.jar RUN apt-get update \ && apt-get install -y wget \ && rm -rf /var/lib/apt/lists/* -RUN wget -O dd-java-agent.jar https://dtdg.co/latest-java-tracer +RUN wget -O dd-java-agent.jar 'https://dtdg.co/latest-java-tracer' -ENTRYPOINT ["java", "-javaagent:dd-java-agent.jar", "-XX:FlightRecorderOptions=stackdepth=256", "-Ddd.appsec.enabled=true", "-Ddd.iast.enabled=true", "-Ddd.logs.injection=true", "-Ddd.service=gloddy", "-Ddd.env=production", "-jar", "app.jar"] \ No newline at end of file +ENTRYPOINT ["java", "-javaagent:dd-java-agent.jar", "Ddd.profiling.enabled=true","-XX:FlightRecorderOptions=stackdepth=256", "-Ddd.appsec.enabled=true", "-Ddd.iast.enabled=true", "-Ddd.logs.injection=true", "-Ddd.jmxfetch.enabled=true", "-Ddd.service=gloddy", "-Ddd.env=production", "-jar", "app.jar"] \ No newline at end of file