Revert "Temporarily move "metrics" package into impl_core/ for release. (#1426)" (#1432)

This reverts commit d3fa0e5c60903f95c184d7c7bafae8fdd12156ad.

5 files changed, 18 insertions, 18 deletions

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 371c762d..e6498066 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 static com.google.common.base.Preconditions.checkNotNull;
 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 294c9207..f3daaef7 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.ToDoubleFunction;
 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 40f8fbe5..46ad028c 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 @@ package io.opencensus.implcore.metrics;
 
 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 18362646..173c3aec 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 50d15534..fc9db5c1 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;