jmx allow boolean and enum for metric attributes (#12231)

open-telemetry · Sep 13, 2024 · 32fd44e · 32fd44e
1 parent 19ae57b
commit 32fd44e
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/...ary/src/main/java/io/opentelemetry/instrumentation/jmx/engine/BeanAttributeExtractor.java b/...ary/src/main/java/io/opentelemetry/instrumentation/jmx/engine/BeanAttributeExtractor.java
@@ -272,6 +272,12 @@ private String extractStringAttribute(MBeanServer server, ObjectName objectName)
     if (value instanceof String) {
       return (String) value;
     }
+    if (value instanceof Boolean) {
+      return value.toString();
+    }
+    if (value instanceof Enum) {
+      return ((Enum<?>) value).name();
+    }
     return null;
   }
 }
diff --git a/...y/src/main/java/io/opentelemetry/instrumentation/jmx/engine/MetricAttributeExtractor.java b/...y/src/main/java/io/opentelemetry/instrumentation/jmx/engine/MetricAttributeExtractor.java
@@ -28,9 +28,7 @@ public interface MetricAttributeExtractor {
   String extractValue(@Nullable MBeanServer server, @Nullable ObjectName objectName);
 
   static MetricAttributeExtractor fromConstant(String constantValue) {
-    return (a, b) -> {
-      return constantValue;
-    };
+    return (a, b) -> constantValue;
   }
 
   static MetricAttributeExtractor fromObjectNameParameter(String parameterKey) {

diff --git a/...ary/src/test/java/io/opentelemetry/instrumentation/jmx/engine/AttributeExtractorTest.java b/...ary/src/test/java/io/opentelemetry/instrumentation/jmx/engine/AttributeExtractorTest.java
@@ -34,6 +34,10 @@ public interface Test1MBean {
     double getDoubleAttribute();
 
     String getStringAttribute();
+
+    boolean getBooleanAttribute();
+
+    Enum<?> getEnumAttribute();
   }
 
   private static class Test1 implements Test1MBean {
@@ -71,6 +75,20 @@ public double getDoubleAttribute() {
     public String getStringAttribute() {
       return "";
     }
+
+    @Override
+    public boolean getBooleanAttribute() {
+      return true;
+    }
+
+    @Override
+    public Enum<?> getEnumAttribute() {
+      return DummyEnum.ENUM_VALUE;
+    }
+
+    private enum DummyEnum {
+      ENUM_VALUE
+    }
   }
 
   private static final String DOMAIN = "otel.jmx.test";
@@ -202,4 +220,20 @@ void testStringAttribute() throws Exception {
     AttributeInfo info = extractor.getAttributeInfo(theServer, objectName);
     assertThat(info == null).isTrue();
   }
+
+  @Test
+  void testBooleanAttribute() throws Exception {
+    BeanAttributeExtractor extractor = BeanAttributeExtractor.fromName("BooleanAttribute");
+    AttributeInfo info = extractor.getAttributeInfo(theServer, objectName);
+    assertThat(info).isNull();
+    assertThat(extractor.extractValue(theServer, objectName)).isEqualTo("true");
+  }
+
+  @Test
+  void testEnumAttribute() throws Exception {
+    BeanAttributeExtractor extractor = BeanAttributeExtractor.fromName("EnumAttribute");
+    AttributeInfo info = extractor.getAttributeInfo(theServer, objectName);
+    assertThat(info).isNull();
+    assertThat(extractor.extractValue(theServer, objectName)).isEqualTo("ENUM_VALUE");
+  }
 }