Remove Joda time dependency and migrate to Java 8 time. (#94)

Author: vjkoskela

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.15.3</arpnetworking.commons.version>
+    <arpnetworking.commons.version>1.16.0</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>
@@ -86,7 +86,6 @@
     <jackson.version>2.9.2</jackson.version>
     <javassist.version>3.22.0-GA</javassist.version>
     <javassist.maven.core.version>0.2.1</javassist.maven.core.version>
-    <joda.time.version>2.9.9</joda.time.version>
     <jsr305.version>3.0.2</jsr305.version>
     <logback.version>1.2.3</logback.version>
     <logback.steno.version>1.18.0</logback.steno.version>
@@ -102,7 +101,6 @@
     <scala.version>2.11</scala.version>
     <scala.library.version>2.11.7</scala.library.version>
     <slf4j.version>1.7.25</slf4j.version>
-    <statsd.client.timgroup>3.0.1</statsd.client.timgroup>
     <typesafe.config.version>1.3.1</typesafe.config.version>
     <vertx.core.version>2.1.6</vertx.core.version>
 
@@ -111,9 +109,10 @@
     <hamcrest.version>2.0.0.0</hamcrest.version>
     <junit.benchmarks.version>0.7.2</junit.benchmarks.version>
     <junit.version>4.12</junit.version>
-    <metrics.generator.version>1.2.0</metrics.generator.version>
+    <metrics.generator.version>1.2.1</metrics.generator.version>
     <mockito.version>2.12.0</mockito.version>
     <performance.test.version>1.1.0</performance.test.version>
+    <statsd.client.timgroup>3.0.1</statsd.client.timgroup>
     <wiremock.version>1.57</wiremock.version>
 
     <!-- Additional Plugins -->
@@ -504,7 +503,7 @@
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-joda</artifactId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
       <version>${jackson.version}</version>
       <scope>runtime</scope>
     </dependency>
@@ -540,11 +539,6 @@
       <artifactId>commons</artifactId>
       <version>${arpnetworking.commons.version}</version>
     </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>${joda.time.version}</version>
-    </dependency>
     <dependency>
       <groupId>net.sf.oval</groupId>
       <artifactId>oval</artifactId>

src/main/java/com/arpnetworking/configuration/jackson/DynamicConfiguration.java

@@ -25,9 +25,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import net.sf.oval.constraint.NotNull;
-import org.joda.time.DateTime;
-import org.joda.time.Duration;
 
+import java.time.Duration;
+import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -174,7 +174,7 @@ private DynamicConfiguration(final Builder builder) {
 
     private ExecutorService _triggerEvaluatorExecutor;
 
-    private static final Duration TRIGGER_EVALUATION_INTERVAL = Duration.standardSeconds(60);
+    private static final Duration TRIGGER_EVALUATION_INTERVAL = Duration.ofSeconds(60);
     private static final Logger LOGGER = LoggerFactory.getLogger(DynamicConfiguration.class);
 
     private final class TriggerEvaluator implements Runnable {
@@ -230,8 +230,8 @@ public void run() {
 
                 // Wait for the next evaluation period
                 try {
-                    final DateTime sleepTimeout = DateTime.now().plus(TRIGGER_EVALUATION_INTERVAL);
-                    while (DateTime.now().isBefore(sleepTimeout) && _isRunning) {
+                    final ZonedDateTime sleepTimeout = ZonedDateTime.now().plus(TRIGGER_EVALUATION_INTERVAL);
+                    while (ZonedDateTime.now().isBefore(sleepTimeout) && _isRunning) {
                         Thread.sleep(100);
                     }
                 } catch (final InterruptedException e) {

src/main/java/com/arpnetworking/metrics/common/sources/FileSource.java

@@ -30,12 +30,11 @@
 import com.arpnetworking.steno.LoggerFactory;
 import net.sf.oval.constraint.NotEmpty;
 import net.sf.oval.constraint.NotNull;
-import org.joda.time.DateTime;
-import org.joda.time.Duration;
-import org.joda.time.Period;
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.time.Duration;
+import java.time.ZonedDateTime;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -127,7 +126,7 @@ private FileSource(final Builder<T> builder) {
     private final Logger _logger;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FileSource.class);
-    private static final Period FILE_NOT_FOUND_WARNING_INTERVAL = Period.minutes(1);
+    private static final Duration FILE_NOT_FOUND_WARNING_INTERVAL = Duration.ofMinutes(1);
     private static final NoPositionStore NO_POSITION_STORE = new NoPositionStore();
 
     private class LogTailerListener implements TailerListener {
@@ -142,7 +141,7 @@ public void initialize(final Tailer tailer) {
 
         @Override
         public void fileNotFound() {
-            final DateTime now = DateTime.now();
+            final ZonedDateTime now = ZonedDateTime.now();
             if (!_lastFileNotFoundWarning.isPresent()
                     || _lastFileNotFoundWarning.get().isBefore(now.minus(FILE_NOT_FOUND_WARNING_INTERVAL))) {
                 _logger.warn()
@@ -221,7 +220,7 @@ public void handle(final Throwable t) {
             }
         }
 
-        private Optional<DateTime> _lastFileNotFoundWarning = Optional.empty();
+        private Optional<ZonedDateTime> _lastFileNotFoundWarning = Optional.empty();
     }
 
     /**
@@ -306,7 +305,7 @@ protected Builder<T> self() {
         @NotEmpty
         private Path _sourceFile;
         @NotNull
-        private Duration _interval = Duration.millis(500);
+        private Duration _interval = Duration.ofMillis(500);
         @NotNull
         private Parser<T, byte[]> _parser;
         private Path _stateFile;

src/main/java/com/arpnetworking/metrics/common/tailer/FilePositionStore.java

@@ -27,14 +27,14 @@
 import com.google.common.collect.Maps;
 import net.sf.oval.constraint.Min;
 import net.sf.oval.constraint.NotNull;
-import org.joda.time.DateTime;
-import org.joda.time.Duration;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.time.Duration;
+import java.time.ZonedDateTime;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Optional;
@@ -66,7 +66,7 @@ public void setPosition(final String identifier, final long position) {
                         .setPosition(position)
                         .build());
 
-        final DateTime now = DateTime.now();
+        final ZonedDateTime now = ZonedDateTime.now();
         boolean requiresFlush = now.minus(_flushInterval).isAfter(_lastFlush);
         if (descriptor != null) {
             descriptor.update(position, now);
@@ -105,8 +105,8 @@ public String toString() {
 
     private void flush() {
         // Age out old state
-        final DateTime now = DateTime.now();
-        final DateTime oldest = now.minus(_retention);
+        final ZonedDateTime now = ZonedDateTime.now();
+        final ZonedDateTime oldest = now.minus(_retention);
         final long sizeBefore = _state.size();
         final Iterator<Map.Entry<String, Descriptor>> iterator = _state.entrySet().iterator();
         while (iterator.hasNext()) {
@@ -171,7 +171,7 @@ private FilePositionStore(final Builder builder) {
     private final Duration _retention;
     private final ConcurrentMap<String, Descriptor> _state;
 
-    private DateTime _lastFlush = DateTime.now();
+    private ZonedDateTime _lastFlush = ZonedDateTime.now();
 
     private static final TypeReference<ConcurrentMap<String, Descriptor>> STATE_MAP_TYPE_REFERENCE =
             new TypeReference<ConcurrentMap<String, Descriptor>>(){};
@@ -180,7 +180,7 @@ private FilePositionStore(final Builder builder) {
 
     private static final class Descriptor {
 
-        public void update(final long position, final DateTime updatedAt) {
+        public void update(final long position, final ZonedDateTime updatedAt) {
             _delta += position - _position;
             _lastUpdated = updatedAt;
             _position = position;
@@ -194,7 +194,7 @@ public long getPosition() {
             return _position;
         }
 
-        public DateTime getLastUpdated() {
+        public ZonedDateTime getLastUpdated() {
             return _lastUpdated;
         }
 
@@ -210,7 +210,7 @@ private Descriptor(final Builder builder) {
         }
 
         private long _position;
-        private DateTime _lastUpdated;
+        private ZonedDateTime _lastUpdated;
         private long _delta;
 
         private static final class Builder extends OvalBuilder<Descriptor> {
@@ -224,15 +224,15 @@ public Builder setPosition(final Long value) {
                 return this;
             }
 
-            public Builder setLastUpdated(final DateTime value) {
+            public Builder setLastUpdated(final ZonedDateTime value) {
                 _lastUpdated = value;
                 return this;
             }
 
             @NotNull
             private Long _position;
             @NotNull
-            private DateTime _lastUpdated = DateTime.now();
+            private ZonedDateTime _lastUpdated = ZonedDateTime.now();
         }
     }
 
@@ -300,11 +300,11 @@ public Builder setRetention(final Duration value) {
         @NotNull
         private Path _file;
         @NotNull
-        private Duration _flushInterval = Duration.standardSeconds(10);
+        private Duration _flushInterval = Duration.ofSeconds(10);
         @NotNull
         @Min(0)
         private Long _flushThreshold = 10485760L; // 2^20 * 10 = (10 Mebibyte)
         @NotNull
-        private Duration _retention = Duration.standardDays(1);
+        private Duration _retention = Duration.ofDays(1);
     }
 }

src/main/java/com/arpnetworking/metrics/common/tailer/StatefulTailer.java

@@ -24,7 +24,6 @@
 import com.arpnetworking.utility.Trigger;
 import com.google.common.base.MoreObjects;
 import net.sf.oval.constraint.NotNull;
-import org.joda.time.Duration;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -37,6 +36,7 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.time.Duration;
 import java.util.Objects;
 import java.util.Optional;
 import javax.xml.bind.DatatypeConverter;
@@ -672,7 +672,7 @@ public Builder setMaximumOffsetOnResume(final Long maximumOffsetOnResume) {
         @NotNull
         private TailerListener _listener;
         @NotNull
-        private Duration _readInterval = Duration.millis(250);
+        private Duration _readInterval = Duration.ofMillis(250);
         @NotNull
         private InitialPosition _initialPosition = InitialPosition.START;
         private Long _maximumOffsetOnResume = null;

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

@@ -37,8 +37,8 @@
 import com.google.common.collect.Maps;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import net.sf.oval.constraint.NotNull;
-import org.joda.time.Period;
 
+import java.time.Duration;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -141,7 +141,7 @@ public String toString() {
 
     private List<PeriodWorker> createPeriodWorkers(final Key key) {
         final List<PeriodWorker> periodWorkerList = Lists.newArrayListWithExpectedSize(_periods.size());
-        for (final Period period : _periods) {
+        for (final Duration period : _periods) {
             final PeriodWorker periodWorker = new PeriodWorker.Builder()
                     .setPeriod(period)
                     .setBucketBuilder(
@@ -229,7 +229,7 @@ public Optional<ImmutableSet<Statistic>> load(final String metric) throws Except
                         });
 }
 
-    private final ImmutableSet<Period> _periods;
+    private final ImmutableSet<Duration> _periods;
     private final Sink _sink;
     private final ImmutableSet<Statistic> _specifiedTimerStatistics;
     private final ImmutableSet<Statistic> _specifiedCounterStatistics;
@@ -275,7 +275,7 @@ public Builder setSink(final Sink value) {
          * @param value The periods.
          * @return This <code>Builder</code> instance.
          */
-        public Builder setPeriods(final Set<Period> value) {
+        public Builder setPeriods(final Set<Duration> value) {
             _periods = value;
             return this;
         }
@@ -328,7 +328,7 @@ public Builder setStatistics(final Map<String, Set<Statistic>> value) {
         @NotNull
         private Sink _sink;
         @NotNull
-        private Set<Period> _periods;
+        private Set<Duration> _periods;
         @NotNull
         private Set<Statistic> _timerStatistics;
         @NotNull

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

@@ -39,10 +39,9 @@
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import net.sf.oval.constraint.NotNull;
-import org.joda.time.DateTime;
-import org.joda.time.Period;
 
 import java.time.Duration;
+import java.time.ZonedDateTime;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
@@ -187,7 +186,7 @@ public void add(final Record record) {
         }
     }
 
-    public DateTime getStart() {
+    public ZonedDateTime getStart() {
         return _start;
     }
 
@@ -298,7 +297,7 @@ private void computeStatistics(
     private void addMetric(
             final String name,
             final Metric metric,
-            final DateTime time,
+            final ZonedDateTime time,
             final Collection<Calculator<?>> calculators) {
 
         try {
@@ -382,8 +381,8 @@ private Collection<Calculator<?>> getOrCreateCalculators(
     private final ConcurrentMap<String, Collection<Calculator<?>>> _explicitMetricCalculators = Maps.newConcurrentMap();
     private final Sink _sink;
     private final Key _key;
-    private final DateTime _start;
-    private final Period _period;
+    private final ZonedDateTime _start;
+    private final Duration _period;
     private final ImmutableSet<Statistic> _specifiedCounterStatistics;
     private final ImmutableSet<Statistic> _specifiedGaugeStatistics;
     private final ImmutableSet<Statistic> _specifiedTimerStatistics;
@@ -509,7 +508,7 @@ public Builder setDependentGaugeStatistics(final ImmutableSet<Statistic> value)
          * @param value The start.
          * @return This <code>Builder</code> instance.
          */
-        public Builder setStart(final DateTime value) {
+        public Builder setStart(final ZonedDateTime value) {
             _start = value;
             return this;
         }
@@ -520,7 +519,7 @@ public Builder setStart(final DateTime value) {
          * @param value The period.
          * @return This <code>Builder</code> instance.
          */
-        public Builder setPeriod(final Period value) {
+        public Builder setPeriod(final Duration value) {
             _period = value;
             return this;
         }
@@ -579,9 +578,9 @@ public String toString() {
         @NotNull
         private Key _key;
         @NotNull
-        private DateTime _start;
+        private ZonedDateTime _start;
         @NotNull
-        private Period _period;
+        private Duration _period;
         @NotNull
         private ImmutableSet<Statistic> _specifiedTimerStatistics;
         @NotNull

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

@@ -188,7 +188,7 @@ private void launchJvmMetricsCollector(final Injector injector) {
         _jvmMetricsCollector.scheduleAtFixedRate(
                 runnable,
                 INITIAL_DELAY_IN_MILLIS,
-                _configuration.getJvmMetricsCollectionInterval().toStandardDuration().getMillis(),
+                _configuration.getJvmMetricsCollectionInterval().toMillis(),
                 TIME_UNIT);
     }