Switch Record() to use the DeltaProducer. (#131)

Author: Ian Sturdy

opencensus/plugins/grpc/BUILD

@@ -70,6 +70,7 @@ cc_test(
         ":grpc_plugin",
         "//opencensus/plugins/grpc/internal/testing:echo_proto",
         "//opencensus/stats",
+        "//opencensus/stats:test_utils",
         "@com_github_grpc_grpc//:grpc++",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",

opencensus/plugins/grpc/internal/stats_plugin_end2end_test.cc

@@ -26,6 +26,7 @@
 #include "opencensus/plugins/grpc/grpc_plugin.h"
 #include "opencensus/plugins/grpc/internal/testing/echo.grpc.pb.h"
 #include "opencensus/stats/stats.h"
+#include "opencensus/stats/testing/test_utils.h"
 
 namespace opencensus {
 namespace testing {
@@ -129,6 +130,7 @@ TEST_F(StatsPluginEnd2EndTest, ErrorCount) {
     ::grpc::Status status = stub_->Echo(&context, request, &response);
   }
   absl::SleepFor(absl::Milliseconds(500));
+  stats::testing::TestUtils::Flush();
 
   EXPECT_THAT(client_method_view.GetData().double_data(),
               ::testing::UnorderedElementsAre(::testing::Pair(
@@ -179,6 +181,7 @@ TEST_F(StatsPluginEnd2EndTest, RequestResponseBytes) {
     EXPECT_EQ("foo", response.message());
   }
   absl::SleepFor(absl::Milliseconds(500));
+  stats::testing::TestUtils::Flush();
 
   EXPECT_THAT(
       client_request_bytes_view.GetData().distribution_data(),
@@ -232,6 +235,7 @@ TEST_F(StatsPluginEnd2EndTest, Latency) {
   const double max_time = absl::ToDoubleMilliseconds(absl::Now() - start_time);
 
   absl::SleepFor(absl::Milliseconds(500));
+  stats::testing::TestUtils::Flush();
 
   EXPECT_THAT(
       client_latency_view.GetData().distribution_data(),
@@ -292,6 +296,7 @@ TEST_F(StatsPluginEnd2EndTest, StartFinishCount) {
       EXPECT_EQ("foo", response.message());
     }
     absl::SleepFor(absl::Milliseconds(500));
+    stats::testing::TestUtils::Flush();
 
     EXPECT_THAT(client_started_count_view.GetData().double_data(),
                 ::testing::UnorderedElementsAre(::testing::Pair(
@@ -327,6 +332,7 @@ TEST_F(StatsPluginEnd2EndTest, RequestResponseCount) {
       EXPECT_EQ("foo", response.message());
     }
     absl::SleepFor(absl::Milliseconds(500));
+    stats::testing::TestUtils::Flush();
 
     EXPECT_THAT(client_request_count_view.GetData().distribution_data(),
                 ::testing::UnorderedElementsAre(::testing::Pair(

opencensus/stats/BUILD

@@ -137,16 +137,6 @@ cc_test(
     ],
 )
 
-cc_test(
-    name = "delta_producer_stats_test",
-    srcs = ["internal/delta_producer_stats_test.cc"],
-    copts = TEST_COPTS,
-    deps = [
-        ":core",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
 cc_test(
     name = "distribution_test",
     srcs = ["internal/distribution_test.cc"],
@@ -212,6 +202,7 @@ cc_test(
     deps = [
         ":core",
         ":recording",
+        ":test_utils",
         "@com_google_absl//absl/types:optional",
         "@com_google_googletest//:gtest_main",
     ],

opencensus/stats/examples/BUILD

@@ -32,6 +32,7 @@ cc_test(
     copts = TEST_COPTS,
     deps = [
         "//opencensus/stats",
+        "@com_google_absl//absl/time",
         "@com_google_googletest//:gtest_main",
     ],
 )

opencensus/stats/examples/view_and_recording_example.cc

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "absl/time/clock.h"
+#include "absl/time/time.h"
 #include "opencensus/stats/stats.h"
 
 #include "gtest/gtest.h"
@@ -80,6 +82,8 @@ TEST(ViewAndRecordingExample, Sum) {
   // Once the view is created, usage records under example.com/Bar/FooUsage.
   foo.Use(1);
   foo.Use(4);
+  // Sleep to allow the data to propagate to views.
+  absl::SleepFor(absl::Seconds(6));
 
   // The stats consumer can now query the recorded data.
   if (view.IsValid()) {

opencensus/stats/internal/delta_producer.cc

@@ -139,10 +139,5 @@ void DeltaProducer::RunHarvesterLoop() {
   }
 }
 
-void ExperimentalDeltaProducerRecord(
-    std::initializer_list<Measurement> measurements, TagSet tags) {
-  DeltaProducer::Get()->Record(measurements, std::move(tags));
-}
-
 }  // namespace stats
 }  // namespace opencensus

opencensus/stats/internal/delta_producer.h

@@ -120,10 +120,6 @@ class DeltaProducer final {
   std::thread harvester_thread_ GUARDED_BY(harvester_mu_);
 };
 
-// TODO: Replace Record with this when ready.
-void ExperimentalDeltaProducerRecord(
-    std::initializer_list<Measurement> measurements, TagSet tags = TagSet({}));
-
 }  // namespace stats
 }  // namespace opencensus