Metrics: Move metrics to opencensus-api. (#1346)

* Metrics: Move to api.

* Update package-info to warn users on using metrics.

39 files changed, 5 insertions, 29 deletions

diff --git a/all/build.gradle b/all/build.gradle
index f62ecab8..640eb81b 100644
--- a/all/build.gradle
+++ b/all/build.gradle
@@ -11,7 +11,6 @@ def subprojects = [
         project(':opencensus-impl-core'),
         project(':opencensus-impl'),
         project(':opencensus-impl-lite'),
-        project(':opencensus-metrics'),
         project(':opencensus-testing'),
         project(':opencensus-contrib-agent'),
         project(':opencensus-contrib-appengine-standard-util'),
diff --git a/metrics/src/main/java/io/opencensus/metrics/Distribution.java b/api/src/main/java/io/opencensus/metrics/Distribution.java
index 5334a8d8..5334a8d8 100644
--- a/metrics/src/main/java/io/opencensus/metrics/Distribution.java
+++ b/api/src/main/java/io/opencensus/metrics/Distribution.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/LabelKey.java b/api/src/main/java/io/opencensus/metrics/LabelKey.java
index 01ef0b55..01ef0b55 100644
--- a/metrics/src/main/java/io/opencensus/metrics/LabelKey.java
+++ b/api/src/main/java/io/opencensus/metrics/LabelKey.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/LabelValue.java b/api/src/main/java/io/opencensus/metrics/LabelValue.java
index e81b63d2..e81b63d2 100644
--- a/metrics/src/main/java/io/opencensus/metrics/LabelValue.java
+++ b/api/src/main/java/io/opencensus/metrics/LabelValue.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/Metric.java b/api/src/main/java/io/opencensus/metrics/Metric.java
index e8be0b90..e8be0b90 100644
--- a/metrics/src/main/java/io/opencensus/metrics/Metric.java
+++ b/api/src/main/java/io/opencensus/metrics/Metric.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/MetricDescriptor.java b/api/src/main/java/io/opencensus/metrics/MetricDescriptor.java
index 4558446a..4558446a 100644
--- a/metrics/src/main/java/io/opencensus/metrics/MetricDescriptor.java
+++ b/api/src/main/java/io/opencensus/metrics/MetricDescriptor.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/MetricProducer.java b/api/src/main/java/io/opencensus/metrics/MetricProducer.java
index 38b5d571..38b5d571 100644
--- a/metrics/src/main/java/io/opencensus/metrics/MetricProducer.java
+++ b/api/src/main/java/io/opencensus/metrics/MetricProducer.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/MetricRegistry.java b/api/src/main/java/io/opencensus/metrics/MetricRegistry.java
index ae4d90b0..ae4d90b0 100644
--- a/metrics/src/main/java/io/opencensus/metrics/MetricRegistry.java
+++ b/api/src/main/java/io/opencensus/metrics/MetricRegistry.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/Metrics.java b/api/src/main/java/io/opencensus/metrics/Metrics.java
index ed7d6716..ed7d6716 100644
--- a/metrics/src/main/java/io/opencensus/metrics/Metrics.java
+++ b/api/src/main/java/io/opencensus/metrics/Metrics.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/MetricsComponent.java b/api/src/main/java/io/opencensus/metrics/MetricsComponent.java
index 08d954ef..08d954ef 100644
--- a/metrics/src/main/java/io/opencensus/metrics/MetricsComponent.java
+++ b/api/src/main/java/io/opencensus/metrics/MetricsComponent.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/Point.java b/api/src/main/java/io/opencensus/metrics/Point.java
index e66b273d..e66b273d 100644
--- a/metrics/src/main/java/io/opencensus/metrics/Point.java
+++ b/api/src/main/java/io/opencensus/metrics/Point.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/TimeSeries.java b/api/src/main/java/io/opencensus/metrics/TimeSeries.java
index bbbfe0e4..bbbfe0e4 100644
--- a/metrics/src/main/java/io/opencensus/metrics/TimeSeries.java
+++ b/api/src/main/java/io/opencensus/metrics/TimeSeries.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/TimeSeriesCumulative.java b/api/src/main/java/io/opencensus/metrics/TimeSeriesCumulative.java
index 5f48b770..5f48b770 100644
--- a/metrics/src/main/java/io/opencensus/metrics/TimeSeriesCumulative.java
+++ b/api/src/main/java/io/opencensus/metrics/TimeSeriesCumulative.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/TimeSeriesGauge.java b/api/src/main/java/io/opencensus/metrics/TimeSeriesGauge.java
index 717505a4..717505a4 100644
--- a/metrics/src/main/java/io/opencensus/metrics/TimeSeriesGauge.java
+++ b/api/src/main/java/io/opencensus/metrics/TimeSeriesGauge.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/TimeSeriesList.java b/api/src/main/java/io/opencensus/metrics/TimeSeriesList.java
index 6138eac2..6138eac2 100644
--- a/metrics/src/main/java/io/opencensus/metrics/TimeSeriesList.java
+++ b/api/src/main/java/io/opencensus/metrics/TimeSeriesList.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/Value.java b/api/src/main/java/io/opencensus/metrics/Value.java
index c8fe48f8..c8fe48f8 100644
--- a/metrics/src/main/java/io/opencensus/metrics/Value.java
+++ b/api/src/main/java/io/opencensus/metrics/Value.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/export/ExportComponent.java b/api/src/main/java/io/opencensus/metrics/export/ExportComponent.java
index f1511543..f1511543 100644
--- a/metrics/src/main/java/io/opencensus/metrics/export/ExportComponent.java
+++ b/api/src/main/java/io/opencensus/metrics/export/ExportComponent.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/export/MetricProducerManager.java b/api/src/main/java/io/opencensus/metrics/export/MetricProducerManager.java
index 9600a023..9600a023 100644
--- a/metrics/src/main/java/io/opencensus/metrics/export/MetricProducerManager.java
+++ b/api/src/main/java/io/opencensus/metrics/export/MetricProducerManager.java
diff --git a/metrics/src/main/java/io/opencensus/metrics/package-info.java b/api/src/main/java/io/opencensus/metrics/package-info.java
index f48e3712..33eadf0c 100644
--- a/metrics/src/main/java/io/opencensus/metrics/package-info.java
+++ b/api/src/main/java/io/opencensus/metrics/package-info.java
@@ -16,11 +16,12 @@
 
 /**
  * This package describes the Metrics data model. Metrics are a data model for what stats exporters
- * take as input.
+ * take as input. This data model may eventually become the wire format for metrics.
  *
- * <p>Currently all the public classes under this package are marked as {@link
- * io.opencensus.common.ExperimentalApi}. This data model may eventually become the wire format for
- * metrics.
+ * <p>WARNING: Currently all the public classes under this package are marked as {@link
+ * io.opencensus.common.ExperimentalApi}. The classes and APIs under {@link io.opencensus.metrics}
+ * are likely to get backwards-incompatible updates in the future. DO NOT USE except for
+ * experimental purposes.
  *
  * <p>Please see
  * https://github.com/census-instrumentation/opencensus-specs/blob/master/stats/Metrics.md and
diff --git a/metrics/src/test/java/io/opencensus/metrics/DistributionTest.java b/api/src/test/java/io/opencensus/metrics/DistributionTest.java
index d511e317..d511e317 100644
--- a/metrics/src/test/java/io/opencensus/metrics/DistributionTest.java
+++ b/api/src/test/java/io/opencensus/metrics/DistributionTest.java
diff --git a/metrics/src/test/java/io/opencensus/metrics/LabelKeyTest.java b/api/src/test/java/io/opencensus/metrics/LabelKeyTest.java
index 83f2b59a..83f2b59a 100644
--- a/metrics/src/test/java/io/opencensus/metrics/LabelKeyTest.java
+++ b/api/src/test/java/io/opencensus/metrics/LabelKeyTest.java
diff --git a/metrics/src/test/java/io/opencensus/metrics/LabelValueTest.java b/api/src/test/java/io/opencensus/metrics/LabelValueTest.java
index e5526b2f..e5526b2f 100644
--- a/metrics/src/test/java/io/opencensus/metrics/LabelValueTest.java
+++ b/api/src/test/java/io/opencensus/metrics/LabelValueTest.java
diff --git a/metrics/src/test/java/io/opencensus/metrics/MetricDescriptorTest.java b/api/src/test/java/io/opencensus/metrics/MetricDescriptorTest.java
index 9c0a42fc..9c0a42fc 100644
--- a/metrics/src/test/java/io/opencensus/metrics/MetricDescriptorTest.java
+++ b/api/src/test/java/io/opencensus/metrics/MetricDescriptorTest.java
diff --git a/metrics/src/test/java/io/opencensus/metrics/MetricRegistryTest.java b/api/src/test/java/io/opencensus/metrics/MetricRegistryTest.java
index 0e467dc8..0e467dc8 100644
--- a/metrics/src/test/java/io/opencensus/metrics/MetricRegistryTest.java
+++ b/api/src/test/java/io/opencensus/metrics/MetricRegistryTest.java
diff --git a/metrics/src/test/java/io/opencensus/metrics/MetricTest.java b/api/src/test/java/io/opencensus/metrics/MetricTest.java
index 59838ef4..59838ef4 100644
--- a/metrics/src/test/java/io/opencensus/metrics/MetricTest.java
+++ b/api/src/test/java/io/opencensus/metrics/MetricTest.java
diff --git a/metrics/src/test/java/io/opencensus/metrics/MetricsComponentTest.java b/api/src/test/java/io/opencensus/metrics/MetricsComponentTest.java
index 1c4e70f7..1c4e70f7 100644
--- a/metrics/src/test/java/io/opencensus/metrics/MetricsComponentTest.java
+++ b/api/src/test/java/io/opencensus/metrics/MetricsComponentTest.java
diff --git a/metrics/src/test/java/io/opencensus/metrics/MetricsTest.java b/api/src/test/java/io/opencensus/metrics/MetricsTest.java
index 9a56f257..9a56f257 100644
--- a/metrics/src/test/java/io/opencensus/metrics/MetricsTest.java
+++ b/api/src/test/java/io/opencensus/metrics/MetricsTest.java
diff --git a/metrics/src/test/java/io/opencensus/metrics/PointTest.java b/api/src/test/java/io/opencensus/metrics/PointTest.java
index cb6175c1..cb6175c1 100644
--- a/metrics/src/test/java/io/opencensus/metrics/PointTest.java
+++ b/api/src/test/java/io/opencensus/metrics/PointTest.java
diff --git a/metrics/src/test/java/io/opencensus/metrics/TimeSeriesCumulativeTest.java b/api/src/test/java/io/opencensus/metrics/TimeSeriesCumulativeTest.java
index 3532a5a5..3532a5a5 100644
--- a/metrics/src/test/java/io/opencensus/metrics/TimeSeriesCumulativeTest.java
+++ b/api/src/test/java/io/opencensus/metrics/TimeSeriesCumulativeTest.java
diff --git a/metrics/src/test/java/io/opencensus/metrics/TimeSeriesGaugeTest.java b/api/src/test/java/io/opencensus/metrics/TimeSeriesGaugeTest.java
index 83f7c267..83f7c267 100644
--- a/metrics/src/test/java/io/opencensus/metrics/TimeSeriesGaugeTest.java
+++ b/api/src/test/java/io/opencensus/metrics/TimeSeriesGaugeTest.java
diff --git a/metrics/src/test/java/io/opencensus/metrics/TimeSeriesListTest.java b/api/src/test/java/io/opencensus/metrics/TimeSeriesListTest.java
index 46ace50f..46ace50f 100644
--- a/metrics/src/test/java/io/opencensus/metrics/TimeSeriesListTest.java
+++ b/api/src/test/java/io/opencensus/metrics/TimeSeriesListTest.java
diff --git a/metrics/src/test/java/io/opencensus/metrics/ValueTest.java b/api/src/test/java/io/opencensus/metrics/ValueTest.java
index 63430b28..63430b28 100644
--- a/metrics/src/test/java/io/opencensus/metrics/ValueTest.java
+++ b/api/src/test/java/io/opencensus/metrics/ValueTest.java
diff --git a/metrics/src/test/java/io/opencensus/metrics/export/ExportComponentTest.java b/api/src/test/java/io/opencensus/metrics/export/ExportComponentTest.java
index 15c6e883..15c6e883 100644
--- a/metrics/src/test/java/io/opencensus/metrics/export/ExportComponentTest.java
+++ b/api/src/test/java/io/opencensus/metrics/export/ExportComponentTest.java
diff --git a/metrics/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java b/api/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java
index b79de213..b79de213 100644
--- a/metrics/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java
+++ b/api/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java
diff --git a/build.gradle b/build.gradle
index 240b5ab2..2c7fbb56 100644
--- a/build.gradle
+++ b/build.gradle
@@ -386,8 +386,6 @@ subprojects {
                  'opencensus-impl-core',
                  'opencensus-impl-lite',
                  'opencensus-impl',
-                 // TODO(songya): add the Export (or Metrics + SpanData) artifact once we agree on its name.
-                 // TODO(bdrutu): Fix dependencies on the api internal subpackage for the metrics artifact.
                  'opencensus-testing']
     }
 
diff --git a/impl_core/build.gradle b/impl_core/build.gradle
index 4027408d..4458d537 100644
--- a/impl_core/build.gradle
+++ b/impl_core/build.gradle
@@ -2,13 +2,11 @@ description = 'OpenCensus Core Implementation'
 
 dependencies {
     compile project(':opencensus-api'),
-            project(':opencensus-metrics'),
             libraries.guava
 
     compileOnly libraries.auto_value
 
     testCompile project(':opencensus-api'),
-            project(':opencensus-metrics'),
             project(':opencensus-testing')
 
     signature "org.codehaus.mojo.signature:java16:+@signature"
diff --git a/metrics/README.md b/metrics/README.md
deleted file mode 100644
index 550ecdf7..00000000
--- a/metrics/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-OpenCensus Metrics
-======================================================
-
-* The Metrics data model used by Stats exporters. This data model may eventually become the wire
-format for metrics.
-* Currently all the public classes under this package are marked as `ExperimentalApi`.
-* Java 7 and compatible.
diff --git a/metrics/build.gradle b/metrics/build.gradle
deleted file mode 100644
index b94d76eb..00000000
--- a/metrics/build.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-description = 'OpenCensus Metrics'
-
-dependencies {
-    compile project(':opencensus-api')
-
-    compileOnly libraries.auto_value
-
-    testCompile project(':opencensus-api')
-
-    signature "org.codehaus.mojo.signature:java16:+@signature"
-}
diff --git a/settings.gradle b/settings.gradle
index 82775a99..fccae387 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,7 +22,6 @@ include ":opencensus-contrib-http-util"
 include ":opencensus-contrib-log-correlation-stackdriver"
 include ":opencensus-contrib-monitored-resource-util"
 include ":opencensus-contrib-spring"
-include ":opencensus-metrics"
 
 project(':opencensus-api').projectDir = "$rootDir/api" as File
 project(':opencensus-impl-core').projectDir = "$rootDir/impl_core" as File
@@ -52,7 +51,6 @@ project(':opencensus-exporter-trace-jaeger').projectDir = "$rootDir/exporters/tr
 project(':opencensus-exporter-stats-signalfx').projectDir = "$rootDir/exporters/stats/signalfx" as File
 project(':opencensus-exporter-stats-stackdriver').projectDir = "$rootDir/exporters/stats/stackdriver" as File
 project(':opencensus-exporter-stats-prometheus').projectDir = "$rootDir/exporters/stats/prometheus" as File
-project(':opencensus-metrics').projectDir = "$rootDir/metrics" as File
 
 
 // Java8 projects only