Merge pull request Netflix#351 from dmuino/newApacheOutput

Deal with new apache status output

Author: brharrington

servo-apache/src/main/java/com/netflix/servo/publish/apache/ApacheStatusPoller.java

@@ -22,6 +22,7 @@
 import com.netflix.servo.tag.Tag;
 import com.netflix.servo.tag.Tags;
 import com.netflix.servo.util.UnmodifiableList;
+import com.netflix.servo.util.UnmodifiableSet;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -33,6 +34,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -91,14 +93,17 @@ private StatusPageParser() {
     }
 
     private static final Pattern INVALID_CHARS = Pattern.compile("[^a-zA-Z0-9_\\-\\.]");
-    private static final Pattern STAT_LINE = Pattern.compile("^([^:]+): (\\S+)$");
+    private static final Pattern STAT_LINE = Pattern.compile("^([^:]+): ([.\\d]+)$");
+    private static final Pattern SCOREBOARD_LINE = Pattern.compile("^Scoreboard: (\\S+)$");
     private static final char[] SCOREBOARD_CHARS = {
         '_', 'S', 'R', 'W', 'K', 'D', 'C', 'L', 'G', 'I', '.', '*'};
     private static final Tag CLASS_TAG = Tags.newTag("class", "ApacheStatusPoller");
     /**
-     * Metrics that should not be included. These can be confusing for end users.
+     * Metrics that should be included.
      */
-    private static final List<String> BLACKLISTED_METRICS = UnmodifiableList.of("CPULoad");
+    private static final Set<String> WHITELISTED_METRICS = UnmodifiableSet.of("Total_Accesses",
+        "Total_kBytes", "Uptime", "ReqPerSec", "BytesPerSec", "BytesPerReq",
+        "BusyWorkers", "IdleWorkers");
     private static final int ASCII_CHARS = 128;
     private static final String SCOREBOARD = "Scoreboard";
 
@@ -138,7 +143,7 @@ static List<Metric> parseStatLine(String line, long timestamp) {
       }
 
       final String name = INVALID_CHARS.matcher(m.group(1)).replaceAll("_");
-      if (BLACKLISTED_METRICS.contains(name)) {
+      if (!WHITELISTED_METRICS.contains(name)) {
         return EMPTY_LIST;
       }
       final double value = Double.parseDouble(m.group(2));
@@ -168,12 +173,12 @@ static List<Metric> parseStatLine(String line, long timestamp) {
      * ." Open slot with no current process (ignored)
      */
     static List<Metric> parseScoreboardLine(String line, long timestamp) {
-      final Matcher m = STAT_LINE.matcher(line);
+      final Matcher m = SCOREBOARD_LINE.matcher(line);
       if (!m.matches()) {
         return EMPTY_LIST;
       }
 
-      final char[] scoreboard = m.group(2).toCharArray();
+      final char[] scoreboard = m.group(1).toCharArray();
 
       final double[] tally = new double[ASCII_CHARS];
       for (final char item : SCOREBOARD_CHARS) {

servo-apache/src/test/java/com/netflix/servo/publish/apache/ApacheStatusPollerTest.java

@@ -23,8 +23,6 @@
 import org.testng.annotations.Test;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -127,4 +125,76 @@ public void testParse() throws Exception {
 
     assertEquals(metrics, expected);
   }
+
+  @Test
+  public void testParseNewFormat() throws Exception {
+    final String statusText = "localhost\n"
+        + "ServerVersion: Apache/2.4.16 (Ubuntu)\n"
+        + "ServerMPM: worker\n"
+        + "Server Built: 2015-09-08T00:00:00\n"
+        + "CurrentTime: Tuesday, 08-Sep-2015 21:07:08 UTC\n"
+        + "RestartTime: Tuesday, 08-Sep-2015 19:51:38 UTC\n"
+        + "ParentServerConfigGeneration: 1\n"
+        + "ParentServerMPMGeneration: 0\n"
+        + "ServerUptimeSeconds: \n"
+        + "ServerUptime: 1 hour 15 minutes 29 seconds\n"
+        + "Load1: 0.04\n"
+        + "Load5: 0.03\n"
+        + "Load15: 0.05\n"
+        + "Total Accesses: " + TOTAL_ACCESSES + "\n"
+        + "Total kBytes: " + KBYTES + "\n"
+        + "CPUUser: .36\n"
+        + "CPUSystem: .26\n"
+        + "CPUChildrenUser: 0\n"
+        + "CPUChildrenSystem: 0\n"
+        + "CPULoad: .044688\n"
+        + "Uptime: " + UPTIME + "\n"
+        + "ReqPerSec: " + RPS + "\n"
+        + "BytesPerSec: " + BPS + "\n"
+        + "BytesPerReq: " + BPR + "\n"
+        + "BusyWorkers: " + BUSY_WORKERS + "\n"
+        + "IdleWorkers: " + IDLE_WORKERS + "\n"
+        + "Scoreboard: __________________K___W_K_____K______________K____"
+        + repeat('.', OPEN_SLOTS)
+        + "\n";
+    ApacheStatusPoller.StatusFetcher fetcher = () -> new ByteArrayInputStream(statusText.getBytes("UTF-8"));
+
+    ApacheStatusPoller poller = new ApacheStatusPoller(fetcher);
+
+    List<Metric> metrics = poller.pollImpl(TIMESTAMP);
+
+    Metric accesses = counter("Total_Accesses", TOTAL_ACCESSES);
+    Metric kBytes = counter("Total_kBytes", KBYTES);
+    Metric uptime = counter("Uptime", UPTIME);
+
+    List<Metric> counters = UnmodifiableList.of(accesses, kBytes, uptime);
+    Metric rps = gauge("ReqPerSec", RPS);
+    Metric bps = gauge("BytesPerSec", BPS);
+    Metric bpr = gauge("BytesPerReq", BPR);
+    Metric busyWorkers = gauge("BusyWorkers", BUSY_WORKERS);
+    Metric idleWorkers = gauge("IdleWorkers", IDLE_WORKERS);
+    List<Metric> gauges = UnmodifiableList.of(rps, bps, bpr, busyWorkers, idleWorkers);
+
+    Metric waitingForConnection = scoreboard("WaitingForConnection", 45.0);
+    Metric startingUp = scoreboard("StartingUp", 0.0);
+    Metric readingRequest = scoreboard("ReadingRequest", 0.0);
+    Metric sendingReply = scoreboard("SendingReply", 1.0);
+    Metric keepalive = scoreboard("Keepalive", 4.0);
+    Metric dnsLookup = scoreboard("DnsLookup", 0.0);
+    Metric closingConnection = scoreboard("ClosingConnection", 0.0);
+    Metric logging = scoreboard("Logging", 0.0);
+    Metric gracefullyFinishing = scoreboard("GracefullyFinishing", 0.0);
+    Metric idleCleanupOfWorker = scoreboard("IdleCleanupOfWorker", 0.0);
+    Metric unknownState = scoreboard("UnknownState", 0.0);
+    List<Metric> scoreboard = UnmodifiableList.of(waitingForConnection,
+        startingUp, readingRequest, sendingReply, keepalive, dnsLookup, closingConnection,
+        logging, gracefullyFinishing, idleCleanupOfWorker, unknownState);
+
+    List<Metric> expected = new ArrayList<>();
+    expected.addAll(counters);
+    expected.addAll(gauges);
+    expected.addAll(scoreboard);
+
+    assertEquals(metrics, expected);
+  }
 }