Remove the last occurrences of AggregationWindow in the public API. (#94)

Author: Ian Sturdy

opencensus/exporters/stats/stackdriver/internal/stackdriver_utils.cc

@@ -67,16 +67,6 @@ void SetOpenCensusTaskLabelDescriptor(
   label_descriptor->set_description(kOpenCensusTaskDescription);
 }
 
-google::api::MetricDescriptor::MetricKind GetMetricKind(
-    const opencensus::stats::ViewDescriptor& descriptor) {
-  switch (descriptor.aggregation_window().type()) {
-    case opencensus::stats::AggregationWindow::Type::kCumulative:
-      return google::api::MetricDescriptor::CUMULATIVE;
-    case opencensus::stats::AggregationWindow::Type::kInterval:
-      return google::api::MetricDescriptor::METRIC_KIND_UNSPECIFIED;
-  }
-}
-
 google::api::MetricDescriptor::ValueType GetValueType(
     const opencensus::stats::ViewDescriptor& descriptor) {
   switch (descriptor.aggregation().type()) {
@@ -167,7 +157,7 @@ void SetMetricDescriptor(
   for (const auto& tag_key : view_descriptor.columns()) {
     SetLabelDescriptor(tag_key, metric_descriptor->add_labels());
   }
-  metric_descriptor->set_metric_kind(GetMetricKind(view_descriptor));
+  metric_descriptor->set_metric_kind(google::api::MetricDescriptor::CUMULATIVE);
   metric_descriptor->set_value_type(GetValueType(view_descriptor));
   metric_descriptor->set_unit(view_descriptor.measure_descriptor().units());
   metric_descriptor->set_description(view_descriptor.description());

opencensus/stats/internal/stats_manager.cc

@@ -36,7 +36,7 @@ StatsManager::ViewInformation::ViewInformation(const ViewDescriptor& descriptor,
 bool StatsManager::ViewInformation::Matches(
     const ViewDescriptor& descriptor) const {
   return descriptor.aggregation() == descriptor_.aggregation() &&
-         descriptor.aggregation_window() == descriptor_.aggregation_window() &&
+         descriptor.aggregation_window_ == descriptor_.aggregation_window_ &&
          descriptor.columns() == descriptor_.columns();
 }
 

opencensus/stats/internal/view_data.cc

@@ -26,9 +26,6 @@ namespace stats {
 const Aggregation& ViewData::aggregation() const {
   return impl_->aggregation();
 }
-const AggregationWindow& ViewData::aggregation_window() const {
-  return impl_->aggregation_window();
-}
 
 ViewData::Type ViewData::type() const {
   switch (impl_->type()) {

opencensus/stats/internal/view_data_impl.cc

@@ -22,10 +22,9 @@
 namespace opencensus {
 namespace stats {
 
-namespace {
-
-ViewDataImpl::Type TypeForDescriptor(const ViewDescriptor& descriptor) {
-  switch (descriptor.aggregation_window().type()) {
+ViewDataImpl::Type ViewDataImpl::TypeForDescriptor(
+    const ViewDescriptor& descriptor) {
+  switch (descriptor.aggregation_window_.type()) {
     case AggregationWindow::Type::kCumulative:
       switch (descriptor.aggregation().type()) {
         case Aggregation::Type::kSum:
@@ -40,12 +39,10 @@ ViewDataImpl::Type TypeForDescriptor(const ViewDescriptor& descriptor) {
   }
 }
 
-}  // namespace
-
 ViewDataImpl::ViewDataImpl(absl::Time start_time,
                            const ViewDescriptor& descriptor)
     : aggregation_(descriptor.aggregation()),
-      aggregation_window_(descriptor.aggregation_window()),
+      aggregation_window_(descriptor.aggregation_window_),
       type_(TypeForDescriptor(descriptor)),
       start_time_(start_time) {
   switch (type_) {

opencensus/stats/internal/view_data_impl.h

@@ -108,6 +108,8 @@ class ViewDataImpl {
            absl::Time now);
 
  private:
+  Type TypeForDescriptor(const ViewDescriptor& descriptor);
+
   const Aggregation aggregation_;
   const AggregationWindow aggregation_window_;
   const Type type_;

opencensus/stats/internal/view_data_test.cc

@@ -34,7 +34,6 @@ TEST(ViewDataTest, CumulativeSum) {
   const auto descriptor = ViewDescriptor().set_aggregation(Aggregation::Sum());
   ViewData data = testing::TestUtils::MakeViewData(descriptor, {{{}, 2.0}});
   EXPECT_EQ(Aggregation::Sum(), data.aggregation());
-  EXPECT_EQ(AggregationWindow::Cumulative(), data.aggregation_window());
   ASSERT_EQ(ViewData::Type::kDouble, data.type());
   EXPECT_THAT(data.double_data(),
               ::testing::UnorderedElementsAre(
@@ -47,9 +46,6 @@ TEST(ViewDataTest, IntervalSum) {
                        &descriptor);
   ViewData data = testing::TestUtils::MakeViewData(descriptor, {{{}, 2.0}});
   EXPECT_EQ(Aggregation::Sum(), data.aggregation());
-  EXPECT_EQ(AggregationWindow::Type::kInterval,
-            data.aggregation_window().type());
-  EXPECT_EQ(absl::Minutes(1), data.aggregation_window().duration());
   ASSERT_EQ(ViewData::Type::kDouble, data.type());
   EXPECT_THAT(data.double_data(),
               ::testing::UnorderedElementsAre(
@@ -61,7 +57,6 @@ TEST(ViewDataTest, CumulativeCount) {
       ViewDescriptor().set_aggregation(Aggregation::Count());
   ViewData data = testing::TestUtils::MakeViewData(descriptor, {{{}, 2.0}});
   EXPECT_EQ(Aggregation::Count(), data.aggregation());
-  EXPECT_EQ(AggregationWindow::Cumulative(), data.aggregation_window());
   ASSERT_EQ(ViewData::Type::kInt64, data.type());
   EXPECT_THAT(data.int_data(), ::testing::UnorderedElementsAre(::testing::Pair(
                                    ::testing::ElementsAre(), 1)));
@@ -73,9 +68,6 @@ TEST(ViewDataTest, IntervalCount) {
                        &descriptor);
   ViewData data = testing::TestUtils::MakeViewData(descriptor, {{{}, 2.0}});
   EXPECT_EQ(Aggregation::Count(), data.aggregation());
-  EXPECT_EQ(AggregationWindow::Type::kInterval,
-            data.aggregation_window().type());
-  EXPECT_EQ(absl::Minutes(1), data.aggregation_window().duration());
   ASSERT_EQ(ViewData::Type::kDouble, data.type());
   EXPECT_THAT(data.double_data(),
               ::testing::UnorderedElementsAre(
@@ -88,7 +80,6 @@ TEST(ViewDataTest, CumulativeDistribution) {
   const auto descriptor = ViewDescriptor().set_aggregation(aggregation);
   ViewData data = testing::TestUtils::MakeViewData(descriptor, {{{}, 2.0}});
   EXPECT_EQ(aggregation, data.aggregation());
-  EXPECT_EQ(AggregationWindow::Cumulative(), data.aggregation_window());
   ASSERT_EQ(ViewData::Type::kDistribution, data.type());
   EXPECT_EQ(data.distribution_data().size(), 1);
 }
@@ -101,9 +92,6 @@ TEST(ViewDataTest, IntervalDistribution) {
                        &descriptor);
   ViewData data = testing::TestUtils::MakeViewData(descriptor, {{{}, 2.0}});
   EXPECT_EQ(aggregation, data.aggregation());
-  EXPECT_EQ(AggregationWindow::Type::kInterval,
-            data.aggregation_window().type());
-  EXPECT_EQ(absl::Minutes(1), data.aggregation_window().duration());
   ASSERT_EQ(ViewData::Type::kDistribution, data.type());
   EXPECT_EQ(data.distribution_data().size(), 1);
 }

opencensus/stats/view_data.h

@@ -25,7 +25,6 @@
 #include "opencensus/common/internal/string_vector_hash.h"
 #include "opencensus/stats/aggregation.h"
 #include "opencensus/stats/distribution.h"
-#include "opencensus/stats/internal/aggregation_window.h"
 
 namespace opencensus {
 namespace stats {
@@ -48,7 +47,6 @@ class ViewData {
                                      common::StringVectorHash>;
 
   const Aggregation& aggregation() const;
-  const AggregationWindow& aggregation_window() const;
 
   enum class Type {
     kDouble,

opencensus/stats/view_descriptor.h

@@ -62,14 +62,6 @@ class ViewDescriptor final {
   ViewDescriptor& set_aggregation(const Aggregation& aggregation);
   const Aggregation& aggregation() const { return aggregation_; }
 
-  // Retrieves the AggregationWindow--see internal/aggregation_window.h for
-  // details. For exported views this should be left at the default Cumulative;
-  // for on-task data needing other windows, internal/set_aggregation_window.h
-  // provides an interface for setting this field.
-  const AggregationWindow& aggregation_window() const {
-    return aggregation_window_;
-  }
-
   // Adds a dimension to the view's data. When data is recorded it can specify a
   // number of tags, key-value pairs; the aggregated data for each view will be
   // broken down by the distinct values of each tag key matching one of the
@@ -103,6 +95,7 @@ class ViewDescriptor final {
 
  private:
   friend class StatsManager;
+  friend class ViewDataImpl;
   friend void SetAggregationWindow(const AggregationWindow&, ViewDescriptor*);
 
   std::string name_;