Rename base classes to abstract class (#832)

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

sdk/src/main/java/io/opentelemetry/sdk/metrics/BaseBoundInstrument.java → sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractBoundInstrument.java

@@ -18,10 +18,10 @@
 
 import io.opentelemetry.metrics.LabelSet;
 
-class BaseBoundInstrument {
+class AbstractBoundInstrument {
  private final LabelSet labels;
 
- BaseBoundInstrument(LabelSet labels) {
+ AbstractBoundInstrument(LabelSet labels) {
  this.labels = labels;
  // todo: associate with an aggregator/accumulator
  }
@@ -31,11 +31,11 @@ public boolean equals(Object o) {
  if (this == o) {
  return true;
  }
- if (!(o instanceof BaseBoundInstrument)) {
+ if (!(o instanceof AbstractBoundInstrument)) {
  return false;
  }
 
- BaseBoundInstrument that = (BaseBoundInstrument) o;
+ AbstractBoundInstrument that = (AbstractBoundInstrument) o;
 
  return labels.equals(that.labels);
  }

sdk/src/main/java/io/opentelemetry/sdk/metrics/BaseInstrument.java → sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java

@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.Map;
 
-abstract class BaseInstrument implements Instrument {
+abstract class AbstractInstrument implements Instrument {
 
  private final String name;
  private final String description;
@@ -29,7 +29,7 @@ abstract class BaseInstrument implements Instrument {
  private final List<String> labelKeys;
 
  // All arguments cannot be null because they are checked in the abstract builder classes.
- BaseInstrument(
+ AbstractInstrument(
  String name,
  String description,
  String unit,
@@ -47,11 +47,11 @@ public boolean equals(Object o) {
  if (this == o) {
  return true;
  }
- if (!(o instanceof BaseInstrument)) {
+ if (!(o instanceof AbstractInstrument)) {
  return false;
  }
 
- BaseInstrument that = (BaseInstrument) o;
+ AbstractInstrument that = (AbstractInstrument) o;
 
  return name.equals(that.name)
  && description.equals(that.description)

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

@@ -17,12 +17,11 @@
 package io.opentelemetry.sdk.metrics;
 
 import io.opentelemetry.metrics.DoubleCounter;
-import io.opentelemetry.metrics.DoubleCounter.BoundDoubleCounter;
 import io.opentelemetry.metrics.LabelSet;
 import java.util.List;
 import java.util.Map;
 
-final class DoubleCounterSdk extends BaseInstrument implements DoubleCounter {
+final class DoubleCounterSdk extends AbstractInstrument implements DoubleCounter {
 
  private final boolean monotonic;
 
@@ -76,7 +75,7 @@ public int hashCode() {
  return result;
  }
 
- private static final class Bound extends BaseBoundInstrument implements BoundDoubleCounter {
+ private static final class Bound extends AbstractBoundInstrument implements BoundDoubleCounter {
 
  private final boolean monotonic;
 

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

@@ -17,12 +17,11 @@
 package io.opentelemetry.sdk.metrics;
 
 import io.opentelemetry.metrics.DoubleMeasure;
-import io.opentelemetry.metrics.DoubleMeasure.BoundDoubleMeasure;
 import io.opentelemetry.metrics.LabelSet;
 import java.util.List;
 import java.util.Map;
 
-final class DoubleMeasureSdk extends BaseInstrument implements DoubleMeasure {
+final class DoubleMeasureSdk extends AbstractInstrument implements DoubleMeasure {
 
  private final boolean absolute;
 
@@ -76,7 +75,7 @@ public int hashCode() {
  return result;
  }
 
- private static final class Bound extends BaseBoundInstrument implements BoundDoubleMeasure {
+ private static final class Bound extends AbstractBoundInstrument implements BoundDoubleMeasure {
 
  private final boolean absolute;
 

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

@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.Map;
 
-final class DoubleObserverSdk extends BaseInstrument implements DoubleObserver {
+final class DoubleObserverSdk extends AbstractInstrument implements DoubleObserver {
  private final boolean monotonic;
 
  DoubleObserverSdk(

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

@@ -18,11 +18,10 @@
 
 import io.opentelemetry.metrics.LabelSet;
 import io.opentelemetry.metrics.LongCounter;
-import io.opentelemetry.metrics.LongCounter.BoundLongCounter;
 import java.util.List;
 import java.util.Map;
 
-final class LongCounterSdk extends BaseInstrument implements LongCounter {
+final class LongCounterSdk extends AbstractInstrument implements LongCounter {
 
  private final boolean monotonic;
 
@@ -76,7 +75,7 @@ public int hashCode() {
  return result;
  }
 
- private static final class Bound extends BaseBoundInstrument implements BoundLongCounter {
+ private static final class Bound extends AbstractBoundInstrument implements BoundLongCounter {
 
  private final boolean monotonic;
 

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

@@ -18,11 +18,10 @@
 
 import io.opentelemetry.metrics.LabelSet;
 import io.opentelemetry.metrics.LongMeasure;
-import io.opentelemetry.metrics.LongMeasure.BoundLongMeasure;
 import java.util.List;
 import java.util.Map;
 
-final class LongMeasureSdk extends BaseInstrument implements LongMeasure {
+final class LongMeasureSdk extends AbstractInstrument implements LongMeasure {
 
  private final boolean absolute;
 
@@ -76,7 +75,7 @@ public int hashCode() {
  return result;
  }
 
- private static final class Bound extends BaseBoundInstrument implements BoundLongMeasure {
+ private static final class Bound extends AbstractBoundInstrument implements BoundLongMeasure {
 
  private final boolean absolute;
 

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

@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.Map;
 
-final class LongObserverSdk extends BaseInstrument implements LongObserver {
+final class LongObserverSdk extends AbstractInstrument implements LongObserver {
  private final boolean monotonic;
 
  LongObserverSdk(