Use existing instrument interfaces as response for bind API

Author: jack-berg

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

@@ -31,14 +31,6 @@ class DefaultMeter implements Meter {
       new NoopObservableDoubleMeasurement();
   private static final ObservableLongMeasurement NOOP_OBSERVABLE_LONG_MEASUREMENT =
       new NoopObservableLongMeasurement();
-  private static final DoubleCounterOp NOOP_DOUBLE_COUNTER_OP = value -> {};
-  private static final LongCounterOp NOOP_LONG_COUNTER_OP = value -> {};
-  private static final DoubleUpDownCounterOp NOOP_DOUBLE_UP_DOWN_COUNTER_OP = value -> {};
-  private static final LongUpDownCounterOp NOOP_LONG_UP_DOWN_COUNTER_OP = value -> {};
-  private static final DoubleHistogramOp NOOP_DOUBLE_HISTOGRAM_OP = value -> {};
-  private static final LongHistogramOp NOOP_LONG_HISTOGRAM_OP = value -> {};
-  private static final DoubleGaugeOp NOOP_DOUBLE_GAUGE_OP = value -> {};
-  private static final LongGaugeOp NOOP_LONG_GAUGE_OP = value -> {};
 
   static Meter getInstance() {
     return INSTANCE;
@@ -84,8 +76,8 @@ public boolean isEnabled() {
     public void add(long value, Attributes attributes, Context context) {}
 
     @Override
-    public LongCounterOp bind(Attributes attributes) {
-      return NOOP_LONG_COUNTER_OP;
+    public LongCounter bind(Attributes attributes) {
+      return this;
     }
 
     @Override
@@ -105,8 +97,8 @@ public boolean isEnabled() {
     public void add(double value, Attributes attributes, Context context) {}
 
     @Override
-    public DoubleCounterOp bind(Attributes attributes) {
-      return NOOP_DOUBLE_COUNTER_OP;
+    public DoubleCounter bind(Attributes attributes) {
+      return this;
     }
 
     @Override
@@ -202,8 +194,8 @@ public void add(long value, Attributes attributes) {}
     public void add(long value) {}
 
     @Override
-    public LongUpDownCounterOp bind(Attributes attributes) {
-      return NOOP_LONG_UP_DOWN_COUNTER_OP;
+    public LongUpDownCounter bind(Attributes attributes) {
+      return this;
     }
   }
 
@@ -223,8 +215,8 @@ public void add(double value, Attributes attributes) {}
     public void add(double value) {}
 
     @Override
-    public DoubleUpDownCounterOp bind(Attributes attributes) {
-      return NOOP_DOUBLE_UP_DOWN_COUNTER_OP;
+    public DoubleUpDownCounter bind(Attributes attributes) {
+      return this;
     }
   }
 
@@ -316,8 +308,8 @@ public void record(double value, Attributes attributes) {}
     public void record(double value) {}
 
     @Override
-    public DoubleHistogramOp bind(Attributes attributes) {
-      return NOOP_DOUBLE_HISTOGRAM_OP;
+    public DoubleHistogram bind(Attributes attributes) {
+      return this;
     }
   }
 
@@ -337,8 +329,8 @@ public void record(long value, Attributes attributes) {}
     public void record(long value) {}
 
     @Override
-    public LongHistogramOp bind(Attributes attributes) {
-      return NOOP_LONG_HISTOGRAM_OP;
+    public LongHistogram bind(Attributes attributes) {
+      return this;
     }
   }
 
@@ -440,8 +432,8 @@ public void set(double value, Attributes attributes) {}
     public void set(double value, Attributes attributes, Context context) {}
 
     @Override
-    public DoubleGaugeOp bind(Attributes attributes) {
-      return NOOP_DOUBLE_GAUGE_OP;
+    public DoubleGauge bind(Attributes attributes) {
+      return this;
     }
   }
 
@@ -491,8 +483,8 @@ public void set(long value, Attributes attributes) {}
     public void set(long value, Attributes attributes, Context context) {}
 
     @Override
-    public LongGaugeOp bind(Attributes attributes) {
-      return NOOP_LONG_GAUGE_OP;
+    public LongGauge bind(Attributes attributes) {
+      return this;
     }
   }
 

api/all/src/main/java/io/opentelemetry/api/metrics/DoubleCounter.java

@@ -15,7 +15,7 @@
  * @since 1.10.0
  */
 @ThreadSafe
-public interface DoubleCounter extends DoubleCounterOp {
+public interface DoubleCounter {
 
   /**
    * Returns {@code true} if the counter is enabled.
@@ -31,6 +31,16 @@ default boolean isEnabled() {
     return true;
   }
 
+  /**
+   * Records a value.
+   *
+   * <p>Note: This may use {@code Context.current()} to pull the context associated with this
+   * measurement.
+   *
+   * @param value The increment amount. MUST be non-negative.
+   */
+  void add(double value);
+
   /**
    * Records a value with a set of attributes.
    *
@@ -51,5 +61,7 @@ default boolean isEnabled() {
    */
   void add(double value, Attributes attributes, Context context);
 
-  DoubleCounterOp bind(Attributes attributes);
+  default DoubleCounter bind(Attributes attributes) {
+    throw new UnsupportedOperationException();
+  }
 }

api/all/src/main/java/io/opentelemetry/api/metrics/DoubleCounterOp.java

@@ -55,5 +55,7 @@ default boolean isEnabled() {
    */
   void set(double value, Attributes attributes, Context context);
 
-  DoubleGaugeOp bind(Attributes attributes);
+  default DoubleGauge bind(Attributes attributes) {
+    throw new UnsupportedOperationException();
+  }
 }

api/all/src/main/java/io/opentelemetry/api/metrics/DoubleGauge.java

@@ -61,5 +61,7 @@ default boolean isEnabled() {
    */
   void record(double value, Attributes attributes, Context context);
 
-  DoubleHistogramOp bind(Attributes attributes);
+  default DoubleHistogram bind(Attributes attributes) {
+    throw new UnsupportedOperationException();
+  }
 }

api/all/src/main/java/io/opentelemetry/api/metrics/DoubleGaugeOp.java

@@ -61,5 +61,7 @@ default boolean isEnabled() {
    */
   void add(double value, Attributes attributes, Context context);
 
-  DoubleUpDownCounterOp bind(Attributes attributes);
+  default DoubleUpDownCounter bind(Attributes attributes) {
+    throw new UnsupportedOperationException();
+  }
 }

api/all/src/main/java/io/opentelemetry/api/metrics/DoubleHistogram.java

@@ -15,7 +15,7 @@
  * @since 1.10.0
  */
 @ThreadSafe
-public interface LongCounter extends LongCounterOp {
+public interface LongCounter {
 
   /**
    * Returns {@code true} if the counter is enabled.
@@ -31,6 +31,16 @@ default boolean isEnabled() {
     return true;
   }
 
+  /**
+   * Records a value.
+   *
+   * <p>Note: This may use {@code Context.current()} to pull the context associated with this
+   * measurement.
+   *
+   * @param value The increment amount. MUST be non-negative.
+   */
+  void add(long value);
+
   /**
    * Records a value with a set of attributes.
    *
@@ -51,5 +61,7 @@ default boolean isEnabled() {
    */
   void add(long value, Attributes attributes, Context context);
 
-  LongCounterOp bind(Attributes attributes);
+  default LongCounter bind(Attributes attributes) {
+    throw new UnsupportedOperationException();
+  }
 }