support ecs context parameter

Author: wyTrivail

terraform/ecs/main.tf

@@ -175,7 +175,7 @@ resource "aws_ecs_service" "aoc_without_sample_app" {
 
   provisioner "local-exec" {
     working_dir = "../../"
-    command = "${module.common.validator_path} --args='-c ${var.validation_config} -t ${module.common.testing_id} --region ${var.region} --metric-namespace ${module.common.otel_service_namespace}/${module.common.otel_service_name}'"
+    command = "${module.common.validator_path} --args='-c ${var.validation_config} -t ${module.common.testing_id} --region ${var.region} --metric-namespace ${module.common.otel_service_namespace}/${module.common.otel_service_name} --ecs-context ecsClusterName=${module.ecs_cluster.cluster_name} --ecs-context ecsTaskArn=${aws_ecs_task_definition.aoc.arn} --ecs-context ecsTaskDefFamily=${aws_ecs_task_definition.aoc.family} --ecs-context ecsTaskDefVersion=${aws_ecs_task_definition.aoc.revision}'"
   }
 }
 

terraform/testing-suites/xrayreceiver-ecs.tfvars

@@ -7,8 +7,8 @@ validation_config="xrayreceiver-trace-validation.yml"
 data_emitter_image="josephwy/integ-test-emitter:xrayreceiver"
 
 # todo this is config needs to be removed once we have statsd built in the aoc image
-aoc_image_repo="johnwu20/aocimage"
+aoc_image_repo="josephwy/awscollector"
 
 # todo this version needs to be removed, instead version should be received from workflow
-aoc_version="v0.1.0"
+aoc_version="xray"
 

validator/src/main/java/com/amazon/aoc/App.java

@@ -2,12 +2,15 @@
 
 import com.amazon.aoc.helpers.ConfigLoadHelper;
 import com.amazon.aoc.models.Context;
+import com.amazon.aoc.models.ECSContext;
 import com.amazon.aoc.models.ValidationConfig;
 import com.amazon.aoc.validators.ValidatorFactory;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.log4j.Log4j2;
 import picocli.CommandLine;
 
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Callable;
 
 @CommandLine.Command(name = "e2etest", mixinStandardHelpOptions = true, version = "1.0")
@@ -35,6 +38,12 @@ public class App implements Callable<Integer> {
       defaultValue = "us-west-2")
   private String region;
 
+  @CommandLine.Option(
+    names = {"--ecs-context"},
+    description = "eg, --ecs-context ecsCluster=xxx --ecs-context ecsTaskArn=xxxx"
+  )
+  private Map<String, String> ecsContexts;
+
   public static void main(String[] args) throws Exception {
     int exitCode = new CommandLine(new App()).execute(args);
     System.exit(exitCode);
@@ -49,6 +58,8 @@ public Integer call() throws Exception {
     // build context
     Context context = new Context(this.testingId, this.metricNamespace, this.region);
     context.setEndpoint(this.endpoint);
+    context.setEcsContext(buildECSContext(ecsContexts));
+
     log.info(context);
 
     // run validation
@@ -58,4 +69,11 @@ public Integer call() throws Exception {
     }
     return null;
   }
+
+  private ECSContext buildECSContext(Map<String, String> ecsContextMap){
+    if(ecsContextMap == null) {
+      return null;
+    }
+    return new ObjectMapper().convertValue(ecsContextMap, ECSContext.class);
+  }
 }

validator/src/main/java/com/amazon/aoc/models/Context.java

@@ -27,4 +27,6 @@ public class Context {
   @NonNull private String region;
 
   private String endpoint;
+
+  private ECSContext ecsContext;
 }

validator/src/main/java/com/amazon/aoc/models/ECSContext.java

@@ -0,0 +1,12 @@
+package com.amazon.aoc.models;
+
+import lombok.Data;
+
+@Data
+public class ECSContext {
+  // ecs related context
+  private String ecsClusterName;
+  private String ecsTaskArn;
+  private String ecsTaskDefFamily;
+  private String ecsTaskDefVersion;
+}

validator/src/main/resources/expected-data-template/ecsContainerExpectedMetric.mustache

@@ -7,19 +7,19 @@
       value: Undefined
     -
       name: ecs.cluster
-      value: "{{ecsClusterName}}"
+      value: "{{ecsContext.ecsClusterName}}"
     -
       name: ecs.service
       value: "undefined"
     -
       name: ecs.task-arn
-      value: "{{ecsTaskArn}}"
+      value: "{{ecsContext.ecsTaskArn}}"
     -
       name: ecs.task-definition-family
-      value: "{{ecsTaskDefFamily}}"
+      value: "{{ecsContext.ecsTaskDefFamily}}"
     -
       name: ecs.task-definition-version
-      value: "{{ecsTaskDefVersion}}"
+      value: "{{ecsContext.ecsTaskDefVersion}}"
     -
       name: ecs.task-id
-      value: "{{ecsTaskId}}"
+      value: ""