update deps (#52)

ArpNetworking · Jan 9, 2017 · 9bae531 · 9bae531
1 parent 34db073
commit 9bae531
Show file tree

Hide file tree

Showing 39 changed files with 748 additions and 851 deletions.
diff --git a/.jdkw b/.jdkw
@@ -1,2 +1,2 @@
-JDKW_VERSION=8u102
-JDKW_BUILD=b14
+JDKW_VERSION=8u112
+JDKW_BUILD=b15
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>com.arpnetworking.build</groupId>
     <artifactId>arpnetworking-parent-pom</artifactId>
-    <version>1.0.26</version>
+    <version>1.0.29</version>
     <relativePath />
   </parent>
 
@@ -102,57 +102,57 @@
   <properties>
     <!--Dependency versions-->
     <akka.version>2.4.14</akka.version>
-    <akka.http.version>2.4.11</akka.http.version>
+    <akka.http.version>10.0.0</akka.http.version>
     <akka.persistence.cassandra.version>0.6</akka.persistence.cassandra.version>
     <akka.kryo.version>0.5.0</akka.kryo.version>
-    <apache.httpclient.version>4.5.1</apache.httpclient.version>
-    <apache.httpcore.version>4.4.3</apache.httpcore.version>
-    <arpnetworking.commons.version>1.7.1</arpnetworking.commons.version>
-    <aspectjrt.version>1.8.9</aspectjrt.version>
-    <cglib.version>3.2.1</cglib.version>
+    <apache.httpclient.version>4.5.2</apache.httpclient.version>
+    <apache.httpcore.version>4.4.5</apache.httpcore.version>
+    <arpnetworking.commons.version>1.7.3</arpnetworking.commons.version>
+    <aspectjrt.version>1.8.10</aspectjrt.version>
+    <cglib.version>3.2.4</cglib.version>
     <commons.codec.version>1.10</commons.codec.version>
     <ebean.version>6.8.1</ebean.version>
     <findbugs.annotations.version>3.0.1</findbugs.annotations.version>
     <flyway.version>3.2.1</flyway.version>
-    <guava.version>18.0</guava.version>
+    <guava.version>20.0</guava.version>
     <guice.version>4.0</guice.version>
     <hamcrest.version>2.0.0.0</hamcrest.version>
-    <hikari.version>2.4.1</hikari.version>
-    <h2.version>1.4.190</h2.version>
-    <jackson.version>2.7.3</jackson.version>
-    <javassist.version>3.20.0-GA</javassist.version>
-    <javassist.maven.core.version>0.1.2</javassist.maven.core.version>
-    <javax.persistence.version>1.0</javax.persistence.version>
-    <joda.time.version>2.8.2</joda.time.version>
-    <jsr305.version>3.0.0</jsr305.version>
+    <hikari.version>2.5.1</hikari.version>
+    <asynchttpclient.version>2.0.24</asynchttpclient.version>
+    <h2.version>1.4.193</h2.version>
+    <jackson.version>2.8.5</jackson.version>
+    <javassist.version>3.21.0-GA</javassist.version>
+    <javassist.maven.core.version>0.1.3</javassist.maven.core.version>
+    <javax.persistence.version>1.0.2</javax.persistence.version>
+    <joda.time.version>2.9.6</joda.time.version>
+    <jsr305.version>3.0.1</jsr305.version>
     <junit.version>4.12</junit.version>
-    <junitparams.version>1.0.3</junitparams.version>
+    <junitparams.version>1.0.5</junitparams.version>
     <leveldb.version>0.7</leveldb.version>
     <leveldb.jni.version>1.8</leveldb.jni.version>
-    <logback.version>1.1.3</logback.version>
-    <logback.steno.version>1.16.0</logback.steno.version>
-    <log4j.over.slf4j.version>1.7.12</log4j.over.slf4j.version>
+    <logback.version>1.1.8</logback.version>
+    <logback.steno.version>1.16.1</logback.steno.version>
+    <log4j.over.slf4j.version>1.7.22</log4j.over.slf4j.version>
     <luaj.version>3.0.1</luaj.version>
     <maven.version>3.3.9</maven.version>
-    <metrics.client.version>0.4.5</metrics.client.version>
+    <metrics.client.version>0.5.0</metrics.client.version>
     <metrics.jvm.extra.version>0.4.2</metrics.jvm.extra.version>
-    <metrics.aggregator.protocol.version>1.0.3</metrics.aggregator.protocol.version>
+    <metrics.aggregator.protocol.version>1.0.4</metrics.aggregator.protocol.version>
     <mockito.version>1.10.19</mockito.version>
     <netty.version>3.10.3.Final</netty.version>
     <netty.all.version>4.0.21.Final</netty.all.version>
     <ning.http.client.version>1.9.31</ning.http.client.version>
     <oval.version>1.86</oval.version>
-    <play.version>2.4.3</play.version>
+    <play.version>2.5.10</play.version>
     <postgresql.version>9.4-1202-jdbc42</postgresql.version>
-    <protobuf.version>3.0.0-beta-2</protobuf.version>
+    <protobuf.version>3.1.0</protobuf.version>
     <reflections.version>0.9.10</reflections.version>
     <scala.version>2.11</scala.version>
-    <scala.java.compat.version>0.7.0</scala.java.compat.version>
+    <scala.java.compat.version>0.8.0</scala.java.compat.version>
     <scala.library.version>2.11.7</scala.library.version>
-    <slf4j.version>1.7.12</slf4j.version>
+    <slf4j.version>1.7.22</slf4j.version>
     <signalfx.protoc.version>0.0.23</signalfx.protoc.version>
     <typesafe.config.version>1.3.1</typesafe.config.version>
-    <vertx.core.version>2.1.6</vertx.core.version>
     <wavefront.version>3.20</wavefront.version>
     <wiremock.version>1.57</wiremock.version>
 
@@ -573,7 +573,7 @@
     <dependency>
       <groupId>com.typesafe.akka</groupId>
       <artifactId>akka-stream_${scala.version}</artifactId>
-      <version>${akka.http.version}</version>
+      <version>${akka.version}</version>
     </dependency>
     <dependency>
       <groupId>com.typesafe</groupId>
@@ -715,30 +715,15 @@
       <version>${commons.codec.version}</version>
     </dependency>
     <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-all</artifactId>
-      <version>${netty.all.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.ning</groupId>
+      <groupId>org.asynchttpclient</groupId>
       <artifactId>async-http-client</artifactId>
-      <version>${ning.http.client.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.typesafe.play</groupId>
-      <artifactId>play_${scala.version}</artifactId>
-      <version>${play.version}</version>
+      <version>${asynchttpclient.version}</version>
     </dependency>
     <dependency>
       <groupId>com.typesafe.play</groupId>
       <artifactId>play-java-ws_${scala.version}</artifactId>
       <version>${play.version}</version>
     </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-core</artifactId>
-      <version>${vertx.core.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>

diff --git a/src/main/java/com/arpnetworking/clusteraggregator/ClusterStatusCache.java b/src/main/java/com/arpnetworking/clusteraggregator/ClusterStatusCache.java
@@ -31,7 +31,7 @@
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.Sets;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import scala.compat.java8.JFunction;
+import scala.compat.java8.OptionConverters;
 import scala.concurrent.duration.Duration;
 
 import java.io.Serializable;
@@ -147,10 +147,12 @@ private void sendResponse(final ActorRef sender) {
     }
 
     private static String hostFromActorRef(final ActorRef shardRegion) {
-        return shardRegion.path()
-                .address()
-                .host()
-                .getOrElse(JFunction.func(() -> "localhost"));
+
+        return OptionConverters.toJava(
+                shardRegion.path()
+                        .address()
+                        .host())
+                .orElse("localhost");
     }
 
     private final Cluster _cluster;

diff --git a/src/main/java/com/arpnetworking/clusteraggregator/GuiceModule.java b/src/main/java/com/arpnetworking/clusteraggregator/GuiceModule.java
@@ -65,7 +65,6 @@
 import com.arpnetworking.utility.ParallelLeastShardAllocationStrategy;
 import com.arpnetworking.utility.partitioning.PartitionSet;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
 import com.google.inject.AbstractModule;
 import com.google.inject.Injector;
 import com.google.inject.Provides;
@@ -133,7 +132,7 @@ private Config provideAkkaConfig() {
                     ConfigParseOptions.defaults()
                             .setSyntax(ConfigSyntax.JSON));
         } catch (final IOException e) {
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
         }
     }
 

diff --git a/src/main/java/com/arpnetworking/clusteraggregator/Main.java b/src/main/java/com/arpnetworking/clusteraggregator/Main.java
@@ -30,7 +30,6 @@
 import com.arpnetworking.utility.Database;
 import com.arpnetworking.utility.Launchable;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
@@ -110,7 +109,7 @@ public static void main(final String[] args) {
             // Wait for application shutdown
             SHUTDOWN_SEMAPHORE.acquire();
         } catch (final InterruptedException e) {
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
         } finally {
             if (configurator.isPresent()) {
                 configurator.get().shutdown();
@@ -293,7 +292,7 @@ public void run() {
                             .log();
                 }
             } catch (final InterruptedException e) {
-                throw Throwables.propagate(e);
+                throw new RuntimeException(e);
             } finally {
                 LOGGER.info()
                         .setMessage("Shutdown complete")

diff --git a/src/main/java/com/arpnetworking/clusteraggregator/aggregation/AggMessageExtractor.java b/src/main/java/com/arpnetworking/clusteraggregator/aggregation/AggMessageExtractor.java
@@ -18,8 +18,8 @@
 import akka.cluster.sharding.ShardRegion;
 import com.arpnetworking.clusteraggregator.models.CombinedMetricData;
 import com.arpnetworking.metrics.aggregation.protocol.Messages;
-import com.arpnetworking.metrics.com.arpnetworking.steno.Logger;
-import com.arpnetworking.metrics.com.arpnetworking.steno.LoggerFactory;
+import com.arpnetworking.steno.Logger;
+import com.arpnetworking.steno.LoggerFactory;
 import com.arpnetworking.tsdcore.model.AggregatedData;
 import com.google.common.collect.Maps;
 
@@ -89,21 +89,8 @@ public String entityId(final Object message) {
     private TreeMap<String, String> dimensionsToMap(final Messages.StatisticSetRecord metricData) {
         final TreeMap<String, String> sortedDimensionsMap = Maps.newTreeMap(Comparator.<String>naturalOrder());
 
-        for (final Messages.DimensionEntry dimensionEntry : metricData.getDimensionsList()) {
-            sortedDimensionsMap.merge(dimensionEntry.getKey(), dimensionEntry.getValue(), (existing, incoming) -> {
-                LOGGER.error()
-                        .setMessage("Duplicate key found for dimension.")
-                        .addData("statisticSetRecord", metricData)
-                        .addData("dimensionKey", dimensionEntry.getKey())
-                        .addData("firstValue", existing)
-                        .addData("secondValue", incoming)
-                        .log();
-                if (existing.compareTo(incoming) < 0) {
-                    return existing;
-                }
-                return incoming;
-            });
-        }
+        sortedDimensionsMap.putAll(metricData.getDimensionsMap());
+
         return sortedDimensionsMap;
     }
 

diff --git a/src/main/java/com/arpnetworking/clusteraggregator/client/AggClientConnection.java b/src/main/java/com/arpnetworking/clusteraggregator/client/AggClientConnection.java
@@ -34,7 +34,7 @@
 import com.arpnetworking.tsdcore.statistics.Statistic;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.protobuf.GeneratedMessage;
+import com.google.protobuf.GeneratedMessageV3;
 import scala.concurrent.duration.FiniteDuration;
 
 import java.net.InetAddress;
@@ -137,15 +137,11 @@ private void processMessages() {
         while (messageOptional.isPresent()) {
             final AggregationMessage message = messageOptional.get();
             current = current.drop(message.getLength());
-            final GeneratedMessage gm = message.getMessage();
+            final GeneratedMessageV3 gm = message.getMessage();
             if (gm instanceof Messages.HostIdentification) {
                 final Messages.HostIdentification hostIdent = (Messages.HostIdentification) gm;
-                if (hostIdent.hasHostName()) {
-                    _hostName = Optional.ofNullable(hostIdent.getHostName());
-                }
-                if (hostIdent.hasClusterName()) {
-                    _clusterName = Optional.ofNullable(hostIdent.getClusterName());
-                }
+                _hostName = Optional.ofNullable(hostIdent.getHostName());
+                _clusterName = Optional.ofNullable(hostIdent.getClusterName());
                 LOGGER.info()
                         .setMessage("Handshake received")
                         .addData("host", _hostName.orElse(""))
@@ -196,22 +192,12 @@ private void processMessages() {
     private Optional<PeriodicData> buildPeriodicData(final Messages.StatisticSetRecord setRecord) {
         final CombinedMetricData combinedMetricData = CombinedMetricData.Builder.fromStatisticSetRecord(setRecord).build();
         final ImmutableList.Builder<AggregatedData> builder = ImmutableList.builder();
-        final ImmutableMap.Builder<String, String> dimensionBuilder = ImmutableMap.builder();
+        final Map<String, String> dimensionsMap = setRecord.getDimensionsMap();
+        final ImmutableMap.Builder<String, String> dimensionBuilder = ImmutableMap.<String, String>builder().putAll(dimensionsMap);
 
-        Optional<String> host = Optional.empty();
-        Optional<String> service = Optional.empty();
-        Optional<String> cluster = Optional.empty();
-        for (final Messages.DimensionEntry dimensionEntry : setRecord.getDimensionsList()) {
-            if (CombinedMetricData.HOST_KEY.equals(dimensionEntry.getKey())) {
-                host = Optional.ofNullable(dimensionEntry.getValue());
-            } else if (CombinedMetricData.SERVICE_KEY.equals(dimensionEntry.getKey())) {
-                service = Optional.ofNullable(dimensionEntry.getValue());
-            } else if (CombinedMetricData.CLUSTER_KEY.equals(dimensionEntry.getKey())) {
-                cluster = Optional.ofNullable(dimensionEntry.getValue());
-            } else {
-                dimensionBuilder.put(dimensionEntry.getKey(), dimensionEntry.getValue());
-            }
-        }
+        Optional<String> host = Optional.ofNullable(dimensionsMap.get(CombinedMetricData.HOST_KEY));
+        Optional<String> service = Optional.ofNullable(dimensionsMap.get(CombinedMetricData.SERVICE_KEY));
+        Optional<String> cluster = Optional.ofNullable(dimensionsMap.get(CombinedMetricData.CLUSTER_KEY));
 
         if (!service.isPresent()) {
             service = Optional.ofNullable(setRecord.getService());

diff --git a/src/main/java/com/arpnetworking/clusteraggregator/http/Routes.java b/src/main/java/com/arpnetworking/clusteraggregator/http/Routes.java
@@ -27,7 +27,7 @@
 import akka.http.javadsl.model.headers.CacheControl;
 import akka.http.javadsl.model.headers.CacheDirectives;
 import akka.japi.function.Function;
-import akka.pattern.Patterns;
+import akka.pattern.PatternsCS;
 import akka.util.ByteString;
 import akka.util.Timeout;
 import com.arpnetworking.clusteraggregator.Status;
@@ -46,8 +46,6 @@
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import scala.compat.java8.FutureConverters;
-import scala.concurrent.Future;
 
 import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
@@ -152,11 +150,12 @@ private CompletionStage<HttpResponse> process(final HttpRequest request) {
 
     @SuppressWarnings("unchecked")
     private <T> CompletionStage<T> ask(final String actorPath, final Object request, final T defaultValue) {
-        return FutureConverters.toJava(
-                (Future<T>) Patterns.ask(
+        return
+                PatternsCS.ask(
                         _actorSystem.actorSelection(actorPath),
                         request,
-                        Timeout.apply(1, TimeUnit.SECONDS)))
+                        Timeout.apply(5, TimeUnit.SECONDS))
+                .thenApply(o -> (T) o)
                 .exceptionally(throwable -> defaultValue);
     }
 
@@ -182,7 +181,6 @@ private String createTimerName(final HttpRequest request) {
     private static final Logger LOGGER = LoggerFactory.getLogger(Routes.class);
 
     // Ping
-    private static final String STATUS_PATH = "/status";
     private static final HttpHeader PING_CACHE_CONTROL_HEADER = CacheControl.create(
             CacheDirectives.PRIVATE(),
             CacheDirectives.NO_CACHE,

diff --git a/src/main/java/com/arpnetworking/clusteraggregator/models/CombinedMetricData.java b/src/main/java/com/arpnetworking/clusteraggregator/models/CombinedMetricData.java
@@ -28,7 +28,6 @@
 import com.arpnetworking.tsdcore.statistics.Statistic;
 import com.arpnetworking.tsdcore.statistics.StatisticFactory;
 import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
 import com.google.common.collect.Maps;
 import net.sf.oval.constraint.NotNull;
 import org.joda.time.DateTime;
@@ -248,8 +247,8 @@ private static Optional<Unit> getUnitFromName(final String unitString) {
 
         @SuppressWarnings("unchecked")
         private static <T> T deserialzeSupportingData(final Messages.StatisticRecord record) {
-            if (!record.hasSupportingData()) {
-                throw Throwables.propagate(new IllegalArgumentException("no supporting data found"));
+            if (record.getSupportingData() == null) {
+                throw new RuntimeException(new IllegalArgumentException("no supporting data found"));
             }
             return (T) AggregationMessage.deserialize(
                     ByteString.fromByteBuffer(record.getSupportingData().asReadOnlyByteBuffer())).get().getMessage();

diff --git a/src/main/java/com/arpnetworking/configuration/jackson/HoconFileSource.java b/src/main/java/com/arpnetworking/configuration/jackson/HoconFileSource.java
@@ -20,7 +20,6 @@
 import com.arpnetworking.steno.Logger;
 import com.arpnetworking.steno.LoggerFactory;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.base.Throwables;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import com.typesafe.config.ConfigRenderOptions;
@@ -73,7 +72,7 @@ private HoconFileSource(final Builder builder) {
                 final String hoconAsJson = config.resolve().root().render(ConfigRenderOptions.concise());
                 jsonNode = _objectMapper.readTree(hoconAsJson);
             } catch (final IOException e) {
-                throw Throwables.propagate(e);
+                throw new RuntimeException(e);
             }
         } else if (builder._file.exists()) {
             LOGGER.warn()

diff --git a/src/main/java/com/arpnetworking/configuration/jackson/JsonNodeFileSource.java b/src/main/java/com/arpnetworking/configuration/jackson/JsonNodeFileSource.java
@@ -20,7 +20,6 @@
 import com.arpnetworking.steno.Logger;
 import com.arpnetworking.steno.LoggerFactory;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.base.Throwables;
 import net.sf.oval.constraint.NotNull;
 
 import java.io.File;
@@ -68,7 +67,7 @@ private JsonNodeFileSource(final Builder builder) {
             try {
                 jsonNode = _objectMapper.readTree(_file);
             } catch (final IOException e) {
-                throw Throwables.propagate(e);
+                throw new RuntimeException(e);
             }
         } else if (builder._file.exists()) {
             LOGGER.warn()