Update dimension name from "OTLib" to "OTelLib"

Author: mxiamxia

integ-test/src/main/java/com/amazon/aocagent/validators/MetricValidator.java

@@ -42,7 +42,7 @@
 @Log4j2
 public class MetricValidator implements IValidator {
   private static int MAX_RETRY_COUNT = 60;
-  private static final String DEFAULT_DIMENSION_NAME = "OTLib";
+  private static final String DEFAULT_DIMENSION_NAME = "OTelLib";
   private static final String DEFAULT_DIMENSION_VALUE = "cloudwatch-otel";
 
   private MustacheHelper mustacheHelper = new MustacheHelper();

terraform/README.md

@@ -278,7 +278,7 @@ an example:
   namespace: {{metricNamespace}}
   dimensions:
     -
-      name: OTLib
+      name: OTelLib
       value: cloudwatch-otel
     -
       name: apiName
@@ -291,7 +291,7 @@ an example:
   namespace: {{metricNamespace}}
   dimensions:
     -
-      name: OTLib
+      name: OTelLib
       value: cloudwatch-otel
     -
       name: apiName
@@ -304,7 +304,7 @@ an example:
   namespace: {{metricNamespace}}
   dimensions:
     -
-      name: OTLib
+      name: OTelLib
       value: cloudwatch-otel
     -
       name: apiName
@@ -317,7 +317,7 @@ an example:
   namespace: {{metricNamespace}}
   dimensions:
     -
-      name: OTLib
+      name: OTelLib
       value: cloudwatch-otel
     -
       name: apiName

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

@@ -44,7 +44,7 @@
 @Log4j2
 public class MetricValidator implements IValidator {
   private static int MAX_RETRY_COUNT = 60;
-  private static final String DEFAULT_DIMENSION_NAME = "OTLib";
+  private static final String DEFAULT_DIMENSION_NAME = "OTelLib";
 
   private MustacheHelper mustacheHelper = new MustacheHelper();
   private ICaller caller;
@@ -156,10 +156,10 @@ private List<Metric> listMetricFromCloudWatch(
   private List<Metric> rollupMetric(List<Metric> metricList) {
     List<Metric> rollupMetricList = new ArrayList<>();
     for (Metric metric : metricList) {
-      // get otlib dimension out
-      // assuming the first dimension is otlib, if not the validation fails
-      Dimension otlibDimension = metric.getDimensions().remove(0);
-      assert otlibDimension.getName().equals(DEFAULT_DIMENSION_NAME);
+      // 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);
 
       // all dimension rollup
       Metric allDimensionsMetric = new Metric();
@@ -169,7 +169,7 @@ private List<Metric> rollupMetric(List<Metric> metricList) {
       allDimensionsMetric
           .getDimensions()
           .add(new Dimension()
-            .withName(otlibDimension.getName()).withValue(otlibDimension.getValue()));
+            .withName(otellibDimension.getName()).withValue(otellibDimension.getValue()));
       rollupMetricList.add(allDimensionsMetric);
 
       // zero dimension rollup
@@ -179,7 +179,7 @@ private List<Metric> rollupMetric(List<Metric> metricList) {
       zeroDimensionMetric.setDimensions(
           Arrays.asList(
               new Dimension()
-                .withName(otlibDimension.getName()).withValue(otlibDimension.getValue())));
+                .withName(otellibDimension.getName()).withValue(otellibDimension.getValue())));
       rollupMetricList.add(zeroDimensionMetric);
 
       // single dimension rollup
@@ -190,8 +190,8 @@ private List<Metric> rollupMetric(List<Metric> metricList) {
         singleDimensionMetric.setDimensions(
             Arrays.asList(
                 new Dimension()
-                    .withName(otlibDimension.getName())
-                    .withValue(otlibDimension.getValue())));
+                    .withName(otellibDimension.getName())
+                    .withValue(otellibDimension.getValue())));
         singleDimensionMetric.getDimensions().add(dimension);
         rollupMetricList.add(singleDimensionMetric);
       }

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

@@ -3,7 +3,7 @@
   namespace: {{metricNamespace}}
   dimensions:
     -
-      name: OTLib
+      name: OTelLib
       value: cloudwatch-otel
     -
       name: apiName
@@ -16,7 +16,7 @@
   namespace: {{metricNamespace}}
   dimensions:
     -
-      name: OTLib
+      name: OTelLib
       value: cloudwatch-otel
     -
       name: apiName
@@ -29,7 +29,7 @@
   namespace: {{metricNamespace}}
   dimensions:
     -
-      name: OTLib
+      name: OTelLib
       value: cloudwatch-otel
     -
       name: apiName
@@ -42,7 +42,7 @@
   namespace: {{metricNamespace}}
   dimensions:
     -
-      name: OTLib
+      name: OTelLib
       value: cloudwatch-otel
     -
       name: apiName

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

@@ -3,7 +3,7 @@
   namespace: default
   dimensions:
     -
-      name: OTLib
+      name: OTelLib
       value: Undefined
     -
       name: ecs.cluster

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

@@ -3,7 +3,7 @@
   namespace: {{metricNamespace}}
   dimensions:
     -
-      name: OTLib
+      name: OTelLib
       value: Undefined
     -
       name: key
@@ -17,7 +17,7 @@
   namespace: {{metricNamespace}}
   dimensions:
     -
-       name: OTLib
+       name: OTelLib
        value: Undefined
     -
       name: keyg