diff options
author | Bogdan Drutu <bdrutu@google.com> | 2018-10-02 17:48:35 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-02 17:48:35 -0400 |
commit | 90edbd5a8a0ff10d7658bd78beae9434aee8cdbe (patch) | |
tree | 5495e1e433e174ba55e0474bee9fa328371f16ad /api/src | |
parent | bcfd159c58e80036bbbe1468bf305154d001982e (diff) | |
download | opencensus-java-90edbd5a8a0ff10d7658bd78beae9434aee8cdbe.tar.gz |
Mode classes for metrics data model in the exporter package. (#1480)
* Mode classes for metrics data model in the exporter package. Consistent with trace.
* Fix test class coments.
Diffstat (limited to 'api/src')
-rw-r--r-- | api/src/main/java/io/opencensus/metrics/MetricRegistry.java | 2 | ||||
-rw-r--r-- | api/src/main/java/io/opencensus/metrics/export/Distribution.java (renamed from api/src/main/java/io/opencensus/metrics/Distribution.java) | 2 | ||||
-rw-r--r-- | api/src/main/java/io/opencensus/metrics/export/Metric.java (renamed from api/src/main/java/io/opencensus/metrics/Metric.java) | 10 | ||||
-rw-r--r-- | api/src/main/java/io/opencensus/metrics/export/MetricDescriptor.java (renamed from api/src/main/java/io/opencensus/metrics/MetricDescriptor.java) | 3 | ||||
-rw-r--r-- | api/src/main/java/io/opencensus/metrics/export/MetricProducer.java (renamed from api/src/main/java/io/opencensus/metrics/MetricProducer.java) | 3 | ||||
-rw-r--r-- | api/src/main/java/io/opencensus/metrics/export/MetricProducerManager.java | 1 | ||||
-rw-r--r-- | api/src/main/java/io/opencensus/metrics/export/Point.java (renamed from api/src/main/java/io/opencensus/metrics/Point.java) | 2 | ||||
-rw-r--r-- | api/src/main/java/io/opencensus/metrics/export/Summary.java (renamed from api/src/main/java/io/opencensus/metrics/Summary.java) | 2 | ||||
-rw-r--r-- | api/src/main/java/io/opencensus/metrics/export/TimeSeries.java (renamed from api/src/main/java/io/opencensus/metrics/TimeSeries.java) | 4 | ||||
-rw-r--r-- | api/src/main/java/io/opencensus/metrics/export/Value.java (renamed from api/src/main/java/io/opencensus/metrics/Value.java) | 2 | ||||
-rw-r--r-- | api/src/test/java/io/opencensus/metrics/export/DistributionTest.java (renamed from api/src/test/java/io/opencensus/metrics/DistributionTest.java) | 6 | ||||
-rw-r--r-- | api/src/test/java/io/opencensus/metrics/export/MetricDescriptorTest.java (renamed from api/src/test/java/io/opencensus/metrics/MetricDescriptorTest.java) | 5 | ||||
-rw-r--r-- | api/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java | 1 | ||||
-rw-r--r-- | api/src/test/java/io/opencensus/metrics/export/MetricTest.java (renamed from api/src/test/java/io/opencensus/metrics/MetricTest.java) | 6 | ||||
-rw-r--r-- | api/src/test/java/io/opencensus/metrics/export/PointTest.java (renamed from api/src/test/java/io/opencensus/metrics/PointTest.java) | 4 | ||||
-rw-r--r-- | api/src/test/java/io/opencensus/metrics/export/SummaryTest.java (renamed from api/src/test/java/io/opencensus/metrics/SummaryTest.java) | 6 | ||||
-rw-r--r-- | api/src/test/java/io/opencensus/metrics/export/TimeSeriesTest.java (renamed from api/src/test/java/io/opencensus/metrics/TimeSeriesTest.java) | 3 | ||||
-rw-r--r-- | api/src/test/java/io/opencensus/metrics/export/ValueTest.java (renamed from api/src/test/java/io/opencensus/metrics/ValueTest.java) | 16 |
18 files changed, 41 insertions, 37 deletions
diff --git a/api/src/main/java/io/opencensus/metrics/MetricRegistry.java b/api/src/main/java/io/opencensus/metrics/MetricRegistry.java index c249d47b..a9987b75 100644 --- a/api/src/main/java/io/opencensus/metrics/MetricRegistry.java +++ b/api/src/main/java/io/opencensus/metrics/MetricRegistry.java @@ -24,7 +24,7 @@ import java.util.LinkedHashMap; /** * Creates and manages your application's set of metrics. The default implementation of this creates - * a {@link MetricProducer} and registers it to the global {@link + * a {@link io.opencensus.metrics.export.MetricProducer} and registers it to the global {@link * io.opencensus.metrics.export.MetricProducerManager}. * * @since 0.17 diff --git a/api/src/main/java/io/opencensus/metrics/Distribution.java b/api/src/main/java/io/opencensus/metrics/export/Distribution.java index 9294b838..dc9fa9e9 100644 --- a/api/src/main/java/io/opencensus/metrics/Distribution.java +++ b/api/src/main/java/io/opencensus/metrics/export/Distribution.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.metrics.export; import com.google.auto.value.AutoValue; import io.opencensus.common.ExperimentalApi; diff --git a/api/src/main/java/io/opencensus/metrics/Metric.java b/api/src/main/java/io/opencensus/metrics/export/Metric.java index 0c108b56..07fe356a 100644 --- a/api/src/main/java/io/opencensus/metrics/Metric.java +++ b/api/src/main/java/io/opencensus/metrics/export/Metric.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.metrics.export; import com.google.auto.value.AutoValue; import io.opencensus.common.ExperimentalApi; import io.opencensus.internal.Utils; -import io.opencensus.metrics.Value.ValueDistribution; -import io.opencensus.metrics.Value.ValueDouble; -import io.opencensus.metrics.Value.ValueLong; -import io.opencensus.metrics.Value.ValueSummary; +import io.opencensus.metrics.export.Value.ValueDistribution; +import io.opencensus.metrics.export.Value.ValueDouble; +import io.opencensus.metrics.export.Value.ValueLong; +import io.opencensus.metrics.export.Value.ValueSummary; import java.util.List; import javax.annotation.concurrent.Immutable; diff --git a/api/src/main/java/io/opencensus/metrics/MetricDescriptor.java b/api/src/main/java/io/opencensus/metrics/export/MetricDescriptor.java index 5146cd85..a4629f8e 100644 --- a/api/src/main/java/io/opencensus/metrics/MetricDescriptor.java +++ b/api/src/main/java/io/opencensus/metrics/export/MetricDescriptor.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.metrics.export; import com.google.auto.value.AutoValue; import io.opencensus.common.ExperimentalApi; import io.opencensus.internal.Utils; +import io.opencensus.metrics.LabelKey; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/api/src/main/java/io/opencensus/metrics/MetricProducer.java b/api/src/main/java/io/opencensus/metrics/export/MetricProducer.java index 86f9732f..739a0a9f 100644 --- a/api/src/main/java/io/opencensus/metrics/MetricProducer.java +++ b/api/src/main/java/io/opencensus/metrics/export/MetricProducer.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.metrics.export; import io.opencensus.common.ExperimentalApi; -import io.opencensus.metrics.export.MetricProducerManager; import java.util.Collection; /** diff --git a/api/src/main/java/io/opencensus/metrics/export/MetricProducerManager.java b/api/src/main/java/io/opencensus/metrics/export/MetricProducerManager.java index fc864200..304d9294 100644 --- a/api/src/main/java/io/opencensus/metrics/export/MetricProducerManager.java +++ b/api/src/main/java/io/opencensus/metrics/export/MetricProducerManager.java @@ -18,7 +18,6 @@ package io.opencensus.metrics.export; import io.opencensus.common.ExperimentalApi; 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/Point.java b/api/src/main/java/io/opencensus/metrics/export/Point.java index 9ef7c15b..1f382f9b 100644 --- a/api/src/main/java/io/opencensus/metrics/Point.java +++ b/api/src/main/java/io/opencensus/metrics/export/Point.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.metrics.export; import com.google.auto.value.AutoValue; import io.opencensus.common.ExperimentalApi; diff --git a/api/src/main/java/io/opencensus/metrics/Summary.java b/api/src/main/java/io/opencensus/metrics/export/Summary.java index f23667bb..c82ca961 100644 --- a/api/src/main/java/io/opencensus/metrics/Summary.java +++ b/api/src/main/java/io/opencensus/metrics/export/Summary.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.metrics.export; import com.google.auto.value.AutoValue; import io.opencensus.common.ExperimentalApi; diff --git a/api/src/main/java/io/opencensus/metrics/TimeSeries.java b/api/src/main/java/io/opencensus/metrics/export/TimeSeries.java index d504dad9..959f55ba 100644 --- a/api/src/main/java/io/opencensus/metrics/TimeSeries.java +++ b/api/src/main/java/io/opencensus/metrics/export/TimeSeries.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.metrics.export; import com.google.auto.value.AutoValue; import io.opencensus.common.ExperimentalApi; import io.opencensus.common.Timestamp; import io.opencensus.internal.Utils; +import io.opencensus.metrics.LabelKey; +import io.opencensus.metrics.LabelValue; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/api/src/main/java/io/opencensus/metrics/Value.java b/api/src/main/java/io/opencensus/metrics/export/Value.java index 1bc63b79..00a939c0 100644 --- a/api/src/main/java/io/opencensus/metrics/Value.java +++ b/api/src/main/java/io/opencensus/metrics/export/Value.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.metrics.export; import com.google.auto.value.AutoValue; import io.opencensus.common.ExperimentalApi; diff --git a/api/src/test/java/io/opencensus/metrics/DistributionTest.java b/api/src/test/java/io/opencensus/metrics/export/DistributionTest.java index 5ee88dd6..0be4b5d1 100644 --- a/api/src/test/java/io/opencensus/metrics/DistributionTest.java +++ b/api/src/test/java/io/opencensus/metrics/export/DistributionTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.metrics.export; 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.metrics.export.Distribution.Bucket; +import io.opencensus.metrics.export.Distribution.Exemplar; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/api/src/test/java/io/opencensus/metrics/MetricDescriptorTest.java b/api/src/test/java/io/opencensus/metrics/export/MetricDescriptorTest.java index 9c0a42fc..502170c6 100644 --- a/api/src/test/java/io/opencensus/metrics/MetricDescriptorTest.java +++ b/api/src/test/java/io/opencensus/metrics/export/MetricDescriptorTest.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.metrics.export; import static com.google.common.truth.Truth.assertThat; import com.google.common.testing.EqualsTester; -import io.opencensus.metrics.MetricDescriptor.Type; +import io.opencensus.metrics.LabelKey; +import io.opencensus.metrics.export.MetricDescriptor.Type; import java.util.Arrays; import java.util.List; import org.hamcrest.CoreMatchers; diff --git a/api/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java b/api/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java index 07854927..1025427f 100644 --- a/api/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java +++ b/api/src/test/java/io/opencensus/metrics/export/MetricProducerManagerTest.java @@ -18,7 +18,6 @@ package io.opencensus.metrics.export; import static com.google.common.truth.Truth.assertThat; -import io.opencensus.metrics.MetricProducer; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/api/src/test/java/io/opencensus/metrics/MetricTest.java b/api/src/test/java/io/opencensus/metrics/export/MetricTest.java index 37deed4b..0b1ecf65 100644 --- a/api/src/test/java/io/opencensus/metrics/MetricTest.java +++ b/api/src/test/java/io/opencensus/metrics/export/MetricTest.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.metrics.export; 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.metrics.LabelKey; +import io.opencensus.metrics.LabelValue; +import io.opencensus.metrics.export.MetricDescriptor.Type; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/api/src/test/java/io/opencensus/metrics/PointTest.java b/api/src/test/java/io/opencensus/metrics/export/PointTest.java index 708814c5..da5b83dc 100644 --- a/api/src/test/java/io/opencensus/metrics/PointTest.java +++ b/api/src/test/java/io/opencensus/metrics/export/PointTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.metrics.export; 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.export.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/SummaryTest.java b/api/src/test/java/io/opencensus/metrics/export/SummaryTest.java index 0b70d94e..c10df043 100644 --- a/api/src/test/java/io/opencensus/metrics/SummaryTest.java +++ b/api/src/test/java/io/opencensus/metrics/export/SummaryTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.metrics.export; import static com.google.common.truth.Truth.assertThat; import com.google.common.testing.EqualsTester; -import io.opencensus.metrics.Summary.Snapshot; -import io.opencensus.metrics.Summary.Snapshot.ValueAtPercentile; +import io.opencensus.metrics.export.Summary.Snapshot; +import io.opencensus.metrics.export.Summary.Snapshot.ValueAtPercentile; import java.util.Collections; import org.junit.Rule; import org.junit.Test; diff --git a/api/src/test/java/io/opencensus/metrics/TimeSeriesTest.java b/api/src/test/java/io/opencensus/metrics/export/TimeSeriesTest.java index 07dff97d..31812549 100644 --- a/api/src/test/java/io/opencensus/metrics/TimeSeriesTest.java +++ b/api/src/test/java/io/opencensus/metrics/export/TimeSeriesTest.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.metrics.export; import static com.google.common.truth.Truth.assertThat; import com.google.common.testing.EqualsTester; import io.opencensus.common.Timestamp; +import io.opencensus.metrics.LabelValue; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/api/src/test/java/io/opencensus/metrics/ValueTest.java b/api/src/test/java/io/opencensus/metrics/export/ValueTest.java index a65202a8..3758ed2d 100644 --- a/api/src/test/java/io/opencensus/metrics/ValueTest.java +++ b/api/src/test/java/io/opencensus/metrics/export/ValueTest.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package io.opencensus.metrics; +package io.opencensus.metrics.export; 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.Summary.Snapshot; -import io.opencensus.metrics.Summary.Snapshot.ValueAtPercentile; -import io.opencensus.metrics.Value.ValueDistribution; -import io.opencensus.metrics.Value.ValueDouble; -import io.opencensus.metrics.Value.ValueLong; -import io.opencensus.metrics.Value.ValueSummary; +import io.opencensus.metrics.export.Distribution.Bucket; +import io.opencensus.metrics.export.Summary.Snapshot; +import io.opencensus.metrics.export.Summary.Snapshot.ValueAtPercentile; +import io.opencensus.metrics.export.Value.ValueDistribution; +import io.opencensus.metrics.export.Value.ValueDouble; +import io.opencensus.metrics.export.Value.ValueLong; +import io.opencensus.metrics.export.Value.ValueSummary; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; |