Remove joda time dependency

Use Java 8 Instant class for time instances and Range<Instant> for time
ranges.

Author: cornmander

metrics/pom.xml

@@ -38,12 +38,6 @@
       <artifactId>error_prone_annotations</artifactId>
       <version>2.1.3</version>
     </dependency>
-    <!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>2.9.9</version>
-    </dependency>
     <!-- https://mvnrepository.com/artifact/com.google.re2j/re2j -->
     <dependency>
       <groupId>com.google.re2j</groupId>

metrics/src/main/java/com/google/monitoring/metrics/Counter.java

@@ -25,11 +25,11 @@
 import com.google.common.util.concurrent.AtomicLongMap;
 import com.google.common.util.concurrent.Striped;
 import com.google.monitoring.metrics.MetricSchema.Kind;
+import java.time.Instant;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
 import javax.annotation.concurrent.ThreadSafe;
-import org.joda.time.Instant;
 
 /**
  * A metric which stores Long values. It is stateful and can be changed in increments.
@@ -145,7 +145,6 @@ final ImmutableList<MetricPoint<Long>> getTimestampedValues(Instant endTimestamp
 
       timestampedValues.add(
           MetricPoint.create(this, labelValues, startTimestamp, endTimestamp, entry.getValue()));
-
     }
     return timestampedValues.build();
   }

metrics/src/main/java/com/google/monitoring/metrics/EventMetric.java

@@ -23,10 +23,10 @@
 import com.google.common.collect.Ordering;
 import com.google.common.util.concurrent.Striped;
 import com.google.monitoring.metrics.MetricSchema.Kind;
+import java.time.Instant;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
-import org.joda.time.Instant;
 
 /**
  * A metric which stores {@link Distribution} values. The values are stateful and meant to be

metrics/src/main/java/com/google/monitoring/metrics/MetricPoint.java

@@ -17,12 +17,12 @@
 import com.google.auto.value.AutoValue;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
-import org.joda.time.Instant;
-import org.joda.time.Interval;
+import com.google.common.collect.Range;
+import java.time.Instant;
 
 /**
  * Value type class to store a snapshot of a {@link Metric} value for a given label value tuple and
- * time {@link Interval}.
+ * time {@link Range}.
  */
 @AutoValue
 public abstract class MetricPoint<V> implements Comparable<MetricPoint<V>> {
@@ -39,11 +39,11 @@ public static <V> MetricPoint<V> create(
     MetricsUtils.checkLabelValuesLength(metric, labelValues);
 
     return new AutoValue_MetricPoint<>(
-        metric, labelValues, new Interval(timestamp, timestamp), value);
+        metric, labelValues, Range.openClosed(timestamp, timestamp), value);
   }
 
   /**
-   * Returns a new {@link MetricPoint} representing a value over an {@link Interval} from {@code
+   * Returns a new {@link MetricPoint} representing a value over an {@link Range} from {@code
    * startTime} to {@code endTime}.
    *
    * <p>Callers should insure that the count of {@code labelValues} matches the count of labels for
@@ -59,14 +59,14 @@ public static <V> MetricPoint<V> create(
     MetricsUtils.checkLabelValuesLength(metric, labelValues);
 
     return new AutoValue_MetricPoint<>(
-        metric, labelValues, new Interval(startTime, endTime), value);
+        metric, labelValues, Range.openClosed(startTime, endTime), value);
   }
 
   public abstract Metric<V> metric();
 
   public abstract ImmutableList<String> labelValues();
 
-  public abstract Interval interval();
+  public abstract Range<Instant> interval();
 
   public abstract V value();
 

metrics/src/main/java/com/google/monitoring/metrics/StoredMetric.java

@@ -19,10 +19,10 @@
 import com.google.common.collect.ImmutableList.Builder;
 import com.google.common.collect.ImmutableSet;
 import com.google.monitoring.metrics.MetricSchema.Kind;
+import java.time.Instant;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.concurrent.ThreadSafe;
-import org.joda.time.Instant;
 
 /**
  * A metric which is stateful.

metrics/src/main/java/com/google/monitoring/metrics/VirtualMetric.java

@@ -20,9 +20,9 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.monitoring.metrics.MetricSchema.Kind;
+import java.time.Instant;
 import java.util.Map.Entry;
 import javax.annotation.concurrent.ThreadSafe;
-import org.joda.time.Instant;
 
 /**
  * A metric whose value is computed at sample-time.

metrics/src/test/java/com/google/monitoring/metrics/CounterTest.java

@@ -19,14 +19,15 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import org.joda.time.Instant;
+import java.time.Instant;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 /** Unit tests for {@link Counter}. */
 @RunWith(JUnit4.class)
 public class CounterTest {
+
   @Test
   public void testGetCardinality_reflectsCurrentCardinality() {
     Counter counter =
@@ -75,15 +76,17 @@ public void testIncrement_incrementsValues() {
     assertThat(counter.getTimestampedValues()).isEmpty();
 
     // use package-private incrementBy once to set the start timestamp predictably.
-    counter.incrementBy(1, new Instant(1337), ImmutableList.of("test_value1"));
-    assertThat(counter.getTimestampedValues(new Instant(1337)))
+    counter.incrementBy(1, Instant.ofEpochMilli(1337), ImmutableList.of("test_value1"));
+    assertThat(counter.getTimestampedValues(Instant.ofEpochMilli(1337)))
         .containsExactly(
-            MetricPoint.create(counter, ImmutableList.of("test_value1"), new Instant(1337), 1L));
+            MetricPoint.create(
+                counter, ImmutableList.of("test_value1"), Instant.ofEpochMilli(1337), 1L));
 
     counter.increment("test_value1");
-    assertThat(counter.getTimestampedValues(new Instant(1337)))
+    assertThat(counter.getTimestampedValues(Instant.ofEpochMilli(1337)))
         .containsExactly(
-            MetricPoint.create(counter, ImmutableList.of("test_value1"), new Instant(1337), 2L));
+            MetricPoint.create(
+                counter, ImmutableList.of("test_value1"), Instant.ofEpochMilli(1337), 2L));
   }
 
   @Test
@@ -97,17 +100,20 @@ public void testIncrementBy_incrementsValues() {
 
     assertThat(counter.getTimestampedValues()).isEmpty();
 
-    counter.incrementBy(1, new Instant(1337), ImmutableList.of("test_value1"));
-    assertThat(counter.getTimestampedValues(new Instant(1337)))
+    counter.incrementBy(1, Instant.ofEpochMilli(1337), ImmutableList.of("test_value1"));
+    assertThat(counter.getTimestampedValues(Instant.ofEpochMilli(1337)))
         .containsExactly(
-            MetricPoint.create(counter, ImmutableList.of("test_value1"), new Instant(1337), 1L));
+            MetricPoint.create(
+                counter, ImmutableList.of("test_value1"), Instant.ofEpochMilli(1337), 1L));
 
-    counter.set(-10L, new Instant(1337), ImmutableList.of("test_value2"));
-    counter.incrementBy(5, new Instant(1337), ImmutableList.of("test_value2"));
-    assertThat(counter.getTimestampedValues(new Instant(1337)))
+    counter.set(-10L, Instant.ofEpochMilli(1337), ImmutableList.of("test_value2"));
+    counter.incrementBy(5, Instant.ofEpochMilli(1337), ImmutableList.of("test_value2"));
+    assertThat(counter.getTimestampedValues(Instant.ofEpochMilli(1337)))
         .containsExactly(
-            MetricPoint.create(counter, ImmutableList.of("test_value1"), new Instant(1337), 1L),
-            MetricPoint.create(counter, ImmutableList.of("test_value2"), new Instant(1337), -5L));
+            MetricPoint.create(
+                counter, ImmutableList.of("test_value1"), Instant.ofEpochMilli(1337), 1L),
+            MetricPoint.create(
+                counter, ImmutableList.of("test_value2"), Instant.ofEpochMilli(1337), -5L));
   }
 
   @Test
@@ -133,24 +139,40 @@ public void testResetAll_resetsAllValuesAndStartTimestamps() {
             "vdn",
             ImmutableSet.of(LabelDescriptor.create("label1", "bar")));
 
-    counter.incrementBy(3, new Instant(1337), ImmutableList.of("foo"));
-    counter.incrementBy(5, new Instant(1338), ImmutableList.of("moo"));
+    counter.incrementBy(3, Instant.ofEpochMilli(1337), ImmutableList.of("foo"));
+    counter.incrementBy(5, Instant.ofEpochMilli(1338), ImmutableList.of("moo"));
 
-    assertThat(counter.getTimestampedValues(new Instant(1400)))
+    assertThat(counter.getTimestampedValues(Instant.ofEpochMilli(1400)))
         .containsExactly(
             MetricPoint.create(
-                counter, ImmutableList.of("foo"), new Instant(1337), new Instant(1400), 3L),
+                counter,
+                ImmutableList.of("foo"),
+                Instant.ofEpochMilli(1337),
+                Instant.ofEpochMilli(1400),
+                3L),
             MetricPoint.create(
-                counter, ImmutableList.of("moo"), new Instant(1338), new Instant(1400), 5L));
+                counter,
+                ImmutableList.of("moo"),
+                Instant.ofEpochMilli(1338),
+                Instant.ofEpochMilli(1400),
+                5L));
 
-    counter.reset(new Instant(1339));
+    counter.reset(Instant.ofEpochMilli(1339));
 
-    assertThat(counter.getTimestampedValues(new Instant(1400)))
+    assertThat(counter.getTimestampedValues(Instant.ofEpochMilli(1400)))
         .containsExactly(
             MetricPoint.create(
-                counter, ImmutableList.of("foo"), new Instant(1339), new Instant(1400), 0L),
+                counter,
+                ImmutableList.of("foo"),
+                Instant.ofEpochMilli(1339),
+                Instant.ofEpochMilli(1400),
+                0L),
             MetricPoint.create(
-                counter, ImmutableList.of("moo"), new Instant(1339), new Instant(1400), 0L));
+                counter,
+                ImmutableList.of("moo"),
+                Instant.ofEpochMilli(1339),
+                Instant.ofEpochMilli(1400),
+                0L));
   }
 
   @Test
@@ -162,23 +184,39 @@ public void testReset_resetsValuesAndStartTimestamps() {
             "vdn",
             ImmutableSet.of(LabelDescriptor.create("label1", "bar")));
 
-    counter.incrementBy(3, new Instant(1337), ImmutableList.of("foo"));
-    counter.incrementBy(5, new Instant(1338), ImmutableList.of("moo"));
+    counter.incrementBy(3, Instant.ofEpochMilli(1337), ImmutableList.of("foo"));
+    counter.incrementBy(5, Instant.ofEpochMilli(1338), ImmutableList.of("moo"));
 
-    assertThat(counter.getTimestampedValues(new Instant(1400)))
+    assertThat(counter.getTimestampedValues(Instant.ofEpochMilli(1400)))
         .containsExactly(
             MetricPoint.create(
-                counter, ImmutableList.of("foo"), new Instant(1337), new Instant(1400), 3L),
+                counter,
+                ImmutableList.of("foo"),
+                Instant.ofEpochMilli(1337),
+                Instant.ofEpochMilli(1400),
+                3L),
             MetricPoint.create(
-                counter, ImmutableList.of("moo"), new Instant(1338), new Instant(1400), 5L));
+                counter,
+                ImmutableList.of("moo"),
+                Instant.ofEpochMilli(1338),
+                Instant.ofEpochMilli(1400),
+                5L));
 
-    counter.reset(new Instant(1339), ImmutableList.of("foo"));
+    counter.reset(Instant.ofEpochMilli(1339), ImmutableList.of("foo"));
 
-    assertThat(counter.getTimestampedValues(new Instant(1400)))
+    assertThat(counter.getTimestampedValues(Instant.ofEpochMilli(1400)))
         .containsExactly(
             MetricPoint.create(
-                counter, ImmutableList.of("foo"), new Instant(1339), new Instant(1400), 0L),
+                counter,
+                ImmutableList.of("foo"),
+                Instant.ofEpochMilli(1339),
+                Instant.ofEpochMilli(1400),
+                0L),
             MetricPoint.create(
-                counter, ImmutableList.of("moo"), new Instant(1338), new Instant(1400), 5L));
+                counter,
+                ImmutableList.of("moo"),
+                Instant.ofEpochMilli(1338),
+                Instant.ofEpochMilli(1400),
+                5L));
   }
 }