support dimension value check skipping

Author: wyTrivail

terraform/ecs/main.tf

@@ -72,7 +72,7 @@ output "rendered" {
 }
 
 resource "aws_ecs_task_definition" "aoc" {
-  family = "aoc-task-def-${module.common.testing_id}"
+  family = "taskdef-${module.common.testing_id}"
   container_definitions = data.template_file.task_def.rendered
   network_mode = "awsvpc"
   requires_compatibilities = ["EC2", "FARGATE"]
@@ -136,7 +136,7 @@ resource "aws_lb_listener" "aoc_lb_listener" {
 resource "aws_ecs_service" "aoc" {
   # don't do lb if the sample app is not callable
   count = var.sample_app_callable ? 1 : 0
-  name = "aoctaskdef-${module.common.testing_id}"
+  name = "aocservice-${module.common.testing_id}"
   cluster = module.ecs_cluster.cluster_id
   task_definition = aws_ecs_task_definition.aoc.arn
   desired_count = 1
@@ -162,7 +162,7 @@ resource "aws_ecs_service" "aoc" {
 # remove lb since there's no callable sample app, some test cases will drop in here, for example, ecsmetadata receiver test
 resource "aws_ecs_service" "aoc_without_sample_app" {
   count = !var.sample_app_callable ? 1 : 0
-  name = "aoc"
+  name = "aocservice-${module.common.testing_id}"
   cluster = module.ecs_cluster.cluster_id
   task_definition = aws_ecs_task_definition.aoc.arn
   desired_count = 1

validator/src/main/java/com/amazon/aoc/validators/MetricValidator.java

@@ -98,8 +98,15 @@ private void compareMetricLists(List<Metric> toBeCheckedMetricList, List<Metric>
               // sort and check dimensions
               List<Dimension> dimensionList1 = o1.getDimensions();
               List<Dimension> dimensionList2 = o2.getDimensions();
+
+              // remove the skipped dimension
+              dimensionList1.removeIf( dimension -> dimension.getValue().equals("SKIP"));
+              dimensionList2.removeIf( dimension -> dimension.getValue().equals("SKIP"));
+
+              // sort
               dimensionList1.sort(Comparator.comparing(Dimension::getName));
               dimensionList2.sort(Comparator.comparing(Dimension::getName));
+
               return dimensionList1.toString().compareTo(dimensionList2.toString());
             });
     for (Metric metric : baseMetricList) {
@@ -158,40 +165,54 @@ private List<Metric> rollupMetric(List<Metric> metricList) {
     for (Metric metric : metricList) {
       // get otellib dimension out
       // assuming the first dimension is otellib, if not the validation fails
-      Dimension otellibDimension = metric.getDimensions().remove(0);
-      assert otellibDimension.getName().equals(DEFAULT_DIMENSION_NAME);
+      Dimension otellibDimension = metric.getDimensions().get(0);
+      boolean otelLibDimensionExisted = otellibDimension.getName().equals(DEFAULT_DIMENSION_NAME);
+      if(otelLibDimensionExisted) {
+        metric.getDimensions().remove(0);
+      }
 
       // all dimension rollup
       Metric allDimensionsMetric = new Metric();
       allDimensionsMetric.setMetricName(metric.getMetricName());
       allDimensionsMetric.setNamespace(metric.getNamespace());
       allDimensionsMetric.setDimensions(metric.getDimensions());
-      allDimensionsMetric
-          .getDimensions()
-          .add(new Dimension()
-            .withName(otellibDimension.getName()).withValue(otellibDimension.getValue()));
+
+      if (otelLibDimensionExisted) {
+        allDimensionsMetric
+            .getDimensions()
+            .add(
+                new Dimension()
+                    .withName(otellibDimension.getName())
+                    .withValue(otellibDimension.getValue()));
+      }
       rollupMetricList.add(allDimensionsMetric);
 
       // zero dimension rollup
       Metric zeroDimensionMetric = new Metric();
       zeroDimensionMetric.setNamespace(metric.getNamespace());
       zeroDimensionMetric.setMetricName(metric.getMetricName());
-      zeroDimensionMetric.setDimensions(
-          Arrays.asList(
-              new Dimension()
-                .withName(otellibDimension.getName()).withValue(otellibDimension.getValue())));
+
+      if (otelLibDimensionExisted) {
+        zeroDimensionMetric.setDimensions(
+            Arrays.asList(
+                new Dimension()
+                    .withName(otellibDimension.getName())
+                    .withValue(otellibDimension.getValue())));
+      }
       rollupMetricList.add(zeroDimensionMetric);
 
       // single dimension rollup
       for (Dimension dimension : metric.getDimensions()) {
         Metric singleDimensionMetric = new Metric();
         singleDimensionMetric.setNamespace(metric.getNamespace());
         singleDimensionMetric.setMetricName(metric.getMetricName());
-        singleDimensionMetric.setDimensions(
-            Arrays.asList(
-                new Dimension()
-                    .withName(otellibDimension.getName())
-                    .withValue(otellibDimension.getValue())));
+        if (otelLibDimensionExisted) {
+          singleDimensionMetric.setDimensions(
+              Arrays.asList(
+                  new Dimension()
+                      .withName(otellibDimension.getName())
+                      .withValue(otellibDimension.getValue())));
+        }
         singleDimensionMetric.getDimensions().add(dimension);
         rollupMetricList.add(singleDimensionMetric);
       }

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

@@ -2,9 +2,6 @@
   metricName: ecs.task.memory.utilized_{{testingId}}
   namespace: default
   dimensions:
-    -
-      name: OTelLib
-      value: Undefined
     -
       name: ecs.cluster
       value: "{{ecsContext.ecsClusterName}}"
@@ -22,4 +19,4 @@
       value: "{{ecsContext.ecsTaskDefVersion}}"
     -
       name: ecs.task-id
-      value: ""
+      value: "SKIP"

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

@@ -2,9 +2,6 @@
   metricName: testCounter.metric_{{testingId}}
   namespace: {{metricNamespace}}
   dimensions:
-    -
-      name: OTelLib
-      value: Undefined
     -
       name: key
       value: val
@@ -16,9 +13,6 @@
   metricName: testGauge.metric_{{testingId}}
   namespace: {{metricNamespace}}
   dimensions:
-    -
-       name: OTelLib
-       value: Undefined
     -
       name: keyg
       value: valg