Upgrades to stablize tests and fixes based on the upgrades. (#59)

vjkoskela · BrandonArp · commit 22a7ad1011e4 · 2017-04-20T21:08:18.000-07:00
diff --git a/.jdkw b/.jdkw
@@ -1,2 +1,3 @@
-JDKW_VERSION=8u112
-JDKW_BUILD=b15
+JDKW_VERSION=8u121
+JDKW_BUILD=b13
+JDKW_TOKEN=e9e7ea248e2c4826b92b3f075a80e441
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.29</version>
+    <version>1.0.30</version>
     <relativePath />
   </parent>
 
@@ -83,7 +83,7 @@
     <commons.io.version>2.4</commons.io.version>
     <commons.math3.version>3.3</commons.math3.version>
     <findbugs.annotations.version>3.0.1</findbugs.annotations.version>
-    <guava.version>18.0</guava.version>
+    <guava.version>21.0</guava.version>
     <guice.version>4.0</guice.version>
     <hamcrest.version>2.0.0.0</hamcrest.version>
     <jackson.version>2.7.3</jackson.version>
@@ -435,6 +435,13 @@
       <artifactId>guava</artifactId>
       <version>${guava.version}</version>
     </dependency>
+    <dependency>
+      <!-- Temporary: see https://github.com/google/guava/issues/2721 -->
+      <groupId>com.google.errorprone</groupId>
+      <artifactId>error_prone_annotations</artifactId>
+      <version>2.0.15</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM openjdk:8u111-jre-alpine
+FROM openjdk:8u121-jre-alpine
 
 MAINTAINER arpnetworking
 
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;
@@ -62,7 +61,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()
diff --git a/src/main/java/com/arpnetworking/configuration/jackson/JsonNodeLiteralSource.java b/src/main/java/com/arpnetworking/configuration/jackson/JsonNodeLiteralSource.java
@@ -18,7 +18,6 @@
 import com.arpnetworking.logback.annotations.LogValue;
 import com.arpnetworking.steno.LogValueMapFactory;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.base.Throwables;
 import net.sf.oval.constraint.NotNull;
 
 import java.io.IOException;
@@ -58,7 +57,7 @@ private JsonNodeLiteralSource(final Builder builder) {
         try {
             jsonNode = _objectMapper.readTree(_source);
         } catch (final IOException e) {
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
         }
         _jsonNode = Optional.ofNullable(jsonNode);
     }
diff --git a/src/main/java/com/arpnetworking/configuration/jackson/JsonNodePaginatedUriSource.java b/src/main/java/com/arpnetworking/configuration/jackson/JsonNodePaginatedUriSource.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.NotEmpty;
 import net.sf.oval.constraint.NotNull;
 import org.apache.http.client.utils.URIBuilder;
@@ -97,7 +96,7 @@ private JsonNodePaginatedUriSource(final Builder builder) {
                 }
             }
         } catch (final URISyntaxException e) {
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
         }
 
         _mergingSource = mergingSourceBuilder.build();
diff --git a/src/main/java/com/arpnetworking/configuration/jackson/JsonNodeUriSource.java b/src/main/java/com/arpnetworking/configuration/jackson/JsonNodeUriSource.java
@@ -18,7 +18,6 @@
 import com.arpnetworking.logback.annotations.LogValue;
 import com.arpnetworking.steno.LogValueMapFactory;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.base.Throwables;
 import net.sf.oval.constraint.NotNull;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
@@ -83,7 +82,7 @@ private JsonNodeUriSource(final Builder builder) {
             final HttpResponse response = CLIENT.execute(request);
             jsonNode = _objectMapper.readTree(response.getEntity().getContent());
         } catch (final IOException e) {
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
         } finally {
             if (request != null) {
                 request.releaseConnection();
diff --git a/src/main/java/com/arpnetworking/configuration/triggers/FileTrigger.java b/src/main/java/com/arpnetworking/configuration/triggers/FileTrigger.java
@@ -21,7 +21,6 @@
 import com.arpnetworking.steno.LogValueMapFactory;
 import com.arpnetworking.steno.Logger;
 import com.arpnetworking.steno.LoggerFactory;
-import com.google.common.base.Throwables;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import net.sf.oval.constraint.NotNull;
 
@@ -128,7 +127,7 @@ private FileTrigger(final Builder builder) {
         try {
             _md5 = MessageDigest.getInstance("MD5");
         } catch (final NoSuchAlgorithmException e) {
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/src/main/java/com/arpnetworking/metrics/common/tailer/FilePositionStore.java b/src/main/java/com/arpnetworking/metrics/common/tailer/FilePositionStore.java
@@ -24,7 +24,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
 import com.google.common.collect.Maps;
 import net.sf.oval.constraint.Min;
 import net.sf.oval.constraint.NotNull;
@@ -141,7 +140,7 @@ private void flush() {
                     .addData("file", _file)
                     .log();
         } catch (final IOException ioe) {
-            throw Throwables.propagate(ioe);
+            throw new RuntimeException(ioe);
         } finally {
             _lastFlush = now;
         }
diff --git a/src/main/java/com/arpnetworking/metrics/common/tailer/StatefulTailer.java b/src/main/java/com/arpnetworking/metrics/common/tailer/StatefulTailer.java
@@ -23,7 +23,6 @@
 import com.arpnetworking.utility.TimerTrigger;
 import com.arpnetworking.utility.Trigger;
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Throwables;
 import net.sf.oval.constraint.NotNull;
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.io.IOUtils;
@@ -520,7 +519,7 @@ private void handleThrowable(final Throwable t) {
         try {
             _md5 = MessageDigest.getInstance("MD5");
         } catch (final NoSuchAlgorithmException e) {
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
         }
 
         _initialPosition = builder._initialPosition;
diff --git a/src/main/java/com/arpnetworking/metrics/mad/Bucket.java b/src/main/java/com/arpnetworking/metrics/mad/Bucket.java
@@ -32,7 +32,6 @@
 import com.arpnetworking.tsdcore.statistics.Calculator;
 import com.arpnetworking.tsdcore.statistics.Statistic;
 import com.arpnetworking.tsdcore.statistics.StatisticFactory;
-import com.google.common.base.Throwables;
 import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
@@ -130,14 +129,14 @@ public void add(final Record record) {
             try {
                 specifiedStatistics = _specifiedStatisticsCache.get(name);
             } catch (final ExecutionException e) {
-                throw Throwables.propagate(e);
+                throw new RuntimeException(e);
             }
             if (specifiedStatistics.isPresent()) {
                 final Optional<ImmutableSet<Statistic>> dependentStatistics;
                 try {
                     dependentStatistics = _dependentStatisticsCache.get(name);
                 } catch (final ExecutionException e) {
-                    throw Throwables.propagate(e);
+                    throw new RuntimeException(e);
                 }
                 calculators = getOrCreateCalculators(
                         name,
@@ -231,7 +230,7 @@ private void computeStatistics(
             try {
                 stats = specifiedStatistics.get(metric);
             } catch (final ExecutionException e) {
-                throw Throwables.propagate(e);
+                throw new RuntimeException(e);
             }
             return stats.isPresent() && stats.get().contains(statistic);
         }, data);
diff --git a/src/main/java/com/arpnetworking/metrics/mad/Main.java b/src/main/java/com/arpnetworking/metrics/mad/Main.java
@@ -50,7 +50,6 @@
 import com.arpnetworking.utility.Launchable;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -143,7 +142,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();
@@ -473,7 +472,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/metrics/mad/parsers/JsonToRecordParser.java b/src/main/java/com/arpnetworking/metrics/mad/parsers/JsonToRecordParser.java
@@ -47,7 +47,6 @@
 import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
 import com.google.common.base.Function;
 import com.google.common.base.Predicates;
-import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -699,7 +698,7 @@ private static Quantity version2gSampleToQuantity(final Version2g.Sample sample)
             // Application will fail to start if the host name can not be determined.
             localHostName = InetAddress.getLocalHost().getCanonicalHostName();
         } catch (final UnknownHostException e) {
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
         }
         LOCAL_HOST_NAME = localHostName;
     }
diff --git a/src/main/java/com/arpnetworking/tsdcore/sinks/PeriodicStatisticsSink.java b/src/main/java/com/arpnetworking/tsdcore/sinks/PeriodicStatisticsSink.java
@@ -25,12 +25,12 @@
 import com.arpnetworking.tsdcore.model.AggregatedData;
 import com.arpnetworking.tsdcore.model.PeriodicData;
 import com.fasterxml.jackson.annotation.JacksonInject;
-import com.google.common.base.Throwables;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import net.sf.oval.constraint.Min;
 import net.sf.oval.constraint.NotNull;
 
+import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -113,7 +113,7 @@ public void close() {
             _executor.awaitTermination(EXECUTOR_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS);
         } catch (final InterruptedException e) {
             Thread.interrupted();
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
         }
         flushMetrics(_metrics.get());
     }
@@ -162,7 +162,7 @@ private Metrics createMetrics() {
 
     private Set<String> createConcurrentSet(final Set<String> existingSet) {
         final int initialCapacity = (int) (existingSet.size() / 0.75);
-        return Sets.newSetFromMap(new ConcurrentHashMap<>(initialCapacity));
+        return Collections.newSetFromMap(new ConcurrentHashMap<>(initialCapacity));
     }
 
     // NOTE: Package private for testing
@@ -204,9 +204,9 @@ private PeriodicStatisticsSink(final Builder builder) {
     private final LongAccumulator _metricSamples = new LongAccumulator((x, y) -> x + y, 0);
     private final AtomicLong _aggregatedData = new AtomicLong(0);
     private final AtomicReference<Set<String>> _uniqueMetrics = new AtomicReference<>(
-            Sets.newSetFromMap(Maps.<String, Boolean>newConcurrentMap()));
+            Collections.newSetFromMap(Maps.<String, Boolean>newConcurrentMap()));
     private final AtomicReference<Set<String>> _uniqueStatistics = new AtomicReference<>(
-            Sets.newSetFromMap(Maps.<String, Boolean>newConcurrentMap()));
+            Collections.newSetFromMap(Maps.<String, Boolean>newConcurrentMap()));
 
     private final ScheduledExecutorService _executor;
 
diff --git a/src/test/java/com/arpnetworking/metrics/common/sources/CollectdHttpSourceV1Test.java b/src/test/java/com/arpnetworking/metrics/common/sources/CollectdHttpSourceV1Test.java
@@ -26,7 +26,6 @@
 import com.arpnetworking.metrics.mad.model.Record;
 import com.arpnetworking.test.TestBeanFactory;
 import com.google.common.base.Charsets;
-import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
 import org.junit.Assert;
 import org.junit.Before;
@@ -122,7 +121,7 @@ private HttpResponse dispatchRequest(final HttpRequest request) {
         try {
             return future.get(10000, TimeUnit.MILLISECONDS);
         } catch (final InterruptedException | ExecutionException | TimeoutException e) {
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/src/test/java/com/arpnetworking/metrics/mad/performance/ApplicationPipelinePT.java b/src/test/java/com/arpnetworking/metrics/mad/performance/ApplicationPipelinePT.java
@@ -19,7 +19,6 @@
 import com.arpnetworking.test.junitbenchmarks.JsonBenchmarkConsumer;
 import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
 import com.carrotsearch.junitbenchmarks.BenchmarkRule;
-import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import org.apache.commons.math3.random.MersenneTwister;
@@ -65,7 +64,7 @@ public ApplicationPipelinePT(
             try {
                 Files.createDirectories(parent);
             } catch (final IOException e) {
-                throw Throwables.propagate(e);
+                throw new RuntimeException(e);
             }
         }
 
diff --git a/src/test/java/com/arpnetworking/utility/test/BuildableEqualsAndHashCodeTester.java b/src/test/java/com/arpnetworking/utility/test/BuildableEqualsAndHashCodeTester.java
@@ -16,7 +16,6 @@
 package com.arpnetworking.utility.test;
 
 import com.arpnetworking.commons.builder.Builder;
-import com.google.common.base.Throwables;
 
 import org.junit.Assert;
 
@@ -84,7 +83,7 @@ public static <T> void assertEqualsAndHashCode(final Builder<T> builderA, final
 
                 } catch (final SecurityException | IllegalAccessException
                         | IllegalArgumentException | InvocationTargetException e) {
-                    throw Throwables.propagate(e);
+                    throw new RuntimeException(e);
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`import com.arpnetworking.steno.Logger;`
`21`	`21`	`import com.arpnetworking.steno.LoggerFactory;`
`22`	`22`	`import com.fasterxml.jackson.databind.JsonNode;`
`23`		`-import com.google.common.base.Throwables;`
`24`	`23`	`import net.sf.oval.constraint.NotEmpty;`
`25`	`24`	`import net.sf.oval.constraint.NotNull;`
`26`	`25`	`import org.apache.http.client.utils.URIBuilder;`
`@@ -97,7 +96,7 @@ private JsonNodePaginatedUriSource(final Builder builder) {`
`97`	`96`	`}`
`98`	`97`	`}`
`99`	`98`	`} catch (final URISyntaxException e) {`
`100`		`- throw Throwables.propagate(e);`
	`99`	`+ throw new RuntimeException(e);`
`101`	`100`	`}`
`102`	`101`
`103`	`102`	`_mergingSource = mergingSourceBuilder.build();`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`	`import com.arpnetworking.steno.LogValueMapFactory;`
`22`	`22`	`import com.arpnetworking.steno.Logger;`
`23`	`23`	`import com.arpnetworking.steno.LoggerFactory;`
`24`		`-import com.google.common.base.Throwables;`
`25`	`24`	`import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;`
`26`	`25`	`import net.sf.oval.constraint.NotNull;`
`27`	`26`
`@@ -128,7 +127,7 @@ private FileTrigger(final Builder builder) {`
`128`	`127`	`try {`
`129`	`128`	`_md5 = MessageDigest.getInstance("MD5");`
`130`	`129`	`} catch (final NoSuchAlgorithmException e) {`
`131`		`- throw Throwables.propagate(e);`
	`130`	`+ throw new RuntimeException(e);`
`132`	`131`	`}`
`133`	`132`	`}`
`134`	`133`