From 54f09d41c9968444aa0bdecd164ab4b4f373080d Mon Sep 17 00:00:00 2001
From: akats7 <akats71@gmail.com>
Date: Fri, 28 Jul 2023 16:28:32 -0400
Subject: [PATCH] Resolved conflict

---
 .../contrib/jmxmetrics/MBeanHelper.groovy     | 56 +++++++++----------
 .../contrib/jmxmetrics/MBeanHelperTest.java   |  1 -
 2 files changed, 27 insertions(+), 30 deletions(-)

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
index 8c054fbbf..03e4b5bc9 100644
--- a/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/MBeanHelper.groovy
+++ b/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/MBeanHelper.groovy
@@ -98,38 +98,36 @@ class MBeanHelper {
         return mbeans
     }
 
-    @PackageScope List<Object> getAttribute(String attribute) {
-        if (mbeans == null || mbeans.size() == 0) {
-            return []
-        }
-
-        def ofInterest = isSingle ? [mbeans[0]]: mbeans
+  @PackageScope List<Object> getAttribute(String attribute) {
+    if (mbeans == null || mbeans.size() == 0) {
+      return []
+    }
 
-        return ofInterest.collect {
-            try {
-                attributeTransformation.containsKey(attribute) ? attributeTransformation[attribute](it) : it.getProperty(attribute)
-            } catch (AttributeNotFoundException e) {
-                logger.warning("Expected attribute ${attribute} not found in mbean ${it.name()}")
-                null
-            }
-        }
+    def ofInterest = isSingle ? [mbeans[0]]: mbeans
+    return ofInterest.collect {
+      getBeanAttribute(it, attribute)
     }
+  }
 
-    @PackageScope List<Tuple3<GroovyMBean, String, Object>> getAttributes(Set<String> attributes) {
-        if (mbeans == null || mbeans.size() == 0) {
-            return []
-        }
+  @PackageScope List<Tuple3<GroovyMBean, String, Object>> getAttributes(Set<String> attributes) {
+    if (mbeans == null || mbeans.size() == 0) {
+      return []
+    }
 
-        def ofInterest = isSingle ? [mbeans[0]]: mbeans
-        return [ofInterest, attributes].combinations().collect { pair ->
-            def (bean, attribute) = pair
-            try {
-                def extractedAttribute = attributeTransformation.containsKey(attribute) ? attributeTransformation[attribute](bean) : bean.getProperty(attribute)
-                new Tuple3(bean, attribute, extractedAttribute)
-            } catch (AttributeNotFoundException e) {
-                logger.info("Expected attribute ${attribute} not found in mbean ${bean.name()}")
-                new Tuple3(bean, attribute, null)
-            }
-        }
+    def ofInterest = isSingle ? [mbeans[0]]: mbeans
+    return [ofInterest, attributes].combinations().collect { pair ->
+      def (bean, attribute) = pair
+      new Tuple3(bean, attribute, getBeanAttribute(bean, attribute))
+    }
+  }
+
+  Object getBeanAttribute(GroovyMBean bean, String attribute) {
+    try {
+      def transformationClosure = attributeTransformation.get(attribute);
+      transformationClosure != null ? transformationClosure(bean) : bean.getProperty(attribute)
+    } catch (AttributeNotFoundException e) {
+      logger.warning("Expected attribute ${attribute} not found in mbean ${bean.name()}")
+      null
     }
+  }
 }
diff --git a/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/MBeanHelperTest.java b/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/MBeanHelperTest.java
index 77af6701c..8f696ee5b 100644
--- a/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/MBeanHelperTest.java
+++ b/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/MBeanHelperTest.java
@@ -36,7 +36,6 @@
 @Timeout(value = 10, unit = SECONDS)
 class MBeanHelperTest {
 
-  // private static final Logger logger = Logger.getLogger(MBeanHelperTest.class.getName());
   private static final MBeanServer mbeanServer = getPlatformMBeanServer();
 
   private static final Set<ObjectInstance> registeredBeans = new HashSet<>();