Merge pull request #1374 from microsoft/heya/clean-up-deprecated-perfcounter

Delete WindowsPerformanceCounterData & WindowsPerformanceCounterAsMetric

Author: trask

core/src/main/java/com/microsoft/applicationinsights/internal/perfcounter/ProcessBuiltInPerformanceCountersFactory.java

@@ -34,12 +34,10 @@
  *
  * Created by gupele on 3/3/2015.
  */
-final class ProcessBuiltInPerformanceCountersFactory implements PerformanceCountersFactory, WindowsPerformanceCountersFactory {
+final class ProcessBuiltInPerformanceCountersFactory implements PerformanceCountersFactory {
 
     private static final Logger logger = LoggerFactory.getLogger(ProcessBuiltInPerformanceCountersFactory.class);
 
-    private Iterable<WindowsPerformanceCounterData> windowsPCsData;
-
     /**
      * Creates the {@link com.microsoft.applicationinsights.internal.perfcounter.PerformanceCounter} that are
      * the 'built-in' performance counters of the process.
@@ -61,7 +59,8 @@ public Collection<PerformanceCounter> getPerformanceCounters() {
             throw td;
         } catch (Throwable t) {
             try {
-                logger.error("Error while creating performance counters: '{}'", t.toString());            } catch (ThreadDeath td) {
+                logger.error("Error while creating performance counters: '{}'", t.toString());
+            } catch (ThreadDeath td) {
                 throw td;
             } catch (Throwable t2) {
                 // chomp
@@ -104,24 +103,6 @@ private Collection<PerformanceCounter> getUnixPerformanceCounters() {
     private Collection<PerformanceCounter> getWindowsPerformanceCounters() {
         ArrayList<PerformanceCounter> performanceCounters = getMutualPerformanceCounters();
 
-        try {
-            if (windowsPCsData != null) {
-                WindowsPerformanceCounterAsMetric pcWindowsMetric = new WindowsPerformanceCounterAsMetric(windowsPCsData);
-                performanceCounters.add(pcWindowsMetric);
-                windowsPCsData = null;
-            }
-        } catch (ThreadDeath td) {
-            throw td;
-        } catch (Throwable e) {
-            try {
-                logger.error("Failed to create WindowsPerformanceCounterAsMetric: '{}'", e.toString());
-            } catch (ThreadDeath td) {
-                throw td;
-            } catch (Throwable t2) {
-                // chomp
-            }
-        }
-
         try {
             WindowsPerformanceCounterAsPC pcWindowsPCs = new WindowsPerformanceCounterAsPC();
             performanceCounters.add(pcWindowsPCs);
@@ -139,9 +120,4 @@ private Collection<PerformanceCounter> getWindowsPerformanceCounters() {
 
         return performanceCounters;
     }
-
-    @Override
-    public void setWindowsPCs(Iterable<WindowsPerformanceCounterData> windowsPCsData) {
-        this.windowsPCsData = windowsPCsData;
-    }
 }

core/src/main/java/com/microsoft/applicationinsights/internal/perfcounter/ProcessPerformanceCountersModule.java

@@ -44,10 +44,6 @@ public ProcessPerformanceCountersModule() throws Exception {
 
     public ProcessPerformanceCountersModule(PerformanceCountersFactory factory) throws Exception {
         super(factory);
-
-        if (!(factory instanceof WindowsPerformanceCountersFactory)) {
-            throw new Exception("Factory must implement windows capabilities.");
-        }
     }
 
     /**
@@ -75,34 +71,6 @@ public void addConfigurationData(PerformanceCountersXmlElement configuration) {
             return;
         }
 
-        ArrayList<WindowsPerformanceCounterData> configurationRequests = new ArrayList<WindowsPerformanceCounterData>();
-        for (WindowsPerformanceCounterXmlElement element : windowsPCs) {
-            try {
-                WindowsPerformanceCounterData data =
-                        new WindowsPerformanceCounterData().
-                                setDisplayName(element.getDisplayName()).
-                                setCategoryName(element.getCategoryName()).
-                                setCounterName(element.getCounterName()).
-                                setInstanceName(element.getInstanceName());
-
-                configurationRequests.add(data);
-            } catch (ThreadDeath td) {
-                throw td;
-            } catch (Throwable e) {
-                try {
-                    logger.error("Failed to initialize Windows performance counter '{}'.", e.toString());
-                } catch (ThreadDeath td) {
-                    throw td;
-                } catch (Throwable t2) {
-                    // chomp
-                }
-            }
-        }
-
-        if (configurationRequests.isEmpty()) {
-            logger.error("Failed to initialize Windows performance counters: All requested performance counters are not valid.");
-        } else {
-            ((WindowsPerformanceCountersFactory)factory).setWindowsPCs(configurationRequests);
-        }
+        throw new IllegalStateException("Custom performance counter metrics have been disabled for Java 3.0+ Agent.");
     }
 }

core/src/main/java/com/microsoft/applicationinsights/internal/perfcounter/WindowsPerformanceCounterAsMetric.java

@@ -28,14 +28,13 @@
 import com.microsoft.applicationinsights.TelemetryClient;
 import com.microsoft.applicationinsights.internal.system.SystemInformation;
 import com.microsoft.applicationinsights.telemetry.MetricTelemetry;
-import com.microsoft.applicationinsights.telemetry.PerformanceCounterTelemetry;
 
 import com.google.common.base.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Built-in Windows performance counters that are sent as {@link com.microsoft.applicationinsights.telemetry.PerformanceCounterTelemetry}
+ * Built-in Windows performance counters that are sent as {@link com.microsoft.applicationinsights.telemetry.MetricTelemetry}
  *
  * Created by gupele on 3/30/2015.
  */
@@ -45,8 +44,8 @@ public final class WindowsPerformanceCounterAsPC extends AbstractWindowsPerforma
 
     private static final String ID = Constants.PERFORMANCE_COUNTER_PREFIX + "WindowsPerformanceCounterAsPC";
 
-    // Performance counter key and its data that is relevant when sending.
-    private final HashMap<String, WindowsPerformanceCounterData> pcs = new HashMap<String, WindowsPerformanceCounterData>();
+    // Performance counter key and its metric name that is relevant when sending.
+    private final HashMap<String, String> pcs = new HashMap<String, String>();
 
     /**
      * Registers the 'built-in' Windows performance counters that are not fetched from the JVM JMX.
@@ -69,23 +68,21 @@ public WindowsPerformanceCounterAsPC() throws Throwable {
 
     @Override
     public void report(TelemetryClient telemetryClient) {
-        for (Map.Entry<String, WindowsPerformanceCounterData> entry : pcs.entrySet()) {
+        for (Map.Entry<String, String> entry : pcs.entrySet()) {
             try {
                 double value = JniPCConnector.getValueOfPerformanceCounter(entry.getKey());
                 if (value < 0) {
-                    reportError(value, entry.getValue().getDisplayName());
+                    reportError(value, entry.getValue());
                 } else {
                     send(telemetryClient, value, entry.getValue());
-                    WindowsPerformanceCounterData pcData = entry.getValue();
-                    logger.trace("Sent performance counter for '{}'({}, {}, {}): '{}'",
-                            pcData.getDisplayName(), pcData.getCategoryName(), pcData.getCounterName(), pcData.getInstanceName(), value);
+                    logger.trace("Sent performance counter for '{}': '{}'", entry.getValue(), value);
                 }
             } catch (ThreadDeath td) {
                 throw td;
             } catch (Throwable e) {
                 try {
                     if (logger.isErrorEnabled()) {
-                        logger.error("Failed to send performance counter for '{}'", entry.getValue().getDisplayName(), e);
+                        logger.error("Failed to send performance counter for '{}'", entry.getValue(), e);
                     }
                 } catch (ThreadDeath td) {
                     throw td;
@@ -101,8 +98,8 @@ public String getId() {
         return ID;
     }
 
-    private void send(TelemetryClient telemetryClient, double value, WindowsPerformanceCounterData data) {
-        MetricTelemetry telemetry = new MetricTelemetry(data.getDisplayName(), value);
+    private void send(TelemetryClient telemetryClient, double value, String metricName) {
+        MetricTelemetry telemetry = new MetricTelemetry(metricName, value);
         telemetryClient.track(telemetry);
     }
 
@@ -117,12 +114,7 @@ private void register(String category, String counter, String instance, String m
         String key = JniPCConnector.addPerformanceCounter(category, counter, instance);
         if (!Strings.isNullOrEmpty(key)) {
             try {
-                WindowsPerformanceCounterData data = new WindowsPerformanceCounterData().
-                        setCategoryName(category).
-                        setCounterName(counter).
-                        setInstanceName(instance).
-                        setDisplayName(metricName);
-                pcs.put(key, data);
+                pcs.put(key, metricName);
             } catch (ThreadDeath td) {
                 throw td;
             } catch (Throwable e) {