Move MeasureMap from the API to the implementation.

3 files changed, 8 insertions, 158 deletions

diff --git a/api/src/test/java/io/opencensus/stats/MeasureMapTest.java b/api/src/test/java/io/opencensus/stats/MeasureMapTest.java
deleted file mode 100644
index 1a408e85..00000000
--- a/api/src/test/java/io/opencensus/stats/MeasureMapTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2016-17, OpenCensus Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.opencensus.stats;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.common.collect.Lists;
-import io.opencensus.stats.Measure.MeasureDouble;
-import io.opencensus.stats.Measure.MeasureLong;
-import io.opencensus.stats.Measurement.MeasurementDouble;
-import io.opencensus.stats.Measurement.MeasurementLong;
-import java.util.ArrayList;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Tests for {@link MeasureMap}. */
-@RunWith(JUnit4.class)
-public class MeasureMapTest {
-
-  @Test
-  public void testPutDouble() {
-    MeasureMap metrics = MeasureMap.builder().put(M1, 44.4).build();
-    assertContains(metrics, MeasurementDouble.create(M1, 44.4));
-  }
-
-  @Test
-  public void testPutLong() {
-    MeasureMap metrics = MeasureMap.builder().put(M3, 9999L).put(M4, 8888L).build();
-    assertContains(metrics,
-        MeasurementLong.create(M3, 9999L),
-        MeasurementLong.create(M4, 8888L));
-  }
-
-  @Test
-  public void testCombination() {
-    MeasureMap metrics =
-        MeasureMap.builder().put(M1, 44.4).put(M2, 66.6).put(M3, 9999L).put(M4, 8888L).build();
-    assertContains(metrics,
-        MeasurementDouble.create(M1, 44.4),
-        MeasurementDouble.create(M2, 66.6),
-        MeasurementLong.create(M3, 9999L),
-        MeasurementLong.create(M4, 8888L));
-  }
-
-  @Test
-  public void testBuilderEmpty() {
-    MeasureMap metrics = MeasureMap.builder().build();
-    assertContains(metrics);
-  }
-
-  @Test
-  public void testBuilder() {
-    ArrayList<Measurement> expected = new ArrayList<Measurement>(10);
-    MeasureMap.Builder builder = MeasureMap.builder();
-    for (int i = 1; i <= 10; i++) {
-      expected
-          .add(MeasurementDouble.create(makeSimpleMeasureDouble("m" + i), i * 11.1));
-      builder.put(makeSimpleMeasureDouble("m" + i), i * 11.1);
-      assertContains(builder.build(), expected.toArray(new Measurement[i]));
-    }
-  }
-
-  @Test
-  public void testDuplicateMeasureDoubles() {
-    assertContains(MeasureMap.builder().put(M1, 1.0).put(M1, 2.0).build(),
-        MeasurementDouble.create(M1, 2.0));
-    assertContains(MeasureMap.builder().put(M1, 1.0).put(M1, 2.0).put(M1, 3.0).build(),
-        MeasurementDouble.create(M1, 3.0));
-    assertContains(MeasureMap.builder().put(M1, 1.0).put(M2, 2.0).put(M1, 3.0).build(),
-        MeasurementDouble.create(M1, 3.0),
-        MeasurementDouble.create(M2, 2.0));
-    assertContains(MeasureMap.builder().put(M1, 1.0).put(M1, 2.0).put(M2, 2.0).build(),
-        MeasurementDouble.create(M1, 2.0),
-        MeasurementDouble.create(M2, 2.0));
-  }
-
-  @Test
-  public void testDuplicateMeasureLongs() {
-    assertContains(MeasureMap.builder().put(M3, 100L).put(M3, 100L).build(),
-        MeasurementLong.create(M3, 100L));
-    assertContains(MeasureMap.builder().put(M3, 100L).put(M3, 200L).put(M3, 300L).build(),
-        MeasurementLong.create(M3, 300L));
-    assertContains(MeasureMap.builder().put(M3, 100L).put(M4, 200L).put(M3, 300L).build(),
-        MeasurementLong.create(M3, 300L),
-        MeasurementLong.create(M4, 200L));
-    assertContains(MeasureMap.builder().put(M3, 100L).put(M3, 200L).put(M4, 200L).build(),
-        MeasurementLong.create(M3, 200L),
-        MeasurementLong.create(M4, 200L));
-  }
-
-  @Test
-  public void testDuplicateMeasures() {
-    assertContains(MeasureMap.builder().put(M3, 100L).put(M1, 1.0).put(M3, 300L).build(),
-        MeasurementLong.create(M3, 300L),
-        MeasurementDouble.create(M1, 1.0));
-    assertContains(MeasureMap.builder().put(M2, 2.0).put(M3, 100L).put(M2, 3.0).build(),
-        MeasurementDouble.create(M2, 3.0),
-        MeasurementLong.create(M3, 100L));
-  }
-
-  private static final MeasureDouble M1 = makeSimpleMeasureDouble("m1");
-  private static final MeasureDouble M2 = makeSimpleMeasureDouble("m2");
-  private static final MeasureLong M3 = makeSimpleMeasureLong("m3");
-  private static final MeasureLong M4 = makeSimpleMeasureLong("m4");
-
-  private static MeasureDouble makeSimpleMeasureDouble(String measure) {
-    return Measure.MeasureDouble.create(measure, measure + " description", "1");
-  }
-
-  private static MeasureLong makeSimpleMeasureLong(String measure) {
-    return Measure.MeasureLong.create(measure, measure + " description", "1");
-  }
-
-  private static void assertContains(MeasureMap metrics, Measurement... measurements) {
-    assertThat(Lists.newArrayList(metrics.iterator())).containsExactly((Object[]) measurements);
-  }
-}
diff --git a/api/src/test/java/io/opencensus/stats/NoopStatsTest.java b/api/src/test/java/io/opencensus/stats/NoopStatsTest.java
index 8348adc4..d40ba006 100644
--- a/api/src/test/java/io/opencensus/stats/NoopStatsTest.java
+++ b/api/src/test/java/io/opencensus/stats/NoopStatsTest.java
@@ -86,33 +86,20 @@ public final class NoopStatsTest {
   // exception.
   @Test
   public void noopStatsRecorder_Record() {
-    NoopStats.getNoopStatsRecorder()
-        .record(tagContext, MeasureMap.builder().put(MEASURE, 5).build());
+    NoopStats.getNoopStatsRecorder().builder(tagContext).put(MEASURE, 5).record();
   }
 
   // The NoopStatsRecorder should do nothing, so this test just checks that record doesn't throw an
   // exception.
   @Test
   public void noopStatsRecorder_RecordWithCurrentContext() {
-    NoopStats.getNoopStatsRecorder().record(MeasureMap.builder().put(MEASURE, 6).build());
+    NoopStats.getNoopStatsRecorder().builder().put(MEASURE, 6).record();
   }
 
   @Test
   public void noopStatsRecorder_Record_DisallowNullTagContext() {
-    MeasureMap measures = MeasureMap.builder().put(MEASURE, 7).build();
+    StatsRecorder noopStatsRecorder = NoopStats.getNoopStatsRecorder();
     thrown.expect(NullPointerException.class);
-    NoopStats.getNoopStatsRecorder().record(null, measures);
-  }
-
-  @Test
-  public void noopStatsRecorder_Record_DisallowNullMeasureMap() {
-    thrown.expect(NullPointerException.class);
-    NoopStats.getNoopStatsRecorder().record(tagContext, null);
-  }
-
-  @Test
-  public void noopStatsRecorder_RecordWithCurrentContext_DisallowNullMeasureMap() {
-    thrown.expect(NullPointerException.class);
-    NoopStats.getNoopStatsRecorder().record(null);
+    noopStatsRecorder.builder(null);
   }
 }
diff --git a/api/src/test/java/io/opencensus/stats/StatsRecorderTest.java b/api/src/test/java/io/opencensus/stats/StatsRecorderTest.java
index 793da8a0..e1a10729 100644
--- a/api/src/test/java/io/opencensus/stats/StatsRecorderTest.java
+++ b/api/src/test/java/io/opencensus/stats/StatsRecorderTest.java
@@ -20,7 +20,6 @@ import static org.mockito.Matchers.same;
 import static org.mockito.Mockito.verify;
 
 import io.grpc.Context;
-import io.opencensus.stats.Measure.MeasureDouble;
 import io.opencensus.tags.Tag;
 import io.opencensus.tags.Tag.TagString;
 import io.opencensus.tags.TagContext;
@@ -41,8 +40,6 @@ import org.mockito.MockitoAnnotations;
 public final class StatsRecorderTest {
   private static final TagString TAG =
       TagString.create(TagKeyString.create("key"), TagValueString.create("value"));
-  private static final MeasureDouble MEASURE =
-      Measure.MeasureDouble.create("my measure", "description", "bit/s");
 
   private final TagContext tagContext =
       new TagContext() {
@@ -62,18 +59,16 @@ public final class StatsRecorderTest {
 
   @Test
   public void record_CurrentContextNotSet() {
-    MeasureMap measures = MeasureMap.builder().put(MEASURE, 1.0).build();
-    statsRecorder.record(measures);
-    verify(statsRecorder).record(same(ContextUtils.TAG_CONTEXT_KEY.get()), same(measures));
+    statsRecorder.builder();
+    verify(statsRecorder).builder(same(ContextUtils.TAG_CONTEXT_KEY.get()));
   }
 
   @Test
   public void record_CurrentContextSet() {
     Context orig = Context.current().withValue(ContextUtils.TAG_CONTEXT_KEY, tagContext).attach();
     try {
-      MeasureMap measures = MeasureMap.builder().put(MEASURE, 2.0).build();
-      statsRecorder.record(measures);
-      verify(statsRecorder).record(same(tagContext), same(measures));
+      statsRecorder.builder();
+      verify(statsRecorder).builder(same(tagContext));
     } finally {
       Context.current().detach(orig);
     }