diff options
52 files changed, 135 insertions, 132 deletions
diff --git a/api/src/main/java/io/opencensus/common/ToDoubleFunction.java b/api/src/main/java/io/opencensus/common/ToDoubleFunction.java index eac85793..415f8ca9 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 {@link + * Represents a function that produces a double-valued result. See {@code * 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 26a27b18..727a8b44 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 {@link + * Represents a function that produces a long-valued result. See {@code * 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/buildscripts/import-control.xml b/buildscripts/import-control.xml index 938b57ee..b89f9f27 100644 --- a/buildscripts/import-control.xml +++ b/buildscripts/import-control.xml @@ -38,10 +38,10 @@ General guidelines on imports: <allow pkg="io.opencensus.internal"/> <allow pkg="io.opencensus.tags"/> </subpackage> - <subpackage name="metrics"> + <subpackage name="implcore.temporary.metrics"> <allow pkg="io.opencensus.internal"/> <allow pkg="io.opencensus.common"/> - <allow pkg="io.opencensus.metrics"/> + <allow pkg="io.opencensus.implcore.temporary.metrics"/> </subpackage> <subpackage name="stats"> <allow pkg="io.opencensus.common"/> @@ -182,7 +182,7 @@ General guidelines on imports: <allow pkg="com.google.common"/> <allow pkg="io.opencensus.common"/> <allow pkg="io.opencensus.implcore"/> - <allow pkg="io.opencensus.metrics"/> + <allow pkg="io.opencensus.implcore.temporary.metrics"/> <allow pkg="io.opencensus.stats"/> <allow pkg="io.opencensus.tags"/> <allow pkg="io.opencensus.trace"/> @@ -192,7 +192,7 @@ General guidelines on imports: <allow pkg="io.opencensus.common"/> <allow pkg="io.opencensus.impl"/> <allow pkg="io.opencensus.implcore"/> - <allow pkg="io.opencensus.metrics"/> + <allow pkg="io.opencensus.implcore.temporary.metrics"/> <allow pkg="io.opencensus.stats"/> <allow pkg="io.opencensus.tags"/> <allow pkg="io.opencensus.trace"/> @@ -201,7 +201,7 @@ General guidelines on imports: <allow pkg="io.opencensus.common"/> <allow pkg="io.opencensus.implcore"/> <allow pkg="io.opencensus.impllite"/> - <allow pkg="io.opencensus.metrics"/> + <allow pkg="io.opencensus.implcore.temporary.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 53c354f1..2d84bace 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 @@ package io.opencensus.impl.metrics; import io.opencensus.implcore.common.MillisClock; import io.opencensus.implcore.metrics.MetricsComponentImplBase; -import io.opencensus.metrics.MetricsComponent; +import io.opencensus.implcore.temporary.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 439933de..b48c0921 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 static com.google.common.truth.Truth.assertThat; import io.opencensus.implcore.metrics.MetricRegistryImpl; import io.opencensus.implcore.metrics.export.ExportComponentImpl; -import io.opencensus.metrics.Metrics; -import io.opencensus.metrics.MetricsComponent; +import io.opencensus.implcore.temporary.metrics.Metrics; +import io.opencensus.implcore.temporary.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 e6498066..371c762d 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.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.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 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 f3daaef7..294c9207 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.metrics.LabelKey; -import io.opencensus.metrics.LabelValue; -import io.opencensus.metrics.Metric; -import io.opencensus.metrics.MetricRegistry; +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 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 46ad028c..40f8fbe5 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.metrics.MetricRegistry; -import io.opencensus.metrics.MetricsComponent; +import io.opencensus.implcore.temporary.metrics.MetricRegistry; +import io.opencensus.implcore.temporary.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 173c3aec..18362646 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.metrics.export.ExportComponent; -import io.opencensus.metrics.export.MetricProducerManager; +import io.opencensus.implcore.temporary.metrics.export.ExportComponent; +import io.opencensus.implcore.temporary.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 fc9db5c1..50d15534 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.metrics.MetricProducer; -import io.opencensus.metrics.export.MetricProducerManager; +import io.opencensus.implcore.temporary.metrics.MetricProducer; +import io.opencensus.implcore.temporary.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 2e28991c..8ca7bca6 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 com.google.common.collect.Sets; import io.opencensus.common.Clock; import io.opencensus.common.Timestamp; import io.opencensus.implcore.internal.CurrentState.State; -import io.opencensus.metrics.Metric; +import io.opencensus.implcore.temporary.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 31ef6be1..6677ef6b 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.metrics.Metric; -import io.opencensus.metrics.MetricProducer; +import io.opencensus.implcore.temporary.metrics.Metric; +import io.opencensus.implcore.temporary.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 cd1e5364..20568514 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 @@ package io.opencensus.implcore.stats; import com.google.common.annotations.VisibleForTesting; import io.opencensus.common.Function; import io.opencensus.common.Functions; -import io.opencensus.metrics.LabelKey; -import io.opencensus.metrics.LabelValue; -import io.opencensus.metrics.MetricDescriptor; -import io.opencensus.metrics.MetricDescriptor.Type; +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.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 a41850d2..e4b33e46 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 static com.google.common.base.Preconditions.checkNotNull; import com.google.common.annotations.VisibleForTesting; import io.opencensus.common.Timestamp; -import io.opencensus.metrics.Distribution; -import io.opencensus.metrics.Point; -import io.opencensus.metrics.Value; +import io.opencensus.implcore.temporary.metrics.Distribution; +import io.opencensus.implcore.temporary.metrics.Point; +import io.opencensus.implcore.temporary.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 7368a161..a0e9fd3b 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.Functions; import io.opencensus.common.Timestamp; import io.opencensus.implcore.internal.CheckerFrameworkUtils; import io.opencensus.implcore.internal.CurrentState.State; -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.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.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 72791f04..1456746f 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.common.Clock; import io.opencensus.implcore.internal.CurrentState; import io.opencensus.implcore.internal.CurrentState.State; import io.opencensus.implcore.internal.EventQueue; -import io.opencensus.metrics.MetricProducer; -import io.opencensus.metrics.Metrics; +import io.opencensus.implcore.temporary.metrics.MetricProducer; +import io.opencensus.implcore.temporary.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 a58b9a5e..0fb78480 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.common.Clock; import io.opencensus.implcore.internal.CurrentState; import io.opencensus.implcore.internal.CurrentState.State; import io.opencensus.implcore.internal.EventQueue; -import io.opencensus.metrics.Metric; +import io.opencensus.implcore.temporary.metrics.Metric; import io.opencensus.stats.View; import io.opencensus.stats.ViewData; import io.opencensus.tags.TagContext; diff --git a/api/src/main/java/io/opencensus/metrics/Distribution.java b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Distribution.java index bdea7762..4e1d1553 100644 --- a/api/src/main/java/io/opencensus/metrics/Distribution.java +++ b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Distribution.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import com.google.auto.value.AutoValue; import io.opencensus.common.ExperimentalApi; diff --git a/api/src/main/java/io/opencensus/metrics/LabelKey.java b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/LabelKey.java index 01ef0b55..d0c83e5e 100644 --- a/api/src/main/java/io/opencensus/metrics/LabelKey.java +++ b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/LabelKey.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import com.google.auto.value.AutoValue; import io.opencensus.common.ExperimentalApi; diff --git a/api/src/main/java/io/opencensus/metrics/LabelValue.java b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/LabelValue.java index e81b63d2..919b16a3 100644 --- a/api/src/main/java/io/opencensus/metrics/LabelValue.java +++ b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/LabelValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import com.google.auto.value.AutoValue; import io.opencensus.common.ExperimentalApi; diff --git a/api/src/main/java/io/opencensus/metrics/Metric.java b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Metric.java index fa0018b3..56937e8d 100644 --- a/api/src/main/java/io/opencensus/metrics/Metric.java +++ b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Metric.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.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/api/src/main/java/io/opencensus/metrics/MetricDescriptor.java b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricDescriptor.java index 4558446a..fb7265f1 100644 --- a/api/src/main/java/io/opencensus/metrics/MetricDescriptor.java +++ b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricDescriptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import com.google.auto.value.AutoValue; import io.opencensus.common.ExperimentalApi; diff --git a/api/src/main/java/io/opencensus/metrics/MetricProducer.java b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricProducer.java index 38b5d571..cb56d3dc 100644 --- a/api/src/main/java/io/opencensus/metrics/MetricProducer.java +++ b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricProducer.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import io.opencensus.common.ExperimentalApi; -import io.opencensus.metrics.export.MetricProducerManager; +import io.opencensus.implcore.temporary.metrics.export.MetricProducerManager; import java.util.Collection; /** - * A {@link io.opencensus.metrics.Metric} producer that can be registered for exporting using {@link - * MetricProducerManager}. + * A {@link io.opencensus.implcore.temporary.metrics.Metric} producer that can be registered for + * exporting using {@link MetricProducerManager}. * * <p>All implementation MUST be thread-safe. */ @@ -30,9 +30,11 @@ import java.util.Collection; public abstract class MetricProducer { /** - * Returns a collection of produced {@link io.opencensus.metrics.Metric}s to be exported. + * Returns 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. + * @return a collection of produced {@link io.opencensus.implcore.temporary.metrics.Metric}s to be + * exported. */ public abstract Collection<Metric> getMetrics(); } diff --git a/api/src/main/java/io/opencensus/metrics/MetricRegistry.java b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricRegistry.java index ae4d90b0..851fdba5 100644 --- a/api/src/main/java/io/opencensus/metrics/MetricRegistry.java +++ b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricRegistry.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import io.opencensus.common.ExperimentalApi; import io.opencensus.common.ToDoubleFunction; diff --git a/api/src/main/java/io/opencensus/metrics/Metrics.java b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Metrics.java index 521fbd08..cf4b3e63 100644 --- a/api/src/main/java/io/opencensus/metrics/Metrics.java +++ b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Metrics.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.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 @@ public final class Metrics { * Returns the global {@link MetricRegistry}. * * <p>This {@code MetricRegistry} is already added to the global {@link - * io.opencensus.metrics.export.MetricProducerManager}. + * io.opencensus.implcore.temporary.metrics.export.MetricProducerManager}. * * @return the global {@code MetricRegistry}. * @since 0.16 diff --git a/api/src/main/java/io/opencensus/metrics/MetricsComponent.java b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricsComponent.java index 08d954ef..e578f8b6 100644 --- a/api/src/main/java/io/opencensus/metrics/MetricsComponent.java +++ b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/MetricsComponent.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import io.opencensus.common.ExperimentalApi; -import io.opencensus.metrics.export.ExportComponent; +import io.opencensus.implcore.temporary.metrics.export.ExportComponent; /** * Class that holds the implementation instance for {@link ExportComponent}. diff --git a/api/src/main/java/io/opencensus/metrics/Point.java b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Point.java index e66b273d..e7337f59 100644 --- a/api/src/main/java/io/opencensus/metrics/Point.java +++ b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Point.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import com.google.auto.value.AutoValue; import io.opencensus.common.ExperimentalApi; diff --git a/api/src/main/java/io/opencensus/metrics/TimeSeries.java b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/TimeSeries.java index c62b6b72..f149d06d 100644 --- a/api/src/main/java/io/opencensus/metrics/TimeSeries.java +++ b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/TimeSeries.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import com.google.auto.value.AutoValue; import io.opencensus.common.ExperimentalApi; diff --git a/api/src/main/java/io/opencensus/metrics/Value.java b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Value.java index c8fe48f8..a17c5135 100644 --- a/api/src/main/java/io/opencensus/metrics/Value.java +++ b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/Value.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import com.google.auto.value.AutoValue; import io.opencensus.common.ExperimentalApi; diff --git a/api/src/main/java/io/opencensus/metrics/export/ExportComponent.java b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/export/ExportComponent.java index bab65d13..fd299976 100644 --- a/api/src/main/java/io/opencensus/metrics/export/ExportComponent.java +++ b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/export/ExportComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics.export; +package io.opencensus.implcore.temporary.metrics.export; import io.opencensus.common.ExperimentalApi; diff --git a/api/src/main/java/io/opencensus/metrics/export/MetricProducerManager.java b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/export/MetricProducerManager.java index c5acf174..b28b094d 100644 --- a/api/src/main/java/io/opencensus/metrics/export/MetricProducerManager.java +++ b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/export/MetricProducerManager.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.opencensus.metrics.export; +package io.opencensus.implcore.temporary.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/api/src/main/java/io/opencensus/metrics/package-info.java b/impl_core/src/main/java/io/opencensus/implcore/temporary/metrics/package-info.java index 33eadf0c..f768380f 100644 --- a/api/src/main/java/io/opencensus/metrics/package-info.java +++ b/impl_core/src/main/java/io/opencensus/implcore/temporary/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.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.implcore.temporary.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.metrics; +package io.opencensus.implcore.temporary.metrics; 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 e1c17876..6a2ed63d 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.ToDoubleFunction; import io.opencensus.common.ToLongFunction; import io.opencensus.implcore.metrics.Gauge.DoubleGauge; import io.opencensus.implcore.metrics.Gauge.LongGauge; -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.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.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 769efab2..ff3c96bc 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 static com.google.common.truth.Truth.assertThat; import io.opencensus.common.Timestamp; import io.opencensus.common.ToDoubleFunction; import io.opencensus.common.ToLongFunction; -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.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.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 7f2ec153..71790a3f 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 @@ package io.opencensus.implcore.metrics.export; import static com.google.common.truth.Truth.assertThat; -import io.opencensus.metrics.MetricProducer; -import io.opencensus.metrics.export.MetricProducerManager; +import io.opencensus.implcore.temporary.metrics.MetricProducer; +import io.opencensus.implcore.temporary.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 7cc8d984..ad556fce 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 static com.google.common.truth.Truth.assertThat; import io.opencensus.common.Duration; import io.opencensus.common.Timestamp; -import io.opencensus.metrics.LabelKey; -import io.opencensus.metrics.LabelValue; -import io.opencensus.metrics.MetricDescriptor; -import io.opencensus.metrics.MetricDescriptor.Type; +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.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 ed85dded..94f27f89 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.MutableLastValueLong; import io.opencensus.implcore.stats.MutableAggregation.MutableMean; import io.opencensus.implcore.stats.MutableAggregation.MutableSumDouble; import io.opencensus.implcore.stats.MutableAggregation.MutableSumLong; -import io.opencensus.metrics.Distribution.Bucket; -import io.opencensus.metrics.Point; -import io.opencensus.metrics.Value; +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.stats.AggregationData; import io.opencensus.stats.AggregationData.CountData; import io.opencensus.stats.AggregationData.DistributionData; @@ -300,7 +300,7 @@ public class MutableAggregationTest { .isEqualTo( Point.create( Value.distributionValue( - io.opencensus.metrics.Distribution.create( + io.opencensus.implcore.temporary.metrics.Distribution.create( 0, 0, 0, diff --git a/api/src/test/java/io/opencensus/metrics/DistributionTest.java b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/DistributionTest.java index d511e317..eb867d07 100644 --- a/api/src/test/java/io/opencensus/metrics/DistributionTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/DistributionTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import static com.google.common.truth.Truth.assertThat; import com.google.common.testing.EqualsTester; import io.opencensus.common.Timestamp; -import io.opencensus.metrics.Distribution.Bucket; -import io.opencensus.metrics.Distribution.Exemplar; +import io.opencensus.implcore.temporary.metrics.Distribution.Bucket; +import io.opencensus.implcore.temporary.metrics.Distribution.Exemplar; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/api/src/test/java/io/opencensus/metrics/LabelKeyTest.java b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/LabelKeyTest.java index 83f2b59a..aabf868a 100644 --- a/api/src/test/java/io/opencensus/metrics/LabelKeyTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/LabelKeyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import static com.google.common.truth.Truth.assertThat; diff --git a/api/src/test/java/io/opencensus/metrics/LabelValueTest.java b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/LabelValueTest.java index e5526b2f..92d6188b 100644 --- a/api/src/test/java/io/opencensus/metrics/LabelValueTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/LabelValueTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import static com.google.common.truth.Truth.assertThat; diff --git a/api/src/test/java/io/opencensus/metrics/MetricDescriptorTest.java b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricDescriptorTest.java index 9c0a42fc..fb02d22c 100644 --- a/api/src/test/java/io/opencensus/metrics/MetricDescriptorTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricDescriptorTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import static com.google.common.truth.Truth.assertThat; import com.google.common.testing.EqualsTester; -import io.opencensus.metrics.MetricDescriptor.Type; +import io.opencensus.implcore.temporary.metrics.MetricDescriptor.Type; import java.util.Arrays; import java.util.List; import org.hamcrest.CoreMatchers; diff --git a/api/src/test/java/io/opencensus/metrics/MetricRegistryTest.java b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricRegistryTest.java index 49e8ce02..3bce8a84 100644 --- a/api/src/test/java/io/opencensus/metrics/MetricRegistryTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricRegistryTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import io.opencensus.common.ToDoubleFunction; import io.opencensus.common.ToLongFunction; diff --git a/api/src/test/java/io/opencensus/metrics/MetricTest.java b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricTest.java index 37deed4b..8ad03562 100644 --- a/api/src/test/java/io/opencensus/metrics/MetricTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import static com.google.common.truth.Truth.assertThat; import com.google.common.testing.EqualsTester; import io.opencensus.common.Timestamp; -import io.opencensus.metrics.MetricDescriptor.Type; +import io.opencensus.implcore.temporary.metrics.MetricDescriptor.Type; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/api/src/test/java/io/opencensus/metrics/MetricsComponentTest.java b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricsComponentTest.java index 1c4e70f7..cc171637 100644 --- a/api/src/test/java/io/opencensus/metrics/MetricsComponentTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricsComponentTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import static com.google.common.truth.Truth.assertThat; -import io.opencensus.metrics.export.ExportComponent; +import io.opencensus.implcore.temporary.metrics.export.ExportComponent; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/api/src/test/java/io/opencensus/metrics/MetricsTest.java b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricsTest.java index 9e0eee1f..f62934f8 100644 --- a/api/src/test/java/io/opencensus/metrics/MetricsTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/MetricsTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import static com.google.common.truth.Truth.assertThat; -import io.opencensus.metrics.export.ExportComponent; +import io.opencensus.implcore.temporary.metrics.export.ExportComponent; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -54,7 +54,8 @@ public class MetricsTest { } }; assertThat(Metrics.loadMetricsComponent(classLoader).getClass().getName()) - .isEqualTo("io.opencensus.metrics.MetricsComponent$NoopMetricsComponent"); + .isEqualTo( + "io.opencensus.implcore.temporary.metrics.MetricsComponent$NoopMetricsComponent"); } @Test diff --git a/api/src/test/java/io/opencensus/metrics/PointTest.java b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/PointTest.java index cb6175c1..8caa21ed 100644 --- a/api/src/test/java/io/opencensus/metrics/PointTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/PointTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import static com.google.common.truth.Truth.assertThat; import com.google.common.testing.EqualsTester; import io.opencensus.common.Timestamp; -import io.opencensus.metrics.Distribution.Bucket; +import io.opencensus.implcore.temporary.metrics.Distribution.Bucket; import java.util.Arrays; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/api/src/test/java/io/opencensus/metrics/TimeSeriesTest.java b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/TimeSeriesTest.java index 07dff97d..c8cdac24 100644 --- a/api/src/test/java/io/opencensus/metrics/TimeSeriesTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/TimeSeriesTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.metrics; import static com.google.common.truth.Truth.assertThat; diff --git a/api/src/test/java/io/opencensus/metrics/ValueTest.java b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/ValueTest.java index 63430b28..53b4c456 100644 --- a/api/src/test/java/io/opencensus/metrics/ValueTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/ValueTest.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.implcore.temporary.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.metrics.Distribution.Bucket; -import io.opencensus.metrics.Value.ValueDistribution; -import io.opencensus.metrics.Value.ValueDouble; -import io.opencensus.metrics.Value.ValueLong; +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 java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/api/src/test/java/io/opencensus/metrics/export/ExportComponentTest.java b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/export/ExportComponentTest.java index 15c6e883..7b5c91f2 100644 --- a/api/src/test/java/io/opencensus/metrics/export/ExportComponentTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/export/ExportComponentTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics.export; +package io.opencensus.implcore.temporary.metrics.export; import static com.google.common.truth.Truth.assertThat; diff --git a/api/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/export/MetricProducerManagerTest.java index 07854927..5044962b 100644 --- a/api/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/temporary/metrics/export/MetricProducerManagerTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.opencensus.metrics.export; +package io.opencensus.implcore.temporary.metrics.export; import static com.google.common.truth.Truth.assertThat; -import io.opencensus.metrics.MetricProducer; +import io.opencensus.implcore.temporary.metrics.MetricProducer; import org.junit.Before; import org.junit.Rule; import org.junit.Test; 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 6161c12a..ccc9f345 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 @@ package io.opencensus.impllite.metrics; import io.opencensus.implcore.common.MillisClock; import io.opencensus.implcore.metrics.MetricsComponentImplBase; -import io.opencensus.metrics.MetricsComponent; +import io.opencensus.implcore.temporary.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 7ee900a6..388cac8f 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 static com.google.common.truth.Truth.assertThat; import io.opencensus.implcore.metrics.MetricRegistryImpl; import io.opencensus.implcore.metrics.export.ExportComponentImpl; -import io.opencensus.metrics.Metrics; -import io.opencensus.metrics.MetricsComponent; +import io.opencensus.implcore.temporary.metrics.Metrics; +import io.opencensus.implcore.temporary.metrics.MetricsComponent; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; |