Fixed typo

Added support for default sourceUnit defined on rule level

Author: robsunday

instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/yaml/JmxRule.java

@@ -158,7 +158,7 @@ public MetricDef buildMetricDef() throws Exception {
                 getUnit(),
                 getMetricType());
       } else {
-        metricInfo = m.buildMetricInfo(prefix, niceAttributeName, getUnit(), getMetricType());
+        metricInfo = m.buildMetricInfo(prefix, niceAttributeName, getSourceUnit(), getUnit(), getMetricType());
       }
 
       List<MetricAttribute> ownAttributes = getAttributeList();

instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/yaml/Metric.java

@@ -49,6 +49,7 @@ public void setDesc(String desc) {
   MetricInfo buildMetricInfo(
       @Nullable String prefix,
       String attributeName,
+      String defaultSourceUnit,
       String defaultUnit,
       MetricInfo.Type defaultType) {
     String metricName;
@@ -64,6 +65,9 @@ MetricInfo buildMetricInfo(
     }
 
     String sourceUnit = getSourceUnit();
+    if (sourceUnit == null) {
+      sourceUnit = defaultSourceUnit;
+    }
 
     String unit = getUnit();
     if (unit == null) {

instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/yaml/MetricStructure.java

@@ -19,6 +19,7 @@
  * <li>the metric type
  * <li>the metric attributes
  * <li>the unit
+ * <li>the sourceUnit
  *
  *     <p>Known subclasses are {@link JmxRule} and {@link Metric}.
  */
@@ -45,7 +46,7 @@ abstract class MetricStructure {
   private Map<String, Object> metricAttribute;
   private StateMapping stateMapping = StateMapping.empty();
   private static final String STATE_MAPPING_DEFAULT = "*";
-  private String sourcetUnit;
+  private String sourceUnit;
   private String unit;
 
   private MetricInfo.Type metricType;
@@ -60,11 +61,11 @@ void setType(String t) {
   }
 
   public String getSourceUnit() {
-    return sourcetUnit;
+    return sourceUnit;
   }
 
   public void setSourceUnit(String unit) {
-    this.sourcetUnit = validateUnit(unit.trim());
+    this.sourceUnit = validateUnit(unit.trim());
   }
 
   public String getUnit() {

instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/engine/RuleParserTest.java

@@ -163,12 +163,14 @@ void testConf3() {
           + "      LABEL_KEY2: beanattr(ATTRIBUTE)\n"
           + "    prefix: PREFIX.\n"
           + "    type: upDownCounter\n"
+          + "    sourceUnit: DEFAULT_SOURCE_UNIT\n"
           + "    unit: DEFAULT_UNIT\n"
           + "    mapping:\n"
           + "      A.b:\n"
           + "        metric: METRIC_NAME1\n"
           + "        type: counter\n"
           + "        desc: DESCRIPTION1\n"
+          + "        sourceUnit: SOURCE_UNIT1\n"
           + "        unit: UNIT1\n"
           + "        metricAttribute:\n"
           + "          LABEL_KEY3: const(CONSTANT)\n"
@@ -186,6 +188,7 @@ void testConf4() throws Exception {
     assertThat(defs).hasSize(1);
 
     JmxRule jmxDef = defs.get(0);
+    assertThat(jmxDef.getSourceUnit()).isEqualTo("DEFAULT_SOURCE_UNIT");
     assertThat(jmxDef.getUnit()).isEqualTo("DEFAULT_UNIT");
     assertThat(jmxDef.getMetricType()).isEqualTo(MetricInfo.Type.UPDOWNCOUNTER);
 
@@ -205,6 +208,7 @@ void testConf4() throws Exception {
               MetricInfo metricInfo = m.getInfo();
               assertThat(metricInfo.getMetricName()).isEqualTo("PREFIX.METRIC_NAME1");
               assertThat(metricInfo.getDescription()).isEqualTo("DESCRIPTION1");
+              assertThat(metricInfo.getSourceUnit()).isEqualTo("SOURCE_UNIT1");
               assertThat(metricInfo.getUnit()).isEqualTo("UNIT1");
               assertThat(metricInfo.getType()).isEqualTo(MetricInfo.Type.COUNTER);
             })
@@ -219,6 +223,7 @@ void testConf4() throws Exception {
               MetricInfo metricInfo = m.getInfo();
               assertThat(metricInfo.getMetricName()).isEqualTo("PREFIX.METRIC_NAME2");
               assertThat(metricInfo.getDescription()).isEqualTo("DESCRIPTION2");
+              assertThat(metricInfo.getSourceUnit()).isEqualTo(jmxDef.getSourceUnit());
               assertThat(metricInfo.getUnit()).isEqualTo("UNIT2");
             })
         .anySatisfy(
@@ -236,6 +241,9 @@ void testConf4() throws Exception {
               assertThat(metricInfo.getUnit())
                   .describedAs("default unit should match jmx rule definition")
                   .isEqualTo(jmxDef.getUnit());
+              assertThat(metricInfo.getSourceUnit())
+                  .describedAs("default sourceUnit should match jmx rule definition")
+                  .isEqualTo(jmxDef.getSourceUnit());
             });
   }