2 files changed, 12 insertions, 17 deletions
diff --git a/api/src/main/java/io/opencensus/metrics/MetricProducer.java b/api/src/main/java/io/opencensus/metrics/MetricProducer.java
index 38b5d571..2a78b989 100644
--- a/api/src/main/java/io/opencensus/metrics/MetricProducer.java
+++ b/api/src/main/java/io/opencensus/metrics/MetricProducer.java
@@ -21,18 +21,20 @@ import io.opencensus.metrics.export.MetricProducerManager;
 import java.util.Collection;
 
 /**
- * A {@link io.opencensus.metrics.Metric} producer that can be registered for exporting using {@link
+ * A {@link Metric} producer that can be registered for exporting using {@link
  * MetricProducerManager}.
  *
  * <p>All implementation MUST be thread-safe.
+ *
+ * @since 0.17
  */
 @ExperimentalApi
 public abstract class MetricProducer {
 
   /**
-   * Returns a collection of produced {@link io.opencensus.metrics.Metric}s to be exported.
+   * Returns a collection of produced {@link Metric}s to be exported.
    *
-   * @return a collection of produced {@link io.opencensus.metrics.Metric}s to be exported.
+   * @return a collection of produced {@link Metric}s to be exported.
    */
   public abstract Collection<Metric> getMetrics();
 }
diff --git a/api/src/main/java/io/opencensus/metrics/MetricRegistry.java b/api/src/main/java/io/opencensus/metrics/MetricRegistry.java
index ae4d90b0..c249d47b 100644
--- a/api/src/main/java/io/opencensus/metrics/MetricRegistry.java
+++ b/api/src/main/java/io/opencensus/metrics/MetricRegistry.java
@@ -20,19 +20,17 @@ import io.opencensus.common.ExperimentalApi;
 import io.opencensus.common.ToDoubleFunction;
 import io.opencensus.common.ToLongFunction;
 import io.opencensus.internal.Utils;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 
 /**
- * Creates and manages your application's set of metrics. Exporters use the metric registry to
- * iterate over the set of metrics instrumenting your application, and then further export each
- * metric to the backend of choice.
+ * Creates and manages your application's set of metrics. The default implementation of this creates
+ * a {@link MetricProducer} and registers it to the global {@link
+ * io.opencensus.metrics.export.MetricProducerManager}.
  *
- * @since 0.16
+ * @since 0.17
  */
 @ExperimentalApi
-public abstract class MetricRegistry extends MetricProducer {
+public abstract class MetricRegistry {
   /**
    * Build a new long gauge to be added to the registry.
    *
@@ -43,7 +41,7 @@ public abstract class MetricRegistry extends MetricProducer {
    * @param unit the unit of the metric.
    * @param obj the function argument.
    * @param function the function to be called.
-   * @since 0.16 @ExperimentalApi
+   * @since 0.17
    */
   public abstract <T> void addLongGauge(
       String name,
@@ -63,7 +61,7 @@ public abstract class MetricRegistry extends MetricProducer {
    * @param unit the unit of the metric.
    * @param obj the function argument.
    * @param function the function to be called.
-   * @since 0.16 @ExperimentalApi
+   * @since 0.17
    */
   public abstract <T> void addDoubleGauge(
       String name,
@@ -108,10 +106,5 @@ public abstract class MetricRegistry extends MetricProducer {
       Utils.checkNotNull(labels, "labels");
       Utils.checkNotNull(function, "function");
     }
-
-    @Override
-    public Collection<Metric> getMetrics() {
-      return Collections.emptyList();
-    }
   }
 }