From 7c9129f9ed271ac1306356eeb6bcb9789685085b Mon Sep 17 00:00:00 2001
From: Zhou <zmengyi@amazon.com>
Date: Fri, 17 Jan 2025 10:33:25 -0800
Subject: [PATCH] Add container dependencies to the ECS canaries to avoid
 intermittent setup failures

---
 .../java/ecs/resources/main-service.json.tpl   | 18 ++++++++++++++----
 .../python/ecs/resources/main-service.json.tpl | 10 ++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/terraform/java/ecs/resources/main-service.json.tpl b/terraform/java/ecs/resources/main-service.json.tpl
index 858f66bbd..125947ea6 100644
--- a/terraform/java/ecs/resources/main-service.json.tpl
+++ b/terraform/java/ecs/resources/main-service.json.tpl
@@ -54,10 +54,10 @@
         "name": "OTEL_PROPAGATORS",
         "value": "tracecontext,baggage,b3,xray"
       },
-     {
-       "name": "OTEL_INSTRUMENTATION_COMMON_EXPERIMENTAL_CONTROLLER_TELEMETRY_ENABLED",
-       "value": "true"
-     }
+      {
+        "name": "OTEL_INSTRUMENTATION_COMMON_EXPERIMENTAL_CONTROLLER_TELEMETRY_ENABLED",
+        "value": "true"
+      }
     ],
     "mountPoints": [
       {
@@ -66,6 +66,16 @@
         "readOnly": false
       }
     ],
+    "dependsOn": [
+      {
+        "containerName": "init",
+        "condition": "SUCCESS"
+      },
+      {
+        "containerName": "ecs-cwagent",
+        "condition": "START"
+      }
+    ],
     "logConfiguration": {
       "logDriver": "awslogs",
       "options": {
diff --git a/terraform/python/ecs/resources/main-service.json.tpl b/terraform/python/ecs/resources/main-service.json.tpl
index 9f820fb6e..baf5b078a 100644
--- a/terraform/python/ecs/resources/main-service.json.tpl
+++ b/terraform/python/ecs/resources/main-service.json.tpl
@@ -79,6 +79,16 @@
         "readOnly": false
       }
     ],
+    "dependsOn": [
+      {
+        "containerName": "init",
+        "condition": "SUCCESS"
+      },
+      {
+        "containerName": "ecs-cwagent",
+        "condition": "START"
+      }
+    ],
     "logConfiguration": {
       "logDriver": "awslogs",
       "options": {