Skip to content

Commit 94ed89b

Browse files
BrandonArpBrandonArp
committed
update deps
1 parent c0df0c9 commit 94ed89b

30 files changed

+186
-230
lines changed

‎pom.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -102,54 +102,54 @@
102102
<properties>
103103
<!--Dependency versions-->
104104
<akka.version>2.4.14</akka.version>
105-
<akka.http.version>2.4.11</akka.http.version>
105+
<akka.http.version>10.0.0</akka.http.version>
106106
<akka.persistence.cassandra.version>0.6</akka.persistence.cassandra.version>
107107
<akka.kryo.version>0.5.0</akka.kryo.version>
108-
<apache.httpclient.version>4.5.1</apache.httpclient.version>
109-
<apache.httpcore.version>4.4.3</apache.httpcore.version>
110-
<arpnetworking.commons.version>1.7.1</arpnetworking.commons.version>
108+
<apache.httpclient.version>4.5.2</apache.httpclient.version>
109+
<apache.httpcore.version>4.4.5</apache.httpcore.version>
110+
<arpnetworking.commons.version>1.7.3</arpnetworking.commons.version>
111111
<aspectjrt.version>1.8.9</aspectjrt.version>
112-
<cglib.version>3.2.1</cglib.version>
112+
<cglib.version>3.2.4</cglib.version>
113113
<commons.codec.version>1.10</commons.codec.version>
114114
<ebean.version>6.8.1</ebean.version>
115115
<findbugs.annotations.version>3.0.1</findbugs.annotations.version>
116116
<flyway.version>3.2.1</flyway.version>
117-
<guava.version>18.0</guava.version>
117+
<guava.version>20.0</guava.version>
118118
<guice.version>4.0</guice.version>
119119
<hamcrest.version>2.0.0.0</hamcrest.version>
120-
<hikari.version>2.4.1</hikari.version>
120+
<hikari.version>2.5.1</hikari.version>
121121
<h2.version>1.4.190</h2.version>
122-
<jackson.version>2.7.3</jackson.version>
122+
<jackson.version>2.8.5</jackson.version>
123123
<javassist.version>3.21.0-GA</javassist.version>
124-
<javassist.maven.core.version>0.1.2</javassist.maven.core.version>
124+
<javassist.maven.core.version>0.1.3</javassist.maven.core.version>
125125
<javax.persistence.version>1.0</javax.persistence.version>
126126
<joda.time.version>2.8.2</joda.time.version>
127-
<jsr305.version>3.0.0</jsr305.version>
127+
<jsr305.version>3.0.1</jsr305.version>
128128
<junit.version>4.12</junit.version>
129129
<junitparams.version>1.0.3</junitparams.version>
130130
<leveldb.version>0.7</leveldb.version>
131131
<leveldb.jni.version>1.8</leveldb.jni.version>
132-
<logback.version>1.1.3</logback.version>
133-
<logback.steno.version>1.16.0</logback.steno.version>
134-
<log4j.over.slf4j.version>1.7.12</log4j.over.slf4j.version>
132+
<logback.version>1.1.8</logback.version>
133+
<logback.steno.version>1.16.1</logback.steno.version>
134+
<log4j.over.slf4j.version>1.7.22</log4j.over.slf4j.version>
135135
<luaj.version>3.0.1</luaj.version>
136136
<maven.version>3.3.9</maven.version>
137-
<metrics.client.version>0.4.5</metrics.client.version>
137+
<metrics.client.version>0.5.0</metrics.client.version>
138138
<metrics.jvm.extra.version>0.4.2</metrics.jvm.extra.version>
139-
<metrics.aggregator.protocol.version>1.0.3</metrics.aggregator.protocol.version>
139+
<metrics.aggregator.protocol.version>1.0.4</metrics.aggregator.protocol.version>
140140
<mockito.version>1.10.19</mockito.version>
141141
<netty.version>3.10.3.Final</netty.version>
142142
<netty.all.version>4.0.21.Final</netty.all.version>
143143
<ning.http.client.version>1.9.31</ning.http.client.version>
144144
<oval.version>1.86</oval.version>
145-
<play.version>2.4.3</play.version>
145+
<play.version>2.5.10</play.version>
146146
<postgresql.version>9.4-1202-jdbc42</postgresql.version>
147-
<protobuf.version>3.0.0-beta-2</protobuf.version>
147+
<protobuf.version>3.1.0</protobuf.version>
148148
<reflections.version>0.9.10</reflections.version>
149149
<scala.version>2.11</scala.version>
150-
<scala.java.compat.version>0.7.0</scala.java.compat.version>
150+
<scala.java.compat.version>0.8.0</scala.java.compat.version>
151151
<scala.library.version>2.11.7</scala.library.version>
152-
<slf4j.version>1.7.12</slf4j.version>
152+
<slf4j.version>1.7.22</slf4j.version>
153153
<signalfx.protoc.version>0.0.23</signalfx.protoc.version>
154154
<typesafe.config.version>1.3.1</typesafe.config.version>
155155
<vertx.core.version>2.1.6</vertx.core.version>
@@ -573,7 +573,7 @@
573573
<dependency>
574574
<groupId>com.typesafe.akka</groupId>
575575
<artifactId>akka-stream_${scala.version}</artifactId>
576-
<version>${akka.http.version}</version>
576+
<version>${akka.version}</version>
577577
</dependency>
578578
<dependency>
579579
<groupId>com.typesafe</groupId>

‎src/main/java/com/arpnetworking/clusteraggregator/ClusterStatusCache.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.arpnetworking.clusteraggregator.models.ShardAllocation;
2727
import com.arpnetworking.metrics.Metrics;
2828
import com.arpnetworking.metrics.MetricsFactory;
29+
import com.arpnetworking.steno.LoggerFactory;
2930
import com.arpnetworking.utility.ParallelLeastShardAllocationStrategy;
3031
import com.google.common.collect.ArrayListMultimap;
3132
import com.google.common.collect.Multimaps;
@@ -144,6 +145,7 @@ private void sendResponse(final ActorRef sender) {
144145
_clusterState.orElse(_cluster.state()),
145146
_rebalanceState);
146147
sender.tell(response, self());
148+
LoggerFactory.getLogger(ClusterStatusCache.class).info().setMessage("sent response").log();
147149
}
148150

149151
private static String hostFromActorRef(final ActorRef shardRegion) {

‎src/main/java/com/arpnetworking/clusteraggregator/Main.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import com.arpnetworking.utility.Launchable;
3434
import com.fasterxml.jackson.databind.ObjectMapper;
3535
import com.fasterxml.jackson.databind.module.SimpleModule;
36-
import com.google.common.base.Throwables;
3736
import com.google.common.collect.Lists;
3837
import com.google.inject.Guice;
3938
import com.google.inject.Injector;
@@ -116,7 +115,7 @@ public static void main(final String[] args) {
116115
// Wait for application shutdown
117116
SHUTDOWN_SEMAPHORE.acquire();
118117
} catch (final InterruptedException e) {
119-
throw Throwables.propagate(e);
118+
throw new RuntimeException(e);
120119
} finally {
121120
if (configurator.isPresent()) {
122121
configurator.get().shutdown();
@@ -304,7 +303,7 @@ public void run() {
304303
.log();
305304
}
306305
} catch (final InterruptedException e) {
307-
throw Throwables.propagate(e);
306+
throw new RuntimeException(e);
308307
} finally {
309308
LOGGER.info()
310309
.setMessage("Shutdown complete")

‎src/main/java/com/arpnetworking/clusteraggregator/aggregation/AggMessageExtractor.java‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -89,21 +89,8 @@ public String entityId(final Object message) {
8989
private TreeMap<String, String> dimensionsToMap(final Messages.StatisticSetRecord metricData) {
9090
final TreeMap<String, String> sortedDimensionsMap = Maps.newTreeMap(Comparator.<String>naturalOrder());
9191

92-
for (final Messages.DimensionEntry dimensionEntry : metricData.getDimensionsList()) {
93-
sortedDimensionsMap.merge(dimensionEntry.getKey(), dimensionEntry.getValue(), (existing, incoming) -> {
94-
LOGGER.error()
95-
.setMessage("Duplicate key found for dimension.")
96-
.addData("statisticSetRecord", metricData)
97-
.addData("dimensionKey", dimensionEntry.getKey())
98-
.addData("firstValue", existing)
99-
.addData("secondValue", incoming)
100-
.log();
101-
if (existing.compareTo(incoming) < 0) {
102-
return existing;
103-
}
104-
return incoming;
105-
});
106-
}
92+
sortedDimensionsMap.putAll(metricData.getDimensionsMap());
93+
10794
return sortedDimensionsMap;
10895
}
10996

‎src/main/java/com/arpnetworking/clusteraggregator/client/AggClientConnection.java‎

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import com.arpnetworking.tsdcore.statistics.Statistic;
3535
import com.google.common.collect.ImmutableList;
3636
import com.google.common.collect.ImmutableMap;
37-
import com.google.protobuf.GeneratedMessage;
37+
import com.google.protobuf.GeneratedMessageV3;
3838
import scala.concurrent.duration.FiniteDuration;
3939

4040
import java.net.InetAddress;
@@ -137,15 +137,11 @@ private void processMessages() {
137137
while (messageOptional.isPresent()) {
138138
final AggregationMessage message = messageOptional.get();
139139
current = current.drop(message.getLength());
140-
final GeneratedMessage gm = message.getMessage();
140+
final GeneratedMessageV3 gm = message.getMessage();
141141
if (gm instanceof Messages.HostIdentification) {
142142
final Messages.HostIdentification hostIdent = (Messages.HostIdentification) gm;
143-
if (hostIdent.hasHostName()) {
144-
_hostName = Optional.ofNullable(hostIdent.getHostName());
145-
}
146-
if (hostIdent.hasClusterName()) {
147-
_clusterName = Optional.ofNullable(hostIdent.getClusterName());
148-
}
143+
_hostName = Optional.ofNullable(hostIdent.getHostName());
144+
_clusterName = Optional.ofNullable(hostIdent.getClusterName());
149145
LOGGER.info()
150146
.setMessage("Handshake received")
151147
.addData("host", _hostName.orElse(""))
@@ -196,22 +192,12 @@ private void processMessages() {
196192
private Optional<PeriodicData> buildPeriodicData(final Messages.StatisticSetRecord setRecord) {
197193
final CombinedMetricData combinedMetricData = CombinedMetricData.Builder.fromStatisticSetRecord(setRecord).build();
198194
final ImmutableList.Builder<AggregatedData> builder = ImmutableList.builder();
199-
final ImmutableMap.Builder<String, String> dimensionBuilder = ImmutableMap.builder();
195+
final Map<String, String> dimensionsMap = setRecord.getDimensionsMap();
196+
final ImmutableMap.Builder<String, String> dimensionBuilder = ImmutableMap.<String, String>builder().putAll(dimensionsMap);
200197

201-
Optional<String> host = Optional.empty();
202-
Optional<String> service = Optional.empty();
203-
Optional<String> cluster = Optional.empty();
204-
for (final Messages.DimensionEntry dimensionEntry : setRecord.getDimensionsList()) {
205-
if (CombinedMetricData.HOST_KEY.equals(dimensionEntry.getKey())) {
206-
host = Optional.ofNullable(dimensionEntry.getValue());
207-
} else if (CombinedMetricData.SERVICE_KEY.equals(dimensionEntry.getKey())) {
208-
service = Optional.ofNullable(dimensionEntry.getValue());
209-
} else if (CombinedMetricData.CLUSTER_KEY.equals(dimensionEntry.getKey())) {
210-
cluster = Optional.ofNullable(dimensionEntry.getValue());
211-
} else {
212-
dimensionBuilder.put(dimensionEntry.getKey(), dimensionEntry.getValue());
213-
}
214-
}
198+
Optional<String> host = Optional.ofNullable(dimensionsMap.get(CombinedMetricData.HOST_KEY));
199+
Optional<String> service = Optional.ofNullable(dimensionsMap.get(CombinedMetricData.SERVICE_KEY));
200+
Optional<String> cluster = Optional.ofNullable(dimensionsMap.get(CombinedMetricData.CLUSTER_KEY));
215201

216202
if (!service.isPresent()) {
217203
service = Optional.ofNullable(setRecord.getService());

‎src/main/java/com/arpnetworking/clusteraggregator/http/Routes.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import akka.http.javadsl.model.headers.CacheControl;
2828
import akka.http.javadsl.model.headers.CacheDirectives;
2929
import akka.japi.function.Function;
30-
import akka.pattern.Patterns;
30+
import akka.pattern.PatternsCS;
3131
import akka.util.ByteString;
3232
import akka.util.Timeout;
3333
import com.arpnetworking.clusteraggregator.Status;
@@ -46,8 +46,6 @@
4646
import com.fasterxml.jackson.databind.SerializerProvider;
4747
import com.fasterxml.jackson.databind.module.SimpleModule;
4848
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
49-
import scala.compat.java8.FutureConverters;
50-
import scala.concurrent.Future;
5149

5250
import java.io.IOException;
5351
import java.util.concurrent.CompletableFuture;
@@ -152,12 +150,16 @@ private CompletionStage<HttpResponse> process(final HttpRequest request) {
152150

153151
@SuppressWarnings("unchecked")
154152
private <T> CompletionStage<T> ask(final String actorPath, final Object request, final T defaultValue) {
155-
return FutureConverters.toJava(
156-
(Future<T>) Patterns.ask(
153+
return
154+
PatternsCS.ask(
157155
_actorSystem.actorSelection(actorPath),
158156
request,
159-
Timeout.apply(1, TimeUnit.SECONDS)))
160-
.exceptionally(throwable -> defaultValue);
157+
Timeout.apply(10, TimeUnit.SECONDS))
158+
.thenApply(o -> {
159+
LOGGER.info().setMessage("got response") .log();
160+
return (T) o;
161+
});
162+
// .exceptionally(throwable -> defaultValue);
161163
}
162164

163165
private String createTimerName(final HttpRequest request) {
@@ -182,7 +184,6 @@ private String createTimerName(final HttpRequest request) {
182184
private static final Logger LOGGER = LoggerFactory.getLogger(Routes.class);
183185

184186
// Ping
185-
private static final String STATUS_PATH = "/status";
186187
private static final HttpHeader PING_CACHE_CONTROL_HEADER = CacheControl.create(
187188
CacheDirectives.PRIVATE(),
188189
CacheDirectives.NO_CACHE,

‎src/main/java/com/arpnetworking/clusteraggregator/models/CombinedMetricData.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import com.arpnetworking.tsdcore.statistics.Statistic;
2929
import com.arpnetworking.tsdcore.statistics.StatisticFactory;
3030
import com.google.common.base.Strings;
31-
import com.google.common.base.Throwables;
3231
import com.google.common.collect.Maps;
3332
import net.sf.oval.constraint.NotNull;
3433
import org.joda.time.DateTime;
@@ -248,8 +247,8 @@ private static Optional<Unit> getUnitFromName(final String unitString) {
248247

249248
@SuppressWarnings("unchecked")
250249
private static <T> T deserialzeSupportingData(final Messages.StatisticRecord record) {
251-
if (!record.hasSupportingData()) {
252-
throw Throwables.propagate(new IllegalArgumentException("no supporting data found"));
250+
if (record.getSupportingData() == null) {
251+
throw new RuntimeException(new IllegalArgumentException("no supporting data found"));
253252
}
254253
return (T) AggregationMessage.deserialize(
255254
ByteString.fromByteBuffer(record.getSupportingData().asReadOnlyByteBuffer())).get().getMessage();

‎src/main/java/com/arpnetworking/configuration/jackson/JsonNodeFileSource.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.arpnetworking.steno.Logger;
2121
import com.arpnetworking.steno.LoggerFactory;
2222
import com.fasterxml.jackson.databind.JsonNode;
23-
import com.google.common.base.Throwables;
2423
import net.sf.oval.constraint.NotNull;
2524

2625
import java.io.File;
@@ -68,7 +67,7 @@ private JsonNodeFileSource(final Builder builder) {
6867
try {
6968
jsonNode = _objectMapper.readTree(_file);
7069
} catch (final IOException e) {
71-
throw Throwables.propagate(e);
70+
throw new RuntimeException(e);
7271
}
7372
} else if (builder._file.exists()) {
7473
LOGGER.warn()

‎src/main/java/com/arpnetworking/configuration/jackson/JsonNodeLiteralSource.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.arpnetworking.logback.annotations.LogValue;
1919
import com.arpnetworking.steno.LogValueMapFactory;
2020
import com.fasterxml.jackson.databind.JsonNode;
21-
import com.google.common.base.Throwables;
2221
import net.sf.oval.constraint.NotNull;
2322

2423
import java.io.IOException;
@@ -64,7 +63,7 @@ private JsonNodeLiteralSource(final Builder builder) {
6463
try {
6564
jsonNode = _objectMapper.readTree(_source);
6665
} catch (final IOException e) {
67-
throw Throwables.propagate(e);
66+
throw new RuntimeException(e);
6867
}
6968
_jsonNode = Optional.ofNullable(jsonNode);
7069
}

‎src/main/java/com/arpnetworking/configuration/jackson/JsonNodePaginatedUriSource.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.arpnetworking.steno.Logger;
2121
import com.arpnetworking.steno.LoggerFactory;
2222
import com.fasterxml.jackson.databind.JsonNode;
23-
import com.google.common.base.Throwables;
2423
import net.sf.oval.constraint.NotEmpty;
2524
import net.sf.oval.constraint.NotNull;
2625
import org.apache.http.client.utils.URIBuilder;
@@ -103,7 +102,7 @@ private JsonNodePaginatedUriSource(final Builder builder) {
103102
}
104103
}
105104
} catch (final URISyntaxException e) {
106-
throw Throwables.propagate(e);
105+
throw new RuntimeException(e);
107106
}
108107

109108
_mergingSource = mergingSourceBuilder.build();

0 commit comments

Comments
 (0)