Added error handling for labels

open-telemetry · Nov 17, 2023 · cdc8aa8 · cdc8aa8
1 parent c9e0486
commit cdc8aa8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/InstrumentHelper.groovy b/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/InstrumentHelper.groovy
@@ -165,10 +165,18 @@ class InstrumentHelper {
     private static Map<String, String> getLabels(GroovyMBean mbean, Map<String, Closure> labelFuncs, Map<String, Closure> additionalLabels) {
         def labels = [:]
         labelFuncs.each { label, labelFunc ->
+          try{
             labels[label] = labelFunc(mbean) as String
+          }catch(AttributeNotFoundException e){
+            logger.warning("Attribute missing for label:${label}, label was not applied")
+          }
         }
         additionalLabels.each { label, labelFunc ->
+          try{
             labels[label] = labelFunc(mbean) as String
+          }catch(AttributeNotFoundException e){
+            logger.warning("Attribute missing for label:${label}, label was not applied")
+          }
         }
         return labels
     }

diff --git a/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/MBeanHelper.groovy b/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/MBeanHelper.groovy
@@ -125,11 +125,11 @@ class MBeanHelper {
       def transformationClosure = attributeTransformation.get(attribute);
       if (transformationClosure != null){
         try{
-          transformationClosure(bean)
+          return transformationClosure(bean)
         }
         catch(AttributeNotFoundException e){
           logger.warning("Transformed attribute not found in ${bean.name()}")
-          null
+          return null
         }
       }
         return getBeanAttribute(bean, attribute)