Added unit conversion support for YAML

Author: robsunday

instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/engine/MetricDef.java

@@ -42,12 +42,14 @@
 //      new MetricInfo(
 //          "my.own.jvm.memory.pool.used",
 //          "Pool memory currently used",
+//          null,
 //          "By",
 //          MetricInfo.Type.UPDOWNCOUNTER);
 //  MetricInfo poolLimitInfo =
 //      new MetricInfo(
 //          "my.own.jvm.memory.pool.limit",
 //          "Maximum obtainable memory pool size",
+//          null,
 //          "By",
 //          MetricInfo.Type.UPDOWNCOUNTER);
 //

instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/engine/MetricInfo.java

@@ -27,6 +27,7 @@ public enum Type {
   // How to report the metric using OpenTelemetry API
   private final String metricName; // used as Instrument name
   @Nullable private final String description;
+  @Nullable private final String sourceUnit;
   @Nullable private final String unit;
   private final Type type;
 
@@ -35,13 +36,19 @@ public enum Type {
    *
    * @param metricName a String that will be used as a metric name, it should be unique
    * @param description a human readable description of the metric
+   * @param sourceUnit a human readable unit of measurement that is received from metric source
    * @param unit a human readable unit of measurement
    * @param type the instrument typ to be used for the metric
    */
   public MetricInfo(
-      String metricName, @Nullable String description, String unit, @Nullable Type type) {
+      String metricName,
+      @Nullable String description,
+      @Nullable String sourceUnit,
+      @Nullable String unit,
+      @Nullable Type type) {
     this.metricName = metricName;
     this.description = description;
+    this.sourceUnit = sourceUnit;
     this.unit = unit;
     this.type = type == null ? Type.GAUGE : type;
   }
@@ -55,6 +62,11 @@ public String getDescription() {
     return description;
   }
 
+  @Nullable
+  public String getSourceUnit() {
+    return sourceUnit;
+  }
+
   @Nullable
   public String getUnit() {
     return unit;

instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/engine/MetricRegistrar.java

@@ -16,10 +16,13 @@
 import io.opentelemetry.api.metrics.Meter;
 import io.opentelemetry.api.metrics.ObservableDoubleMeasurement;
 import io.opentelemetry.api.metrics.ObservableLongMeasurement;
+import io.opentelemetry.instrumentation.jmx.engine.unit.UnitConverter;
+import io.opentelemetry.instrumentation.jmx.engine.unit.UnitConverterFactory;
 import java.util.Collection;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.logging.Logger;
+import javax.annotation.Nullable;
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 
@@ -61,6 +64,7 @@ void enrollExtractor(
       return;
     }
 
+    boolean recordDoubleValue = attributeInfo.usesDoubleValues();
     MetricInfo metricInfo = extractor.getInfo();
     String metricName = metricInfo.getMetricName();
     MetricInfo.Type instrumentType = metricInfo.getType();
@@ -69,6 +73,12 @@ void enrollExtractor(
             ? metricInfo.getDescription()
             : attributeInfo.getDescription();
     String unit = metricInfo.getUnit();
+    String sourceUnit = metricInfo.getSourceUnit();
+
+    UnitConverter unitConverter = UnitConverterFactory.getConverter(sourceUnit, unit);
+    if (unitConverter != null) {
+      recordDoubleValue = unitConverter.isConvertingToDouble();
+    }
 
     switch (instrumentType) {
       // CHECKSTYLE:OFF
@@ -79,10 +89,10 @@ void enrollExtractor(
           Optional.ofNullable(description).ifPresent(builder::setDescription);
           Optional.ofNullable(unit).ifPresent(builder::setUnit);
 
-          if (attributeInfo.usesDoubleValues()) {
-            builder.ofDoubles().buildWithCallback(doubleTypeCallback(extractor));
+          if (recordDoubleValue) {
+            builder.ofDoubles().buildWithCallback(doubleTypeCallback(extractor, unitConverter));
           } else {
-            builder.buildWithCallback(longTypeCallback(extractor));
+            builder.buildWithCallback(longTypeCallback(extractor, unitConverter));
           }
           logger.log(INFO, "Created Counter for {0}", metricName);
         }
@@ -96,10 +106,10 @@ void enrollExtractor(
           Optional.ofNullable(description).ifPresent(builder::setDescription);
           Optional.ofNullable(unit).ifPresent(builder::setUnit);
 
-          if (attributeInfo.usesDoubleValues()) {
-            builder.ofDoubles().buildWithCallback(doubleTypeCallback(extractor));
+          if (recordDoubleValue) {
+            builder.ofDoubles().buildWithCallback(doubleTypeCallback(extractor, unitConverter));
           } else {
-            builder.buildWithCallback(longTypeCallback(extractor));
+            builder.buildWithCallback(longTypeCallback(extractor, unitConverter));
           }
           logger.log(INFO, "Created UpDownCounter for {0}", metricName);
         }
@@ -113,10 +123,10 @@ void enrollExtractor(
           Optional.ofNullable(description).ifPresent(builder::setDescription);
           Optional.ofNullable(unit).ifPresent(builder::setUnit);
 
-          if (attributeInfo.usesDoubleValues()) {
-            builder.buildWithCallback(doubleTypeCallback(extractor));
+          if (recordDoubleValue) {
+            builder.buildWithCallback(doubleTypeCallback(extractor, unitConverter));
           } else {
-            builder.ofLongs().buildWithCallback(longTypeCallback(extractor));
+            builder.ofLongs().buildWithCallback(longTypeCallback(extractor, unitConverter));
           }
           logger.log(INFO, "Created Gauge for {0}", metricName);
         }
@@ -133,8 +143,10 @@ void enrollExtractor(
   /*
    * A method generating metric collection callback for asynchronous Measurement
    * of Double type.
+   * If unit converter is provided then conversion is applied before metric is recorded.
    */
-  static Consumer<ObservableDoubleMeasurement> doubleTypeCallback(MetricExtractor extractor) {
+  static Consumer<ObservableDoubleMeasurement> doubleTypeCallback(
+      MetricExtractor extractor, @Nullable UnitConverter unitConverter) {
     return measurement -> {
       DetectionStatus status = extractor.getStatus();
       if (status != null) {
@@ -145,6 +157,10 @@ static Consumer<ObservableDoubleMeasurement> doubleTypeCallback(MetricExtractor
           if (metricValue != null) {
             // get the metric attributes
             Attributes attr = createMetricAttributes(connection, objectName, extractor);
+
+            if (unitConverter != null) {
+              metricValue = unitConverter.convert(metricValue);
+            }
             measurement.record(metricValue.doubleValue(), attr);
           }
         }
@@ -155,8 +171,10 @@ static Consumer<ObservableDoubleMeasurement> doubleTypeCallback(MetricExtractor
   /*
    * A method generating metric collection callback for asynchronous Measurement
    * of Long type.
+   * If unit converter is provided then conversion is applied before metric is recorded.
    */
-  static Consumer<ObservableLongMeasurement> longTypeCallback(MetricExtractor extractor) {
+  static Consumer<ObservableLongMeasurement> longTypeCallback(
+      MetricExtractor extractor, @Nullable UnitConverter unitConverter) {
     return measurement -> {
       DetectionStatus status = extractor.getStatus();
       if (status != null) {
@@ -167,6 +185,10 @@ static Consumer<ObservableLongMeasurement> longTypeCallback(MetricExtractor extr
           if (metricValue != null) {
             // get the metric attributes
             Attributes attr = createMetricAttributes(connection, objectName, extractor);
+
+            if (unitConverter != null) {
+              metricValue = unitConverter.convert(metricValue);
+            }
             measurement.record(metricValue.longValue(), attr);
           }
         }

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

@@ -152,6 +152,7 @@ public MetricDef buildMetricDef() throws Exception {
             new MetricInfo(
                 prefix == null ? niceAttributeName : (prefix + niceAttributeName),
                 null,
+                getSourceUnit(),
                 getUnit(),
                 getMetricType());
       } else {
@@ -226,6 +227,7 @@ protected Number extractNumericalAttribute(
           new MetricInfo(
               metricInfo.getMetricName(),
               metricInfo.getDescription(),
+              metricInfo.getSourceUnit(),
               metricInfo.getUnit(),
               MetricInfo.Type.UPDOWNCOUNTER);
 

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

@@ -61,11 +61,13 @@ MetricInfo buildMetricInfo(
       metricType = defaultType;
     }
 
+    String sourceUnit = getSourceUnit();
+
     String unit = getUnit();
     if (unit == null) {
       unit = defaultUnit;
     }
 
-    return new MetricInfo(metricName, desc, unit, metricType);
+    return new MetricInfo(metricName, desc, sourceUnit, unit, metricType);
   }
 }

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

@@ -45,6 +45,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 unit;
 
   private MetricInfo.Type metricType;
@@ -58,6 +59,14 @@ void setType(String t) {
     this.metricType = MetricInfo.Type.valueOf(t);
   }
 
+  public String getSourceUnit() {
+    return sourcetUnit;
+  }
+
+  public void setSourceUnit(String unit) {
+    this.sourcetUnit = validateUnit(unit.trim());
+  }
+
   public String getUnit() {
     return unit;
   }

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

@@ -142,6 +142,10 @@ private static void parseMetricStructure(
     if (unit != null) {
       out.setUnit(unit);
     }
+    String sourceUnit = (String) metricStructureYaml.remove("sourceUnit");
+    if (sourceUnit != null) {
+      out.setSourceUnit(sourceUnit);
+    }
   }
 
   private static void failOnExtraKeys(Map<String, Object> yaml) {

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

@@ -63,6 +63,7 @@ static void setup() {
           + "      ATTRIBUTE2:\n"
           + "        metric: METRIC_NAME2\n"
           + "        desc: DESCRIPTION2\n"
+          + "        sourceUnit: SOURCE_UNIT2\n"
           + "        unit: UNIT2\n"
           + "      ATTRIBUTE3:\n"
           + "      ATTRIBUTE4:\n"
@@ -95,13 +96,15 @@ void testConf2() {
     assertThat(m1).isNotNull();
     assertThat(m1.getMetric()).isEqualTo("METRIC_NAME1");
     assertThat(m1.getMetricType()).isEqualTo(MetricInfo.Type.GAUGE);
+    assertThat(m1.getSourceUnit()).isNull();
     assertThat(m1.getUnit()).isEqualTo("UNIT1");
     assertThat(m1.getMetricAttribute()).containsExactly(entry("LABEL_KEY3", "const(CONSTANT)"));
 
     Metric m2 = attr.get("ATTRIBUTE2");
     assertThat(m2).isNotNull();
     assertThat(m2.getMetric()).isEqualTo("METRIC_NAME2");
     assertThat(m2.getDesc()).isEqualTo("DESCRIPTION2");
+    assertThat(m2.getSourceUnit()).isEqualTo("SOURCE_UNIT2");
     assertThat(m2.getUnit()).isEqualTo("UNIT2");
 
     JmxRule def2 = defs.get(1);