updating Metric validator and CWS.java

Author: Miqueasher

validator/src/main/java/com/amazon/aoc/services/CloudWatchService.java

@@ -36,6 +36,9 @@ public class CloudWatchService {
   public static final String SERVICE_DIMENSION = "Service";
   public static final String REMOTE_SERVICE_DIMENSION = "RemoteService";
   public static final String REMOTE_TARGET_DIMENSION = "RemoteTarget";
+  public static final String CUSTOM_SERVICE_DIMENSION = "service.name";
+  public static final String CUSTOM_ENVIRONMENT_DIMENSION = "deployment.environment.name";
+
 
   private static final int MAX_QUERY_PERIOD = 60;
   private static final String REQUESTER = "integrationTest";

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

@@ -133,6 +133,16 @@ public void validate() throws Exception {
               remoteTargetNames,
               expectedMetricList,
               actualMetricList);
+          addMetrics(
+              CloudWatchService.CUSTOM_SERVICE_DIMENSION,
+              serviceNames,
+              expectedMetricList,
+              actualMetricList);
+          addMetrics(
+              CloudWatchService.DEPLOYMENT_ENVIRONMENT_DIMENSION,
+              Lists.newArrayList("ec2:default"),
+              expectedMetricList,
+              actualMetricList);
 
           // remove the skip dimensions
           log.info("dimensions to be skipped in validation: {}", skippedDimensionNameList);