Rename MeasureBatchRecorder to BatchRecorder to allow other types to be recorded. (#675)

* Rename MeasureBatchRecorder to BatchRecorder to allow other types to be recorded.

Signed-off-by: Bogdan Drutu <[email protected]>

* ./gradlew goJF

Signed-off-by: Bogdan Drutu <[email protected]>

Author: bogdandrutu

api/src/main/java/io/opentelemetry/metrics/MeasureBatchRecorder.java renamed to api/src/main/java/io/opentelemetry/metrics/BatchRecorder.java

@@ -19,13 +19,13 @@
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
- * Util class that can be use to atomically record measurements associated with a set of Measures.
+ * Util class that can be use to atomically record measurements associated with a set of Metrics.
  *
  * <p>This class is equivalent with individually calling record on every Measure, but has the
  * advantage that all these operations are recorded atomically and it is more efficient.
  */
 @ThreadSafe
-public interface MeasureBatchRecorder {
+public interface BatchRecorder {
   /**
    * Associates the {@link MeasureLong} with the given value. Subsequent updates to the same {@link
    * MeasureLong} will overwrite the previous value.
@@ -36,7 +36,7 @@ public interface MeasureBatchRecorder {
    * @throws IllegalArgumentException if value is negative.
    * @since 0.1.0
    */
-  MeasureBatchRecorder put(MeasureLong measure, long value);
+  BatchRecorder put(MeasureLong measure, long value);
 
   /**
    * Associates the {@link MeasureDouble} with the given value. Subsequent updates to the same
@@ -48,7 +48,7 @@ public interface MeasureBatchRecorder {
    * @throws IllegalArgumentException if value is negative.
    * @since 0.1.0
    */
-  MeasureBatchRecorder put(MeasureDouble measure, double value);
+  BatchRecorder put(MeasureDouble measure, double value);
 
   /**
    * Records all of the measures at the same time.

api/src/main/java/io/opentelemetry/metrics/DefaultMeter.java

@@ -119,8 +119,8 @@ public ObserverLong.Builder observerLongBuilder(String name) {
   }
 
   @Override
-  public MeasureBatchRecorder newMeasureBatchRecorder() {
-    return new NoopMeasureBatchRecorder();
+  public BatchRecorder newMeasureBatchRecorder() {
+    return new NoopBatchRecorder();
   }
 
   /** No-op implementations of GaugeLong class. */
@@ -536,18 +536,18 @@ public ObserverLong build() {
     }
   }
 
-  private static final class NoopMeasureBatchRecorder implements MeasureBatchRecorder {
-    private NoopMeasureBatchRecorder() {}
+  private static final class NoopBatchRecorder implements BatchRecorder {
+    private NoopBatchRecorder() {}
 
     @Override
-    public MeasureBatchRecorder put(MeasureLong measure, long value) {
+    public BatchRecorder put(MeasureLong measure, long value) {
       Utils.checkNotNull(measure, "measure");
       Utils.checkArgument(value >= 0, "Unsupported negative values.");
       return this;
     }
 
     @Override
-    public MeasureBatchRecorder put(MeasureDouble measure, double value) {
+    public BatchRecorder put(MeasureDouble measure, double value) {
       Utils.checkNotNull(measure, "measure");
       Utils.checkArgument(value >= 0.0, "Unsupported negative values.");
       return this;

api/src/main/java/io/opentelemetry/metrics/Meter.java

@@ -224,5 +224,5 @@ public interface Meter {
    *     measurements associated with different Measures.
    * @since 0.1.0
    */
-  MeasureBatchRecorder newMeasureBatchRecorder();
+  BatchRecorder newMeasureBatchRecorder();
 }

api/src/test/java/io/opentelemetry/OpenTelemetryTest.java

@@ -26,12 +26,12 @@
 import io.opentelemetry.distributedcontext.DistributedContext;
 import io.opentelemetry.distributedcontext.DistributedContextManager;
 import io.opentelemetry.distributedcontext.spi.DistributedContextManagerProvider;
+import io.opentelemetry.metrics.BatchRecorder;
 import io.opentelemetry.metrics.CounterDouble;
 import io.opentelemetry.metrics.CounterLong;
 import io.opentelemetry.metrics.DefaultMeterFactory;
 import io.opentelemetry.metrics.GaugeDouble;
 import io.opentelemetry.metrics.GaugeLong;
-import io.opentelemetry.metrics.MeasureBatchRecorder;
 import io.opentelemetry.metrics.MeasureDouble;
 import io.opentelemetry.metrics.MeasureLong;
 import io.opentelemetry.metrics.Meter;
@@ -360,7 +360,7 @@ public ObserverLong.Builder observerLongBuilder(String name) {
 
     @Nullable
     @Override
-    public MeasureBatchRecorder newMeasureBatchRecorder() {
+    public BatchRecorder newMeasureBatchRecorder() {
       return null;
     }
 

api/src/test/java/io/opentelemetry/metrics/MeasureBatchRecorderTest.java renamed to api/src/test/java/io/opentelemetry/metrics/BatchRecorderTest.java

@@ -22,9 +22,9 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/** Tests for {@link MeasureBatchRecorder}. */
+/** Tests for {@link BatchRecorder}. */
 @RunWith(JUnit4.class)
-public class MeasureBatchRecorderTest {
+public class BatchRecorderTest {
   private static final Meter meter = DefaultMeter.getInstance();
   private static final MeasureLong measureLong = meter.measureLongBuilder("measure_long").build();
   private static final MeasureDouble measureDouble =

sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSdk.java

@@ -16,11 +16,11 @@
 
 package io.opentelemetry.sdk.metrics;
 
+import io.opentelemetry.metrics.BatchRecorder;
 import io.opentelemetry.metrics.CounterDouble;
 import io.opentelemetry.metrics.CounterLong;
 import io.opentelemetry.metrics.GaugeDouble;
 import io.opentelemetry.metrics.GaugeLong;
-import io.opentelemetry.metrics.MeasureBatchRecorder;
 import io.opentelemetry.metrics.MeasureDouble;
 import io.opentelemetry.metrics.MeasureLong;
 import io.opentelemetry.metrics.Meter;
@@ -71,7 +71,7 @@ public ObserverLong.Builder observerLongBuilder(String name) {
   }
 
   @Override
-  public MeasureBatchRecorder newMeasureBatchRecorder() {
+  public BatchRecorder newMeasureBatchRecorder() {
     throw new UnsupportedOperationException("to be implemented");
   }
 }