Revert "Temporarily move "metrics" package into impl_core/ for release. (#1426)" (#1432)
This reverts commit d3fa0e5c60903f95c184d7c7bafae8fdd12156ad.
diff --git a/api/src/main/java/io/opencensus/common/ToDoubleFunction.java b/api/src/main/java/io/opencensus/common/ToDoubleFunction.java
index 415f8ca..eac8579 100644
--- a/api/src/main/java/io/opencensus/common/ToDoubleFunction.java
+++ b/api/src/main/java/io/opencensus/common/ToDoubleFunction.java
@@ -17,7 +17,7 @@
package io.opencensus.common;
/**
- * Represents a function that produces a double-valued result. See {@code
+ * Represents a function that produces a double-valued result. See {@link
* io.opencensus.metrics.MetricRegistry} for an example of its use.
*
* <p>Note: This class is based on the java.util.ToDoubleFunction class added in Java 1.8. We cannot
diff --git a/api/src/main/java/io/opencensus/common/ToLongFunction.java b/api/src/main/java/io/opencensus/common/ToLongFunction.java
index 727a8b4..26a27b1 100644
--- a/api/src/main/java/io/opencensus/common/ToLongFunction.java
+++ b/api/src/main/java/io/opencensus/common/ToLongFunction.java
@@ -17,7 +17,7 @@
package io.opencensus.common;
/**
- * Represents a function that produces a long-valued result. See {@code
+ * Represents a function that produces a long-valued result. See {@link
* io.opencensus.metrics.MetricRegistry} for an example of its use.
*
* <p>Note: This class is based on the java.util.ToLongFunction class added in Java 1.8. We cannot
diff --git a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Distribution.java b/api/src/main/java/io/opencensus/metrics/Distribution.java
similarity index 98%
rename from impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Distribution.java
rename to api/src/main/java/io/opencensus/metrics/Distribution.java
index 4e1d155..bdea776 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Distribution.java
+++ b/api/src/main/java/io/opencensus/metrics/Distribution.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import com.google.auto.value.AutoValue;
import io.opencensus.common.ExperimentalApi;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/LabelKey.java b/api/src/main/java/io/opencensus/metrics/LabelKey.java
similarity index 96%
rename from impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/LabelKey.java
rename to api/src/main/java/io/opencensus/metrics/LabelKey.java
index d0c83e5..01ef0b5 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/LabelKey.java
+++ b/api/src/main/java/io/opencensus/metrics/LabelKey.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import com.google.auto.value.AutoValue;
import io.opencensus.common.ExperimentalApi;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/LabelValue.java b/api/src/main/java/io/opencensus/metrics/LabelValue.java
similarity index 96%
rename from impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/LabelValue.java
rename to api/src/main/java/io/opencensus/metrics/LabelValue.java
index 919b16a..e81b63d 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/LabelValue.java
+++ b/api/src/main/java/io/opencensus/metrics/LabelValue.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import com.google.auto.value.AutoValue;
import io.opencensus.common.ExperimentalApi;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Metric.java b/api/src/main/java/io/opencensus/metrics/Metric.java
similarity index 92%
rename from impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Metric.java
rename to api/src/main/java/io/opencensus/metrics/Metric.java
index 56937e8..fa0018b 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Metric.java
+++ b/api/src/main/java/io/opencensus/metrics/Metric.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import com.google.auto.value.AutoValue;
import io.opencensus.common.ExperimentalApi;
-import io.opencensus.implcore.temporary.metrics.Value.ValueDistribution;
-import io.opencensus.implcore.temporary.metrics.Value.ValueDouble;
-import io.opencensus.implcore.temporary.metrics.Value.ValueLong;
import io.opencensus.internal.Utils;
+import io.opencensus.metrics.Value.ValueDistribution;
+import io.opencensus.metrics.Value.ValueDouble;
+import io.opencensus.metrics.Value.ValueLong;
import java.util.List;
import javax.annotation.concurrent.Immutable;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricDescriptor.java b/api/src/main/java/io/opencensus/metrics/MetricDescriptor.java
similarity index 98%
rename from impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricDescriptor.java
rename to api/src/main/java/io/opencensus/metrics/MetricDescriptor.java
index fb7265f..4558446 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricDescriptor.java
+++ b/api/src/main/java/io/opencensus/metrics/MetricDescriptor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import com.google.auto.value.AutoValue;
import io.opencensus.common.ExperimentalApi;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricProducer.java b/api/src/main/java/io/opencensus/metrics/MetricProducer.java
similarity index 62%
rename from impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricProducer.java
rename to api/src/main/java/io/opencensus/metrics/MetricProducer.java
index cb56d3d..38b5d57 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricProducer.java
+++ b/api/src/main/java/io/opencensus/metrics/MetricProducer.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import io.opencensus.common.ExperimentalApi;
-import io.opencensus.implcore.temporary.metrics.export.MetricProducerManager;
+import io.opencensus.metrics.export.MetricProducerManager;
import java.util.Collection;
/**
- * A {@link io.opencensus.implcore.temporary.metrics.Metric} producer that can be registered for
- * exporting using {@link MetricProducerManager}.
+ * A {@link io.opencensus.metrics.Metric} producer that can be registered for exporting using {@link
+ * MetricProducerManager}.
*
* <p>All implementation MUST be thread-safe.
*/
@@ -30,11 +30,9 @@
public abstract class MetricProducer {
/**
- * Returns a collection of produced {@link io.opencensus.implcore.temporary.metrics.Metric}s to be
- * exported.
+ * Returns a collection of produced {@link io.opencensus.metrics.Metric}s to be exported.
*
- * @return a collection of produced {@link io.opencensus.implcore.temporary.metrics.Metric}s to be
- * exported.
+ * @return a collection of produced {@link io.opencensus.metrics.Metric}s to be exported.
*/
public abstract Collection<Metric> getMetrics();
}
diff --git a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricRegistry.java b/api/src/main/java/io/opencensus/metrics/MetricRegistry.java
similarity index 98%
rename from impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricRegistry.java
rename to api/src/main/java/io/opencensus/metrics/MetricRegistry.java
index 851fdba..ae4d90b 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricRegistry.java
+++ b/api/src/main/java/io/opencensus/metrics/MetricRegistry.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import io.opencensus.common.ExperimentalApi;
import io.opencensus.common.ToDoubleFunction;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Metrics.java b/api/src/main/java/io/opencensus/metrics/Metrics.java
similarity index 93%
rename from impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Metrics.java
rename to api/src/main/java/io/opencensus/metrics/Metrics.java
index cf4b3e6..521fbd0 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Metrics.java
+++ b/api/src/main/java/io/opencensus/metrics/Metrics.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import io.opencensus.common.ExperimentalApi;
-import io.opencensus.implcore.temporary.metrics.export.ExportComponent;
import io.opencensus.internal.DefaultVisibilityForTesting;
import io.opencensus.internal.Provider;
+import io.opencensus.metrics.export.ExportComponent;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.annotation.Nullable;
@@ -49,7 +49,7 @@
* Returns the global {@link MetricRegistry}.
*
* <p>This {@code MetricRegistry} is already added to the global {@link
- * io.opencensus.implcore.temporary.metrics.export.MetricProducerManager}.
+ * io.opencensus.metrics.export.MetricProducerManager}.
*
* @return the global {@code MetricRegistry}.
* @since 0.16
diff --git a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricsComponent.java b/api/src/main/java/io/opencensus/metrics/MetricsComponent.java
similarity index 94%
rename from impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricsComponent.java
rename to api/src/main/java/io/opencensus/metrics/MetricsComponent.java
index e578f8b..08d954e 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricsComponent.java
+++ b/api/src/main/java/io/opencensus/metrics/MetricsComponent.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import io.opencensus.common.ExperimentalApi;
-import io.opencensus.implcore.temporary.metrics.export.ExportComponent;
+import io.opencensus.metrics.export.ExportComponent;
/**
* Class that holds the implementation instance for {@link ExportComponent}.
diff --git a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Point.java b/api/src/main/java/io/opencensus/metrics/Point.java
similarity index 96%
rename from impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Point.java
rename to api/src/main/java/io/opencensus/metrics/Point.java
index e7337f5..e66b273 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Point.java
+++ b/api/src/main/java/io/opencensus/metrics/Point.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import com.google.auto.value.AutoValue;
import io.opencensus.common.ExperimentalApi;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/TimeSeries.java b/api/src/main/java/io/opencensus/metrics/TimeSeries.java
similarity index 97%
rename from impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/TimeSeries.java
rename to api/src/main/java/io/opencensus/metrics/TimeSeries.java
index f149d06..c62b6b7 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/TimeSeries.java
+++ b/api/src/main/java/io/opencensus/metrics/TimeSeries.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import com.google.auto.value.AutoValue;
import io.opencensus.common.ExperimentalApi;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Value.java b/api/src/main/java/io/opencensus/metrics/Value.java
similarity index 98%
rename from impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Value.java
rename to api/src/main/java/io/opencensus/metrics/Value.java
index a17c513..c8fe48f 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Value.java
+++ b/api/src/main/java/io/opencensus/metrics/Value.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import com.google.auto.value.AutoValue;
import io.opencensus.common.ExperimentalApi;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/export/ExportComponent.java b/api/src/main/java/io/opencensus/metrics/export/ExportComponent.java
similarity index 96%
rename from impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/export/ExportComponent.java
rename to api/src/main/java/io/opencensus/metrics/export/ExportComponent.java
index fd29997..bab65d1 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/export/ExportComponent.java
+++ b/api/src/main/java/io/opencensus/metrics/export/ExportComponent.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics.export;
+package io.opencensus.metrics.export;
import io.opencensus.common.ExperimentalApi;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/export/MetricProducerManager.java b/api/src/main/java/io/opencensus/metrics/export/MetricProducerManager.java
similarity index 95%
rename from impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/export/MetricProducerManager.java
rename to api/src/main/java/io/opencensus/metrics/export/MetricProducerManager.java
index b28b094..c5acf17 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/export/MetricProducerManager.java
+++ b/api/src/main/java/io/opencensus/metrics/export/MetricProducerManager.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics.export;
+package io.opencensus.metrics.export;
import io.opencensus.common.ExperimentalApi;
-import io.opencensus.implcore.temporary.metrics.MetricProducer;
import io.opencensus.internal.Utils;
+import io.opencensus.metrics.MetricProducer;
import java.util.Collections;
import java.util.Set;
import javax.annotation.concurrent.ThreadSafe;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/package-info.java b/api/src/main/java/io/opencensus/metrics/package-info.java
similarity index 84%
rename from impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/package-info.java
rename to api/src/main/java/io/opencensus/metrics/package-info.java
index f768380..33eadf0 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/package-info.java
+++ b/api/src/main/java/io/opencensus/metrics/package-info.java
@@ -19,9 +19,9 @@
* take as input. 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.implcore.temporary.metrics} are likely to get backwards-incompatible updates in the
- * future. DO NOT USE except for experimental purposes.
+ * 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
@@ -29,4 +29,4 @@
* for more details.
*/
@io.opencensus.common.ExperimentalApi
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/DistributionTest.java b/api/src/test/java/io/opencensus/metrics/DistributionTest.java
similarity index 97%
rename from impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/DistributionTest.java
rename to api/src/test/java/io/opencensus/metrics/DistributionTest.java
index eb867d0..d511e31 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/DistributionTest.java
+++ b/api/src/test/java/io/opencensus/metrics/DistributionTest.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import static com.google.common.truth.Truth.assertThat;
import com.google.common.testing.EqualsTester;
import io.opencensus.common.Timestamp;
-import io.opencensus.implcore.temporary.metrics.Distribution.Bucket;
-import io.opencensus.implcore.temporary.metrics.Distribution.Exemplar;
+import io.opencensus.metrics.Distribution.Bucket;
+import io.opencensus.metrics.Distribution.Exemplar;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/LabelKeyTest.java b/api/src/test/java/io/opencensus/metrics/LabelKeyTest.java
similarity index 97%
rename from impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/LabelKeyTest.java
rename to api/src/test/java/io/opencensus/metrics/LabelKeyTest.java
index aabf868..83f2b59 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/LabelKeyTest.java
+++ b/api/src/test/java/io/opencensus/metrics/LabelKeyTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import static com.google.common.truth.Truth.assertThat;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/LabelValueTest.java b/api/src/test/java/io/opencensus/metrics/LabelValueTest.java
similarity index 97%
rename from impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/LabelValueTest.java
rename to api/src/test/java/io/opencensus/metrics/LabelValueTest.java
index 92d6188..e5526b2 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/LabelValueTest.java
+++ b/api/src/test/java/io/opencensus/metrics/LabelValueTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import static com.google.common.truth.Truth.assertThat;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricDescriptorTest.java b/api/src/test/java/io/opencensus/metrics/MetricDescriptorTest.java
similarity index 96%
rename from impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricDescriptorTest.java
rename to api/src/test/java/io/opencensus/metrics/MetricDescriptorTest.java
index fb02d22..9c0a42f 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricDescriptorTest.java
+++ b/api/src/test/java/io/opencensus/metrics/MetricDescriptorTest.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import static com.google.common.truth.Truth.assertThat;
import com.google.common.testing.EqualsTester;
-import io.opencensus.implcore.temporary.metrics.MetricDescriptor.Type;
+import io.opencensus.metrics.MetricDescriptor.Type;
import java.util.Arrays;
import java.util.List;
import org.hamcrest.CoreMatchers;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricRegistryTest.java b/api/src/test/java/io/opencensus/metrics/MetricRegistryTest.java
similarity index 98%
rename from impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricRegistryTest.java
rename to api/src/test/java/io/opencensus/metrics/MetricRegistryTest.java
index 3bce8a8..49e8ce0 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricRegistryTest.java
+++ b/api/src/test/java/io/opencensus/metrics/MetricRegistryTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import io.opencensus.common.ToDoubleFunction;
import io.opencensus.common.ToLongFunction;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricTest.java b/api/src/test/java/io/opencensus/metrics/MetricTest.java
similarity index 97%
rename from impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricTest.java
rename to api/src/test/java/io/opencensus/metrics/MetricTest.java
index 8ad0356..37deed4 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricTest.java
+++ b/api/src/test/java/io/opencensus/metrics/MetricTest.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import static com.google.common.truth.Truth.assertThat;
import com.google.common.testing.EqualsTester;
import io.opencensus.common.Timestamp;
-import io.opencensus.implcore.temporary.metrics.MetricDescriptor.Type;
+import io.opencensus.metrics.MetricDescriptor.Type;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricsComponentTest.java b/api/src/test/java/io/opencensus/metrics/MetricsComponentTest.java
similarity index 90%
rename from impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricsComponentTest.java
rename to api/src/test/java/io/opencensus/metrics/MetricsComponentTest.java
index cc17163..1c4e70f 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricsComponentTest.java
+++ b/api/src/test/java/io/opencensus/metrics/MetricsComponentTest.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import static com.google.common.truth.Truth.assertThat;
-import io.opencensus.implcore.temporary.metrics.export.ExportComponent;
+import io.opencensus.metrics.export.ExportComponent;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricsTest.java b/api/src/test/java/io/opencensus/metrics/MetricsTest.java
similarity index 89%
rename from impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricsTest.java
rename to api/src/test/java/io/opencensus/metrics/MetricsTest.java
index f62934f..9e0eee1 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricsTest.java
+++ b/api/src/test/java/io/opencensus/metrics/MetricsTest.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import static com.google.common.truth.Truth.assertThat;
-import io.opencensus.implcore.temporary.metrics.export.ExportComponent;
+import io.opencensus.metrics.export.ExportComponent;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -54,8 +54,7 @@
}
};
assertThat(Metrics.loadMetricsComponent(classLoader).getClass().getName())
- .isEqualTo(
- "io.opencensus.implcore.temporary.metrics.MetricsComponent$NoopMetricsComponent");
+ .isEqualTo("io.opencensus.metrics.MetricsComponent$NoopMetricsComponent");
}
@Test
diff --git a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/PointTest.java b/api/src/test/java/io/opencensus/metrics/PointTest.java
similarity index 94%
rename from impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/PointTest.java
rename to api/src/test/java/io/opencensus/metrics/PointTest.java
index 8caa21e..cb6175c 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/PointTest.java
+++ b/api/src/test/java/io/opencensus/metrics/PointTest.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import static com.google.common.truth.Truth.assertThat;
import com.google.common.testing.EqualsTester;
import io.opencensus.common.Timestamp;
-import io.opencensus.implcore.temporary.metrics.Distribution.Bucket;
+import io.opencensus.metrics.Distribution.Bucket;
import java.util.Arrays;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/TimeSeriesTest.java b/api/src/test/java/io/opencensus/metrics/TimeSeriesTest.java
similarity index 98%
rename from impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/TimeSeriesTest.java
rename to api/src/test/java/io/opencensus/metrics/TimeSeriesTest.java
index c8cdac2..07dff97 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/TimeSeriesTest.java
+++ b/api/src/test/java/io/opencensus/metrics/TimeSeriesTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import static com.google.common.truth.Truth.assertThat;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/ValueTest.java b/api/src/test/java/io/opencensus/metrics/ValueTest.java
similarity index 92%
rename from impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/ValueTest.java
rename to api/src/test/java/io/opencensus/metrics/ValueTest.java
index 53b4c45..63430b2 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/ValueTest.java
+++ b/api/src/test/java/io/opencensus/metrics/ValueTest.java
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics;
+package io.opencensus.metrics;
import static com.google.common.truth.Truth.assertThat;
import com.google.common.testing.EqualsTester;
import io.opencensus.common.Function;
import io.opencensus.common.Functions;
-import io.opencensus.implcore.temporary.metrics.Distribution.Bucket;
-import io.opencensus.implcore.temporary.metrics.Value.ValueDistribution;
-import io.opencensus.implcore.temporary.metrics.Value.ValueDouble;
-import io.opencensus.implcore.temporary.metrics.Value.ValueLong;
+import io.opencensus.metrics.Distribution.Bucket;
+import io.opencensus.metrics.Value.ValueDistribution;
+import io.opencensus.metrics.Value.ValueDouble;
+import io.opencensus.metrics.Value.ValueLong;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/export/ExportComponentTest.java b/api/src/test/java/io/opencensus/metrics/export/ExportComponentTest.java
similarity index 94%
rename from impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/export/ExportComponentTest.java
rename to api/src/test/java/io/opencensus/metrics/export/ExportComponentTest.java
index 7b5c91f..15c6e88 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/export/ExportComponentTest.java
+++ b/api/src/test/java/io/opencensus/metrics/export/ExportComponentTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics.export;
+package io.opencensus.metrics.export;
import static com.google.common.truth.Truth.assertThat;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/export/MetricProducerManagerTest.java b/api/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java
similarity index 94%
rename from impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/export/MetricProducerManagerTest.java
rename to api/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java
index 5044962..0785492 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/export/MetricProducerManagerTest.java
+++ b/api/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package io.opencensus.implcore.temporary.metrics.export;
+package io.opencensus.metrics.export;
import static com.google.common.truth.Truth.assertThat;
-import io.opencensus.implcore.temporary.metrics.MetricProducer;
+import io.opencensus.metrics.MetricProducer;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/buildscripts/import-control.xml b/buildscripts/import-control.xml
index 61c42f1..d9b4b25 100644
--- a/buildscripts/import-control.xml
+++ b/buildscripts/import-control.xml
@@ -38,10 +38,10 @@
<allow pkg="io.opencensus.internal"/>
<allow pkg="io.opencensus.tags"/>
</subpackage>
- <subpackage name="implcore.temporary.metrics">
+ <subpackage name="metrics">
<allow pkg="io.opencensus.internal"/>
<allow pkg="io.opencensus.common"/>
- <allow pkg="io.opencensus.implcore.temporary.metrics"/>
+ <allow pkg="io.opencensus.metrics"/>
</subpackage>
<subpackage name="stats">
<allow pkg="io.opencensus.common"/>
@@ -183,7 +183,7 @@
<allow pkg="com.google.common"/>
<allow pkg="io.opencensus.common"/>
<allow pkg="io.opencensus.implcore"/>
- <allow pkg="io.opencensus.implcore.temporary.metrics"/>
+ <allow pkg="io.opencensus.metrics"/>
<allow pkg="io.opencensus.stats"/>
<allow pkg="io.opencensus.tags"/>
<allow pkg="io.opencensus.trace"/>
@@ -193,7 +193,7 @@
<allow pkg="io.opencensus.common"/>
<allow pkg="io.opencensus.impl"/>
<allow pkg="io.opencensus.implcore"/>
- <allow pkg="io.opencensus.implcore.temporary.metrics"/>
+ <allow pkg="io.opencensus.metrics"/>
<allow pkg="io.opencensus.stats"/>
<allow pkg="io.opencensus.tags"/>
<allow pkg="io.opencensus.trace"/>
@@ -202,7 +202,7 @@
<allow pkg="io.opencensus.common"/>
<allow pkg="io.opencensus.implcore"/>
<allow pkg="io.opencensus.impllite"/>
- <allow pkg="io.opencensus.implcore.temporary.metrics"/>
+ <allow pkg="io.opencensus.metrics"/>
<allow pkg="io.opencensus.stats"/>
<allow pkg="io.opencensus.tags"/>
<allow pkg="io.opencensus.trace"/>
diff --git a/impl/src/main/java/io/opencensus/impl/metrics/MetricsComponentImpl.java b/impl/src/main/java/io/opencensus/impl/metrics/MetricsComponentImpl.java
index 2d84bac..53c354f 100644
--- a/impl/src/main/java/io/opencensus/impl/metrics/MetricsComponentImpl.java
+++ b/impl/src/main/java/io/opencensus/impl/metrics/MetricsComponentImpl.java
@@ -18,7 +18,7 @@
import io.opencensus.implcore.common.MillisClock;
import io.opencensus.implcore.metrics.MetricsComponentImplBase;
-import io.opencensus.implcore.temporary.metrics.MetricsComponent;
+import io.opencensus.metrics.MetricsComponent;
/** Implementation of {@link MetricsComponent}. */
public final class MetricsComponentImpl extends MetricsComponentImplBase {
diff --git a/impl/src/test/java/io/opencensus/impl/metrics/MetricsTest.java b/impl/src/test/java/io/opencensus/impl/metrics/MetricsTest.java
index b48c092..439933d 100644
--- a/impl/src/test/java/io/opencensus/impl/metrics/MetricsTest.java
+++ b/impl/src/test/java/io/opencensus/impl/metrics/MetricsTest.java
@@ -20,8 +20,8 @@
import io.opencensus.implcore.metrics.MetricRegistryImpl;
import io.opencensus.implcore.metrics.export.ExportComponentImpl;
-import io.opencensus.implcore.temporary.metrics.Metrics;
-import io.opencensus.implcore.temporary.metrics.MetricsComponent;
+import io.opencensus.metrics.Metrics;
+import io.opencensus.metrics.MetricsComponent;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/metrics/Gauge.java b/impl_core/src/main/java/io/opencensus/implcore/metrics/Gauge.java
index 371c762..e649806 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/metrics/Gauge.java
+++ b/impl_core/src/main/java/io/opencensus/implcore/metrics/Gauge.java
@@ -21,14 +21,14 @@
import io.opencensus.common.Clock;
import io.opencensus.common.ToDoubleFunction;
import io.opencensus.common.ToLongFunction;
-import io.opencensus.implcore.temporary.metrics.LabelKey;
-import io.opencensus.implcore.temporary.metrics.LabelValue;
-import io.opencensus.implcore.temporary.metrics.Metric;
-import io.opencensus.implcore.temporary.metrics.MetricDescriptor;
-import io.opencensus.implcore.temporary.metrics.MetricDescriptor.Type;
-import io.opencensus.implcore.temporary.metrics.Point;
-import io.opencensus.implcore.temporary.metrics.TimeSeries;
-import io.opencensus.implcore.temporary.metrics.Value;
+import io.opencensus.metrics.LabelKey;
+import io.opencensus.metrics.LabelValue;
+import io.opencensus.metrics.Metric;
+import io.opencensus.metrics.MetricDescriptor;
+import io.opencensus.metrics.MetricDescriptor.Type;
+import io.opencensus.metrics.Point;
+import io.opencensus.metrics.TimeSeries;
+import io.opencensus.metrics.Value;
import java.util.Collections;
import java.util.List;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/metrics/MetricRegistryImpl.java b/impl_core/src/main/java/io/opencensus/implcore/metrics/MetricRegistryImpl.java
index 294c920..f3daaef 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/metrics/MetricRegistryImpl.java
+++ b/impl_core/src/main/java/io/opencensus/implcore/metrics/MetricRegistryImpl.java
@@ -23,10 +23,10 @@
import io.opencensus.common.ToLongFunction;
import io.opencensus.implcore.metrics.Gauge.DoubleGauge;
import io.opencensus.implcore.metrics.Gauge.LongGauge;
-import io.opencensus.implcore.temporary.metrics.LabelKey;
-import io.opencensus.implcore.temporary.metrics.LabelValue;
-import io.opencensus.implcore.temporary.metrics.Metric;
-import io.opencensus.implcore.temporary.metrics.MetricRegistry;
+import io.opencensus.metrics.LabelKey;
+import io.opencensus.metrics.LabelValue;
+import io.opencensus.metrics.Metric;
+import io.opencensus.metrics.MetricRegistry;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/metrics/MetricsComponentImplBase.java b/impl_core/src/main/java/io/opencensus/implcore/metrics/MetricsComponentImplBase.java
index 40f8fbe..46ad028 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/metrics/MetricsComponentImplBase.java
+++ b/impl_core/src/main/java/io/opencensus/implcore/metrics/MetricsComponentImplBase.java
@@ -18,8 +18,8 @@
import io.opencensus.common.Clock;
import io.opencensus.implcore.metrics.export.ExportComponentImpl;
-import io.opencensus.implcore.temporary.metrics.MetricRegistry;
-import io.opencensus.implcore.temporary.metrics.MetricsComponent;
+import io.opencensus.metrics.MetricRegistry;
+import io.opencensus.metrics.MetricsComponent;
/** Implementation of {@link MetricsComponent}. */
public class MetricsComponentImplBase extends MetricsComponent {
diff --git a/impl_core/src/main/java/io/opencensus/implcore/metrics/export/ExportComponentImpl.java b/impl_core/src/main/java/io/opencensus/implcore/metrics/export/ExportComponentImpl.java
index 1836264..173c3ae 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/metrics/export/ExportComponentImpl.java
+++ b/impl_core/src/main/java/io/opencensus/implcore/metrics/export/ExportComponentImpl.java
@@ -16,8 +16,8 @@
package io.opencensus.implcore.metrics.export;
-import io.opencensus.implcore.temporary.metrics.export.ExportComponent;
-import io.opencensus.implcore.temporary.metrics.export.MetricProducerManager;
+import io.opencensus.metrics.export.ExportComponent;
+import io.opencensus.metrics.export.MetricProducerManager;
/** Implementation of {@link ExportComponent}. */
public final class ExportComponentImpl extends ExportComponent {
diff --git a/impl_core/src/main/java/io/opencensus/implcore/metrics/export/MetricProducerManagerImpl.java b/impl_core/src/main/java/io/opencensus/implcore/metrics/export/MetricProducerManagerImpl.java
index 50d1553..fc9db5c 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/metrics/export/MetricProducerManagerImpl.java
+++ b/impl_core/src/main/java/io/opencensus/implcore/metrics/export/MetricProducerManagerImpl.java
@@ -17,8 +17,8 @@
package io.opencensus.implcore.metrics.export;
import com.google.common.base.Preconditions;
-import io.opencensus.implcore.temporary.metrics.MetricProducer;
-import io.opencensus.implcore.temporary.metrics.export.MetricProducerManager;
+import io.opencensus.metrics.MetricProducer;
+import io.opencensus.metrics.export.MetricProducerManager;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/MeasureToViewMap.java b/impl_core/src/main/java/io/opencensus/implcore/stats/MeasureToViewMap.java
index 8ca7bca..2e28991 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/stats/MeasureToViewMap.java
+++ b/impl_core/src/main/java/io/opencensus/implcore/stats/MeasureToViewMap.java
@@ -23,7 +23,7 @@
import io.opencensus.common.Clock;
import io.opencensus.common.Timestamp;
import io.opencensus.implcore.internal.CurrentState.State;
-import io.opencensus.implcore.temporary.metrics.Metric;
+import io.opencensus.metrics.Metric;
import io.opencensus.stats.Measure;
import io.opencensus.stats.Measurement;
import io.opencensus.stats.View;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/MetricProducerImpl.java b/impl_core/src/main/java/io/opencensus/implcore/stats/MetricProducerImpl.java
index 6677ef6..31ef6be 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/stats/MetricProducerImpl.java
+++ b/impl_core/src/main/java/io/opencensus/implcore/stats/MetricProducerImpl.java
@@ -16,8 +16,8 @@
package io.opencensus.implcore.stats;
-import io.opencensus.implcore.temporary.metrics.Metric;
-import io.opencensus.implcore.temporary.metrics.MetricProducer;
+import io.opencensus.metrics.Metric;
+import io.opencensus.metrics.MetricProducer;
import java.util.Collection;
import javax.annotation.concurrent.ThreadSafe;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/MetricUtils.java b/impl_core/src/main/java/io/opencensus/implcore/stats/MetricUtils.java
index 2056851..cd1e536 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/stats/MetricUtils.java
+++ b/impl_core/src/main/java/io/opencensus/implcore/stats/MetricUtils.java
@@ -19,10 +19,10 @@
import com.google.common.annotations.VisibleForTesting;
import io.opencensus.common.Function;
import io.opencensus.common.Functions;
-import io.opencensus.implcore.temporary.metrics.LabelKey;
-import io.opencensus.implcore.temporary.metrics.LabelValue;
-import io.opencensus.implcore.temporary.metrics.MetricDescriptor;
-import io.opencensus.implcore.temporary.metrics.MetricDescriptor.Type;
+import io.opencensus.metrics.LabelKey;
+import io.opencensus.metrics.LabelValue;
+import io.opencensus.metrics.MetricDescriptor;
+import io.opencensus.metrics.MetricDescriptor.Type;
import io.opencensus.stats.Aggregation;
import io.opencensus.stats.Measure;
import io.opencensus.stats.View;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/MutableAggregation.java b/impl_core/src/main/java/io/opencensus/implcore/stats/MutableAggregation.java
index e4b33e4..a41850d 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/stats/MutableAggregation.java
+++ b/impl_core/src/main/java/io/opencensus/implcore/stats/MutableAggregation.java
@@ -21,9 +21,9 @@
import com.google.common.annotations.VisibleForTesting;
import io.opencensus.common.Timestamp;
-import io.opencensus.implcore.temporary.metrics.Distribution;
-import io.opencensus.implcore.temporary.metrics.Point;
-import io.opencensus.implcore.temporary.metrics.Value;
+import io.opencensus.metrics.Distribution;
+import io.opencensus.metrics.Point;
+import io.opencensus.metrics.Value;
import io.opencensus.stats.Aggregation;
import io.opencensus.stats.AggregationData;
import io.opencensus.stats.AggregationData.DistributionData;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java b/impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java
index a0e9fd3..7368a16 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java
+++ b/impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java
@@ -32,12 +32,12 @@
import io.opencensus.common.Timestamp;
import io.opencensus.implcore.internal.CheckerFrameworkUtils;
import io.opencensus.implcore.internal.CurrentState.State;
-import io.opencensus.implcore.temporary.metrics.LabelValue;
-import io.opencensus.implcore.temporary.metrics.Metric;
-import io.opencensus.implcore.temporary.metrics.MetricDescriptor;
-import io.opencensus.implcore.temporary.metrics.MetricDescriptor.Type;
-import io.opencensus.implcore.temporary.metrics.Point;
-import io.opencensus.implcore.temporary.metrics.TimeSeries;
+import io.opencensus.metrics.LabelValue;
+import io.opencensus.metrics.Metric;
+import io.opencensus.metrics.MetricDescriptor;
+import io.opencensus.metrics.MetricDescriptor.Type;
+import io.opencensus.metrics.Point;
+import io.opencensus.metrics.TimeSeries;
import io.opencensus.stats.Aggregation;
import io.opencensus.stats.AggregationData;
import io.opencensus.stats.Measure;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/StatsComponentImplBase.java b/impl_core/src/main/java/io/opencensus/implcore/stats/StatsComponentImplBase.java
index 1456746..72791f0 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/stats/StatsComponentImplBase.java
+++ b/impl_core/src/main/java/io/opencensus/implcore/stats/StatsComponentImplBase.java
@@ -21,8 +21,8 @@
import io.opencensus.implcore.internal.CurrentState;
import io.opencensus.implcore.internal.CurrentState.State;
import io.opencensus.implcore.internal.EventQueue;
-import io.opencensus.implcore.temporary.metrics.MetricProducer;
-import io.opencensus.implcore.temporary.metrics.Metrics;
+import io.opencensus.metrics.MetricProducer;
+import io.opencensus.metrics.Metrics;
import io.opencensus.stats.StatsCollectionState;
import io.opencensus.stats.StatsComponent;
diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/StatsManager.java b/impl_core/src/main/java/io/opencensus/implcore/stats/StatsManager.java
index 0fb7848..a58b9a5 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/stats/StatsManager.java
+++ b/impl_core/src/main/java/io/opencensus/implcore/stats/StatsManager.java
@@ -22,7 +22,7 @@
import io.opencensus.implcore.internal.CurrentState;
import io.opencensus.implcore.internal.CurrentState.State;
import io.opencensus.implcore.internal.EventQueue;
-import io.opencensus.implcore.temporary.metrics.Metric;
+import io.opencensus.metrics.Metric;
import io.opencensus.stats.View;
import io.opencensus.stats.ViewData;
import io.opencensus.tags.TagContext;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/metrics/GaugeTest.java b/impl_core/src/test/java/io/opencensus/implcore/metrics/GaugeTest.java
index 6a2ed63..e1c1787 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/metrics/GaugeTest.java
+++ b/impl_core/src/test/java/io/opencensus/implcore/metrics/GaugeTest.java
@@ -23,14 +23,14 @@
import io.opencensus.common.ToLongFunction;
import io.opencensus.implcore.metrics.Gauge.DoubleGauge;
import io.opencensus.implcore.metrics.Gauge.LongGauge;
-import io.opencensus.implcore.temporary.metrics.LabelKey;
-import io.opencensus.implcore.temporary.metrics.LabelValue;
-import io.opencensus.implcore.temporary.metrics.Metric;
-import io.opencensus.implcore.temporary.metrics.MetricDescriptor;
-import io.opencensus.implcore.temporary.metrics.MetricDescriptor.Type;
-import io.opencensus.implcore.temporary.metrics.Point;
-import io.opencensus.implcore.temporary.metrics.TimeSeries;
-import io.opencensus.implcore.temporary.metrics.Value;
+import io.opencensus.metrics.LabelKey;
+import io.opencensus.metrics.LabelValue;
+import io.opencensus.metrics.Metric;
+import io.opencensus.metrics.MetricDescriptor;
+import io.opencensus.metrics.MetricDescriptor.Type;
+import io.opencensus.metrics.Point;
+import io.opencensus.metrics.TimeSeries;
+import io.opencensus.metrics.Value;
import io.opencensus.testing.common.TestClock;
import java.util.Collections;
import java.util.List;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/metrics/MetricRegistryImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/metrics/MetricRegistryImplTest.java
index ff3c96b..769efab 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/metrics/MetricRegistryImplTest.java
+++ b/impl_core/src/test/java/io/opencensus/implcore/metrics/MetricRegistryImplTest.java
@@ -21,14 +21,14 @@
import io.opencensus.common.Timestamp;
import io.opencensus.common.ToDoubleFunction;
import io.opencensus.common.ToLongFunction;
-import io.opencensus.implcore.temporary.metrics.LabelKey;
-import io.opencensus.implcore.temporary.metrics.LabelValue;
-import io.opencensus.implcore.temporary.metrics.Metric;
-import io.opencensus.implcore.temporary.metrics.MetricDescriptor;
-import io.opencensus.implcore.temporary.metrics.MetricDescriptor.Type;
-import io.opencensus.implcore.temporary.metrics.Point;
-import io.opencensus.implcore.temporary.metrics.TimeSeries;
-import io.opencensus.implcore.temporary.metrics.Value;
+import io.opencensus.metrics.LabelKey;
+import io.opencensus.metrics.LabelValue;
+import io.opencensus.metrics.Metric;
+import io.opencensus.metrics.MetricDescriptor;
+import io.opencensus.metrics.MetricDescriptor.Type;
+import io.opencensus.metrics.Point;
+import io.opencensus.metrics.TimeSeries;
+import io.opencensus.metrics.Value;
import io.opencensus.testing.common.TestClock;
import java.util.Collections;
import java.util.LinkedHashMap;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/metrics/export/MetricProducerManagerImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/metrics/export/MetricProducerManagerImplTest.java
index 71790a3..7f2ec15 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/metrics/export/MetricProducerManagerImplTest.java
+++ b/impl_core/src/test/java/io/opencensus/implcore/metrics/export/MetricProducerManagerImplTest.java
@@ -18,8 +18,8 @@
import static com.google.common.truth.Truth.assertThat;
-import io.opencensus.implcore.temporary.metrics.MetricProducer;
-import io.opencensus.implcore.temporary.metrics.export.MetricProducerManager;
+import io.opencensus.metrics.MetricProducer;
+import io.opencensus.metrics.export.MetricProducerManager;
import java.util.Set;
import org.junit.Before;
import org.junit.Rule;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/stats/MetricUtilsTest.java b/impl_core/src/test/java/io/opencensus/implcore/stats/MetricUtilsTest.java
index ad556fc..7cc8d98 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/stats/MetricUtilsTest.java
+++ b/impl_core/src/test/java/io/opencensus/implcore/stats/MetricUtilsTest.java
@@ -20,10 +20,10 @@
import io.opencensus.common.Duration;
import io.opencensus.common.Timestamp;
-import io.opencensus.implcore.temporary.metrics.LabelKey;
-import io.opencensus.implcore.temporary.metrics.LabelValue;
-import io.opencensus.implcore.temporary.metrics.MetricDescriptor;
-import io.opencensus.implcore.temporary.metrics.MetricDescriptor.Type;
+import io.opencensus.metrics.LabelKey;
+import io.opencensus.metrics.LabelValue;
+import io.opencensus.metrics.MetricDescriptor;
+import io.opencensus.metrics.MetricDescriptor.Type;
import io.opencensus.stats.Aggregation.Count;
import io.opencensus.stats.Aggregation.Distribution;
import io.opencensus.stats.Aggregation.LastValue;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/stats/MutableAggregationTest.java b/impl_core/src/test/java/io/opencensus/implcore/stats/MutableAggregationTest.java
index 94f27f8..ed85dde 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/stats/MutableAggregationTest.java
+++ b/impl_core/src/test/java/io/opencensus/implcore/stats/MutableAggregationTest.java
@@ -28,9 +28,9 @@
import io.opencensus.implcore.stats.MutableAggregation.MutableMean;
import io.opencensus.implcore.stats.MutableAggregation.MutableSumDouble;
import io.opencensus.implcore.stats.MutableAggregation.MutableSumLong;
-import io.opencensus.implcore.temporary.metrics.Distribution.Bucket;
-import io.opencensus.implcore.temporary.metrics.Point;
-import io.opencensus.implcore.temporary.metrics.Value;
+import io.opencensus.metrics.Distribution.Bucket;
+import io.opencensus.metrics.Point;
+import io.opencensus.metrics.Value;
import io.opencensus.stats.AggregationData;
import io.opencensus.stats.AggregationData.CountData;
import io.opencensus.stats.AggregationData.DistributionData;
@@ -300,7 +300,7 @@
.isEqualTo(
Point.create(
Value.distributionValue(
- io.opencensus.implcore.temporary.metrics.Distribution.create(
+ io.opencensus.metrics.Distribution.create(
0,
0,
0,
diff --git a/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java
index ccc9f34..6161c12 100644
--- a/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java
+++ b/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java
@@ -18,7 +18,7 @@
import io.opencensus.implcore.common.MillisClock;
import io.opencensus.implcore.metrics.MetricsComponentImplBase;
-import io.opencensus.implcore.temporary.metrics.MetricsComponent;
+import io.opencensus.metrics.MetricsComponent;
/** Android-compatible implementation of {@link MetricsComponent}. */
public final class MetricsComponentImplLite extends MetricsComponentImplBase {
diff --git a/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java b/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java
index 388cac8..7ee900a 100644
--- a/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java
+++ b/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java
@@ -20,8 +20,8 @@
import io.opencensus.implcore.metrics.MetricRegistryImpl;
import io.opencensus.implcore.metrics.export.ExportComponentImpl;
-import io.opencensus.implcore.temporary.metrics.Metrics;
-import io.opencensus.implcore.temporary.metrics.MetricsComponent;
+import io.opencensus.metrics.Metrics;
+import io.opencensus.metrics.MetricsComponent;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
