diff options
author | Yang Song <songy23@users.noreply.github.com> | 2018-03-07 14:51:17 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-07 14:51:17 -0800 |
commit | b28e6efbf8d36304cae8977e83faf1f47b4d5c69 (patch) | |
tree | f1744f08ba8322e26d05efe6fb8681c6b7621a41 /impl_core/src/main/java | |
parent | 35bf957b19c9775eec129e62f1122a7ebe5f595b (diff) | |
download | opencensus-java-b28e6efbf8d36304cae8977e83faf1f47b4d5c69.tar.gz |
Deprecate Window and WindowData. (#1018)
* Deprecate Window and WindowType in Stats APIs
* Window and WindowData will continue to be NonNull
* Suppress warnings for impl, exporter and zpages.
* NoopStats should continue to use old method.
Diffstat (limited to 'impl_core/src/main/java')
-rw-r--r-- | impl_core/src/main/java/io/opencensus/implcore/stats/MeasureToViewMap.java | 4 | ||||
-rw-r--r-- | impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java | 27 |
2 files changed, 16 insertions, 15 deletions
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 64173713..34341bad 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 @@ -30,7 +30,6 @@ import io.opencensus.stats.Measurement.MeasurementDouble; import io.opencensus.stats.Measurement.MeasurementLong; import io.opencensus.stats.StatsCollectionState; import io.opencensus.stats.View; -import io.opencensus.stats.View.AggregationWindow; import io.opencensus.stats.ViewData; import io.opencensus.tags.TagContext; import java.util.Collection; @@ -47,6 +46,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; */ /** A class that stores a singleton map from {@code MeasureName}s to {@link MutableViewData}s. */ +@SuppressWarnings("deprecation") final class MeasureToViewMap { /* @@ -89,7 +89,7 @@ final class MeasureToViewMap { private static Set<View> filterExportedViews(Collection<View> allViews) { Set<View> views = Sets.newHashSet(); for (View view : allViews) { - if (view.getWindow() instanceof AggregationWindow.Cumulative) { + if (view.getWindow() instanceof View.AggregationWindow.Cumulative) { views.add(view); } } 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 8ecb7dca..b82136d3 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 @@ -46,11 +46,7 @@ import io.opencensus.stats.AggregationData.SumDataLong; import io.opencensus.stats.Measure; import io.opencensus.stats.StatsCollectionState; import io.opencensus.stats.View; -import io.opencensus.stats.View.AggregationWindow.Cumulative; -import io.opencensus.stats.View.AggregationWindow.Interval; import io.opencensus.stats.ViewData; -import io.opencensus.stats.ViewData.AggregationWindowData.CumulativeData; -import io.opencensus.stats.ViewData.AggregationWindowData.IntervalData; import io.opencensus.tags.InternalUtils; import io.opencensus.tags.Tag; import io.opencensus.tags.TagContext; @@ -69,6 +65,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; */ /** A mutable version of {@link ViewData}, used for recording stats and start/end time. */ +@SuppressWarnings("deprecation") abstract class MutableViewData { private static final long MILLIS_PER_SECOND = 1000L; @@ -230,13 +227,13 @@ abstract class MutableViewData { return ViewData.create( super.view, createAggregationMap(tagValueAggregationMap, super.view.getMeasure()), - CumulativeData.create(start, now)); + ViewData.AggregationWindowData.CumulativeData.create(start, now)); } else { // If Stats state is DISABLED, return an empty ViewData. return ViewData.create( super.view, Collections.<List<TagValue>, AggregationData>emptyMap(), - CumulativeData.create(ZERO_TIMESTAMP, ZERO_TIMESTAMP)); + ViewData.AggregationWindowData.CumulativeData.create(ZERO_TIMESTAMP, ZERO_TIMESTAMP)); } } @@ -298,7 +295,7 @@ abstract class MutableViewData { private IntervalMutableViewData(View view, Timestamp start) { super(view); - Duration totalDuration = ((Interval) view.getWindow()).getDuration(); + Duration totalDuration = ((View.AggregationWindow.Interval) view.getWindow()).getDuration(); this.totalDuration = totalDuration; this.bucketDuration = Duration.fromMillis(toMillis(totalDuration) / N); @@ -321,13 +318,15 @@ abstract class MutableViewData { refreshBucketList(now); if (state == StatsCollectionState.ENABLED) { return ViewData.create( - super.view, combineBucketsAndGetAggregationMap(now), IntervalData.create(now)); + super.view, + combineBucketsAndGetAggregationMap(now), + ViewData.AggregationWindowData.IntervalData.create(now)); } else { // If Stats state is DISABLED, return an empty ViewData. return ViewData.create( super.view, Collections.<List<TagValue>, AggregationData>emptyMap(), - IntervalData.create(ZERO_TIMESTAMP)); + ViewData.AggregationWindowData.IntervalData.create(ZERO_TIMESTAMP)); } } @@ -576,9 +575,10 @@ abstract class MutableViewData { private static final CreateDistributionData INSTANCE = new CreateDistributionData(); } - private static final class CreateCumulative implements Function<Cumulative, MutableViewData> { + private static final class CreateCumulative + implements Function<View.AggregationWindow.Cumulative, MutableViewData> { @Override - public MutableViewData apply(Cumulative arg) { + public MutableViewData apply(View.AggregationWindow.Cumulative arg) { return new CumulativeMutableViewData(view, start); } @@ -591,9 +591,10 @@ abstract class MutableViewData { } } - private static final class CreateInterval implements Function<Interval, MutableViewData> { + private static final class CreateInterval + implements Function<View.AggregationWindow.Interval, MutableViewData> { @Override - public MutableViewData apply(Interval arg) { + public MutableViewData apply(View.AggregationWindow.Interval arg) { return new IntervalMutableViewData(view, start); } |