Feedback and put the code at the right place

Author: jeanbisutti

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/PerformanceCounterInitializer.java

@@ -31,6 +31,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
@@ -41,6 +43,8 @@ public class PerformanceCounterInitializer {
   private static final String METRIC_NAME_REGEXP = "[a-zA-Z0-9_.-/]+";
   private static final String INVALID_CHARACTER_REGEXP = "[^a-zA-Z0-9_.-/]";
 
+  private static final Set<String> invalidJmxMetrics = ConcurrentHashMap.newKeySet();
+
   public static void initialize(Configuration configuration) {
 
     PerformanceCounterContainer.INSTANCE.setCollectionFrequencyInSec(
@@ -209,6 +213,13 @@ private static void calculateAndRecordValueForAttribute(
             value += Double.parseDouble(String.valueOf(obj));
           }
         } catch (RuntimeException e) {
+          if (invalidJmxMetrics.add(jmxAttributeData.metricName)) {
+            try (MDC.MDCCloseable ignored = CUSTOM_JMX_METRIC_ERROR.makeActive()) {
+              logger.warn(
+                  "{} JMX metric is invalid because only numeric and boolean JMX metric values are supported.",
+                  jmxAttributeData.metricName);
+            }
+          }
           ok = false;
           break;
         }

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/AbstractJmxPerformanceCounter.java

@@ -7,9 +7,7 @@
 
 import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
@@ -26,8 +24,6 @@ public abstract class AbstractJmxPerformanceCounter implements PerformanceCounte
   private final Collection<JmxAttributeData> attributes;
   private boolean alreadyLogged = false;
 
-  private final Set<String> invalidJmxMetrics = new HashSet<>();
-
   /**
    * The main method. The method will fetch the data and send it. The method will not do anything if
    * there was a major problem accessing the needed counter.
@@ -42,7 +38,6 @@ public synchronized void report(TelemetryClient telemetryClient) {
       for (Map.Entry<String, Collection<Object>> displayAndValues : result.entrySet()) {
         boolean ok = true;
         double value = 0.0;
-        String metricName = displayAndValues.getKey();
         for (Object obj : displayAndValues.getValue()) {
           try {
             if (obj instanceof Boolean) {
@@ -51,22 +46,14 @@ public synchronized void report(TelemetryClient telemetryClient) {
               value += Double.parseDouble(String.valueOf(obj));
             }
           } catch (RuntimeException e) {
-            if (!invalidJmxMetrics.contains(metricName)) {
-              invalidJmxMetrics.add(metricName);
-              try (MDC.MDCCloseable ignored = CUSTOM_JMX_METRIC_ERROR.makeActive()) {
-                logger.warn(
-                    "{} JMX metric is invalid because only numeric and boolean JMX metric values are supported.",
-                    metricName);
-              }
-            }
             ok = false;
             break;
           }
         }
 
         if (ok) {
           try {
-            send(telemetryClient, metricName, value);
+            send(telemetryClient, displayAndValues.getKey(), value);
           } catch (RuntimeException e) {
             try (MDC.MDCCloseable ignored = CUSTOM_JMX_METRIC_ERROR.makeActive()) {
               logger.error("Error while sending JMX data: '{}'", e.toString());