fix protobuf v2 parser, update some deps (#72)

Author: BrandonArp

pom.xml

@@ -75,7 +75,7 @@
     <akka.http.version>10.0.11</akka.http.version>
     <apache.httpclient.version>4.5.1</apache.httpclient.version>
     <apache.httpcore.version>4.4.3</apache.httpcore.version>
-    <arpnetworking.commons.version>1.9.0</arpnetworking.commons.version>
+    <arpnetworking.commons.version>1.13.3</arpnetworking.commons.version>
     <aspectjrt.version>1.8.9</aspectjrt.version>
     <cglib.version>3.2.5</cglib.version>
     <client.protocol.version>0.10.0</client.protocol.version>
@@ -98,10 +98,10 @@
     <log4j.over.slf4j.version>1.7.12</log4j.over.slf4j.version>
     <metrics.aggregator.protocol.version>1.0.3</metrics.aggregator.protocol.version>
     <metrics.client.version>0.10.0</metrics.client.version>
-    <metrics.client.http.version>0.8.2</metrics.client.http.version>
+    <metrics.client.http.version>0.9.1</metrics.client.http.version>
     <metrics.client.incubator.version>0.6.0</metrics.client.incubator.version>
-    <metrics.generator.version>1.1.0</metrics.generator.version>
-    <metrics.jvm.extra.version>0.7.0</metrics.jvm.extra.version>
+    <metrics.generator.version>1.2.0</metrics.generator.version>
+    <metrics.jvm.extra.version>0.9.0</metrics.jvm.extra.version>
     <mockito.version>2.12.0</mockito.version>
     <oval.version>1.90</oval.version>
     <performance.test.version>1.1.0</performance.test.version>

src/main/java/com/arpnetworking/metrics/mad/Main.java

@@ -255,7 +255,7 @@ private Injector launchGuice(final ActorSystem actorSystem) {
 
         // Instantiate the metrics factory
         final String sinkHost = "0.0.0.0".equals(_configuration.getHttpHost()) ? "localhost" : _configuration.getHttpHost();
-        final URI sinkUrl = URI.create("http://" + sinkHost + ":" + _configuration.getHttpPort() + "/metrics/v1/application");
+        final URI sinkUrl = URI.create("http://" + sinkHost + ":" + _configuration.getHttpPort() + "/metrics/v2/application");
         final MetricsFactory metricsFactory = new TsdMetricsFactory.Builder()
                 .setClusterName(_configuration.getMonitoringCluster())
                 .setServiceName("mad")

src/main/java/com/arpnetworking/metrics/mad/parsers/ProtobufV2ToRecordParser.java

@@ -86,11 +86,15 @@ private void processEntries(
                     .setType(metricType);
             final List<Quantity> quantities = Lists.newArrayListWithExpectedSize(metricEntry.getSamplesCount());
             for (final ClientV2.Quantity quantity : metricEntry.getSamplesList()) {
-                quantities.add(
-                        new Quantity.Builder()
-                                .setUnit(baseUnit(quantity.getUnit()))
-                                .setValue(quantity.getDoubleValue())
-                                .build());
+                final Quantity.Builder builder = new Quantity.Builder()
+                        .setUnit(baseUnit(quantity.getUnit()));
+                if (quantity.getValueCase().equals(ClientV2.Quantity.ValueCase.DOUBLEVALUE)) {
+                    builder.setValue(quantity.getDoubleValue());
+                } else if (quantity.getValueCase().equals(ClientV2.Quantity.ValueCase.LONGVALUE)) {
+                    builder.setValue(Long.valueOf(quantity.getLongValue()).doubleValue());
+                }
+
+                quantities.add(builder.build());
             }
 
             metricBuilder.setValues(quantities);

src/test/java/com/arpnetworking/metrics/mad/parsers/ProtobufV2ToRecordParserTest.java

@@ -63,7 +63,7 @@ public void testParseSingleRecord() throws ParsingException, IOException {
         Assert.assertEquals(time, record.getTime());
 
         final ImmutableMap<String, ? extends Metric> metrics = record.getMetrics();
-        Assert.assertEquals(2, metrics.size());
+        Assert.assertEquals(3, metrics.size());
         final Metric counter = metrics.get("counter1");
         Assert.assertNotNull(counter);
         Assert.assertEquals(1, counter.getValues().size());
@@ -73,6 +73,11 @@ public void testParseSingleRecord() throws ParsingException, IOException {
         Assert.assertNotNull(timer);
         Assert.assertEquals(1, timer.getValues().size());
         Assert.assertEquals(new Quantity.Builder().setUnit(Unit.MILLISECOND).setValue(508d).build(), timer.getValues().get(0));
+
+        final Metric longCounter = metrics.get("longCounter1");
+        Assert.assertNotNull(longCounter);
+        Assert.assertEquals(1, longCounter.getValues().size());
+        Assert.assertEquals(new Quantity.Builder().setValue(1d).build(), counter.getValues().get(0));
     }
 
     private static List<Record> parseRecords(final String fileName) throws ParsingException, IOException {