Change our code to use the new tags:: namespace. (#194)

g-easy · web-flow · commit 235c4259da04 · 2018-09-20T19:12:06.000-07:00
diff --git a/examples/grpc/hello_server.cc b/examples/grpc/hello_server.cc
@@ -54,9 +54,9 @@ opencensus::stats::MeasureInt64 LettersMeasure() {
   return measure;
 }
 
-opencensus::stats::TagKey CaseKey() {
-  static const opencensus::stats::TagKey key =
-      opencensus::stats::TagKey::Register("example_uppercased");
+opencensus::tags::TagKey CaseKey() {
+  static const opencensus::tags::TagKey key =
+      opencensus::tags::TagKey::Register("example_uppercased");
   return key;
 }
 
diff --git a/examples/helloworld/helloworld.cc b/examples/helloworld/helloworld.cc
@@ -44,9 +44,9 @@ opencensus::stats::MeasureInt64 VideoSizeMeasure() {
   return video_size;
 }
 
-opencensus::stats::TagKey FrontendKey() {
+opencensus::tags::TagKey FrontendKey() {
   static const auto frontend_key =
-      opencensus::stats::TagKey::Register("my.org/keys/frontend");
+      opencensus::tags::TagKey::Register("my.org/keys/frontend");
   return frontend_key;
 }
 
diff --git a/opencensus/exporters/stats/prometheus/internal/prometheus_test_server.cc b/opencensus/exporters/stats/prometheus/internal/prometheus_test_server.cc
@@ -28,8 +28,8 @@ int main(int argc, char** argv) {
       std::make_shared<opencensus::exporters::stats::PrometheusExporter>();
   exposer.RegisterCollectable(exporter);
 
-  const auto key1 = opencensus::stats::TagKey::Register("key1");
-  const auto key2 = opencensus::stats::TagKey::Register("key2");
+  const auto key1 = opencensus::tags::TagKey::Register("key1");
+  const auto key2 = opencensus::tags::TagKey::Register("key2");
 
   // Create a view and register it with the exporter.
   const std::string foo_usage_measure_name = "example.com/Foo/FooUsage";
diff --git a/opencensus/exporters/stats/prometheus/internal/prometheus_utils_test.cc b/opencensus/exporters/stats/prometheus/internal/prometheus_utils_test.cc
@@ -35,8 +35,8 @@ TEST(SetMetricFamilyTest, CountDouble) {
       "measure_count_double", "", "units");
   const std::string task = "test_task";
   const std::string view_name = "test_descriptor";
-  const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
-  const auto tag_key_2 = opencensus::stats::TagKey::Register("bar");
+  const auto tag_key_1 = opencensus::tags::TagKey::Register("foo");
+  const auto tag_key_2 = opencensus::tags::TagKey::Register("bar");
   const auto view_descriptor =
       opencensus::stats::ViewDescriptor()
           .set_name(view_name)
@@ -112,8 +112,8 @@ TEST(SetMetricFamilyTest, SumDouble) {
       "measure_sum_double", "", "units");
   const std::string task = "test_task";
   const std::string view_name = "test_descriptor";
-  const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
-  const auto tag_key_2 = opencensus::stats::TagKey::Register("bar");
+  const auto tag_key_1 = opencensus::tags::TagKey::Register("foo");
+  const auto tag_key_2 = opencensus::tags::TagKey::Register("bar");
   const auto view_descriptor =
       opencensus::stats::ViewDescriptor()
           .set_name(view_name)
@@ -189,8 +189,8 @@ TEST(SetMetricFamilyTest, SumInt) {
       opencensus::stats::MeasureInt64::Register("measure_sum_int", "", "units");
   const std::string task = "test_task";
   const std::string view_name = "test_descriptor";
-  const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
-  const auto tag_key_2 = opencensus::stats::TagKey::Register("bar");
+  const auto tag_key_1 = opencensus::tags::TagKey::Register("foo");
+  const auto tag_key_2 = opencensus::tags::TagKey::Register("bar");
   const auto view_descriptor =
       opencensus::stats::ViewDescriptor()
           .set_name(view_name)
@@ -266,8 +266,8 @@ TEST(SetMetricFamilyTest, LastValueDouble) {
       "measure_last_value_double", "", "units");
   const std::string task = "test_task";
   const std::string view_name = "test_descriptor";
-  const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
-  const auto tag_key_2 = opencensus::stats::TagKey::Register("bar");
+  const auto tag_key_1 = opencensus::tags::TagKey::Register("foo");
+  const auto tag_key_2 = opencensus::tags::TagKey::Register("bar");
   const auto view_descriptor =
       opencensus::stats::ViewDescriptor()
           .set_name(view_name)
@@ -342,8 +342,8 @@ TEST(SetMetricFamilyTest, LastValueInt64) {
       "measure_last_value_int", "", "units");
   const std::string task = "test_task";
   const std::string view_name = "test_descriptor";
-  const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
-  const auto tag_key_2 = opencensus::stats::TagKey::Register("bar");
+  const auto tag_key_1 = opencensus::tags::TagKey::Register("foo");
+  const auto tag_key_2 = opencensus::tags::TagKey::Register("bar");
   const auto view_descriptor =
       opencensus::stats::ViewDescriptor()
           .set_name(view_name)
@@ -417,8 +417,8 @@ TEST(StackdriverUtilsTest, MakeTimeSeriesDistributionDouble) {
   const auto measure = opencensus::stats::MeasureDouble::Register(
       "measure_distribution_double", "", "units");
   const std::string view_name = "test_descriptor";
-  const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
-  const auto tag_key_2 = opencensus::stats::TagKey::Register("bar");
+  const auto tag_key_1 = opencensus::tags::TagKey::Register("foo");
+  const auto tag_key_2 = opencensus::tags::TagKey::Register("bar");
   const auto bucket_boundaries =
       opencensus::stats::BucketBoundaries::Explicit({0, 10});
   const auto view_descriptor =
diff --git a/opencensus/exporters/stats/stackdriver/internal/stackdriver_e2e_test.cc b/opencensus/exporters/stats/stackdriver/internal/stackdriver_e2e_test.cc
@@ -90,10 +90,10 @@ class StackdriverE2eTest : public ::testing::Test {
       google::monitoring::v3::MetricService::NewStub(::grpc::CreateChannel(
           kGoogleStackdriverStatsAddress, ::grpc::GoogleDefaultCredentials()));
 
-  const opencensus::stats::TagKey key1_ =
-      opencensus::stats::TagKey::Register("key1");
-  const opencensus::stats::TagKey key2_ =
-      opencensus::stats::TagKey::Register("key2");
+  const opencensus::tags::TagKey key1_ =
+      opencensus::tags::TagKey::Register("key1");
+  const opencensus::tags::TagKey key2_ =
+      opencensus::tags::TagKey::Register("key2");
 };
 
 const absl::string_view StackdriverE2eTest::project_id_ =
diff --git a/opencensus/exporters/stats/stackdriver/internal/stackdriver_utils_test.cc b/opencensus/exporters/stats/stackdriver/internal/stackdriver_utils_test.cc
@@ -53,8 +53,8 @@ TEST(StackdriverUtilsTest, SetMetricDescriptorNameAndType) {
 }
 
 TEST(StackdriverUtilsTest, SetMetricDescriptorLabels) {
-  const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
-  const auto tag_key_2 = opencensus::stats::TagKey::Register("bar");
+  const auto tag_key_1 = opencensus::tags::TagKey::Register("foo");
+  const auto tag_key_2 = opencensus::tags::TagKey::Register("bar");
   const auto view_descriptor =
       opencensus::stats::ViewDescriptor().add_column(tag_key_1).add_column(
           tag_key_2);
@@ -177,8 +177,8 @@ TEST(StackdriverUtilsTest, MakeTimeSeriesSumDouble) {
       opencensus::stats::MeasureDouble::Register("measure_sum_double", "", "");
   const std::string task = "test_task";
   const std::string view_name = "test_view";
-  const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
-  const auto tag_key_2 = opencensus::stats::TagKey::Register("bar");
+  const auto tag_key_1 = opencensus::tags::TagKey::Register("foo");
+  const auto tag_key_2 = opencensus::tags::TagKey::Register("bar");
   const auto view_descriptor =
       opencensus::stats::ViewDescriptor()
           .set_name(view_name)
@@ -218,8 +218,8 @@ TEST(StackdriverUtilsTest, MakeTimeSeriesSumInt) {
       opencensus::stats::MeasureInt64::Register("measure_sum_int", "", "");
   const std::string task = "test_task";
   const std::string view_name = "test_descriptor";
-  const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
-  const auto tag_key_2 = opencensus::stats::TagKey::Register("bar");
+  const auto tag_key_1 = opencensus::tags::TagKey::Register("foo");
+  const auto tag_key_2 = opencensus::tags::TagKey::Register("bar");
   const auto view_descriptor =
       opencensus::stats::ViewDescriptor()
           .set_name(view_name)
@@ -260,8 +260,8 @@ TEST(StackdriverUtilsTest, MakeTimeSeriesCountDouble) {
       "measure_count_double", "", "");
   const std::string task = "test_task";
   const std::string view_name = "test_descriptor";
-  const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
-  const auto tag_key_2 = opencensus::stats::TagKey::Register("bar");
+  const auto tag_key_1 = opencensus::tags::TagKey::Register("foo");
+  const auto tag_key_2 = opencensus::tags::TagKey::Register("bar");
   const auto view_descriptor =
       opencensus::stats::ViewDescriptor()
           .set_name(view_name)
@@ -303,8 +303,8 @@ TEST(StackdriverUtilsTest, MakeTimeSeriesDistributionDouble) {
       "measure_distribution_double", "", "");
   const std::string task = "test_task";
   const std::string view_name = "test_view";
-  const auto tag_key_1 = opencensus::stats::TagKey::Register("foo");
-  const auto tag_key_2 = opencensus::stats::TagKey::Register("bar");
+  const auto tag_key_1 = opencensus::tags::TagKey::Register("foo");
+  const auto tag_key_2 = opencensus::tags::TagKey::Register("bar");
   const auto bucket_boundaries =
       opencensus::stats::BucketBoundaries::Explicit({0});
   const auto view_descriptor =
diff --git a/opencensus/exporters/stats/stdout/internal/stdout_exporter_test.cc b/opencensus/exporters/stats/stdout/internal/stdout_exporter_test.cc
@@ -43,7 +43,7 @@ TEST(StdoutExporterTest, Export) {
   std::stringstream s;
   ::opencensus::exporters::stats::StdoutExporter::Register(&s);
 
-  auto key = ::opencensus::stats::TagKey::Register("test_key");
+  auto key = ::opencensus::tags::TagKey::Register("test_key");
   auto measure = ::opencensus::stats::MeasureDouble::Register(
       "example.com/Test/Measure", "Test description.", "1");
   auto descriptor = ::opencensus::stats::ViewDescriptor()
diff --git a/opencensus/stats/examples/exporter_example.cc b/opencensus/stats/examples/exporter_example.cc
@@ -34,9 +34,9 @@ opencensus::stats::MeasureDouble FooUsage() {
   return foo_usage;
 }
 
-opencensus::stats::TagKey FooIdTagKey() {
+opencensus::tags::TagKey FooIdTagKey() {
   static const auto foo_id_tag_key =
-      opencensus::stats::TagKey::Register("foo_id");
+      opencensus::tags::TagKey::Register("foo_id");
   return foo_id_tag_key;
 }
 
diff --git a/opencensus/stats/examples/view_and_recording_example.cc b/opencensus/stats/examples/view_and_recording_example.cc
@@ -35,9 +35,9 @@ opencensus::stats::MeasureDouble FooUsage() {
 
 // The resource owner publicly registers the tag keys used in their recording
 // calls so that it is accessible to views.
-opencensus::stats::TagKey FooIdTagKey() {
+opencensus::tags::TagKey FooIdTagKey() {
   static const auto foo_id_tag_key =
-      opencensus::stats::TagKey::Register("foo_id");
+      opencensus::tags::TagKey::Register("foo_id");
   return foo_id_tag_key;
 }
 
diff --git a/opencensus/stats/internal/debug_string_test.cc b/opencensus/stats/internal/debug_string_test.cc
@@ -62,7 +62,8 @@ TEST(DebugStringTest, ViewDescriptor) {
       AggregationWindow::Interval(absl::Minutes(1));
   const std::string measure_name = "bar";
   static const auto measure = MeasureDouble::Register(measure_name, "", "");
-  static const TagKey tag_key = TagKey::Register("tag_key_1");
+  static const opencensus::tags::TagKey tag_key =
+      opencensus::tags::TagKey::Register("tag_key_1");
   MeasureDouble::Register(measure_name, "", "");
   const std::string description = "description string";
   ViewDescriptor descriptor = ViewDescriptor()
diff --git a/opencensus/stats/internal/delta_producer.cc b/opencensus/stats/internal/delta_producer.cc
@@ -31,7 +31,7 @@ namespace opencensus {
 namespace stats {
 
 void Delta::Record(std::initializer_list<Measurement> measurements,
-                   TagSet tags) {
+                   opencensus::tags::TagMap tags) {
   auto it = delta_.find(tags);
   if (it == delta_.end()) {
     it = delta_.emplace_hint(it, std::piecewise_construct,
@@ -101,7 +101,7 @@ void DeltaProducer::AddBoundaries(uint64_t index,
 }
 
 void DeltaProducer::Record(std::initializer_list<Measurement> measurements,
-                           TagSet tags) {
+                           opencensus::tags::TagMap tags) {
   absl::MutexLock l(&delta_mu_);
   active_delta_.Record(measurements, std::move(tags));
 }
diff --git a/opencensus/stats/internal/delta_producer.h b/opencensus/stats/internal/delta_producer.h
@@ -27,15 +27,16 @@
 #include "opencensus/stats/distribution.h"
 #include "opencensus/stats/internal/measure_data.h"
 #include "opencensus/stats/measure.h"
-#include "opencensus/stats/tag_set.h"
+#include "opencensus/tags/tag_map.h"
 
 namespace opencensus {
 namespace stats {
 
 // Delta is thread-compatible.
 class Delta final {
  public:
-  void Record(std::initializer_list<Measurement> measurements, TagSet tags);
+  void Record(std::initializer_list<Measurement> measurements,
+              opencensus::tags::TagMap tags);
 
   // Swaps registered_boundaries_ and delta_ with *other, clears delta_, and
   // updates registered_boundaries_.
@@ -46,7 +47,8 @@ class Delta final {
   // Clears registered_boundaries_ and delta_.
   void clear();
 
-  const std::unordered_map<TagSet, std::vector<MeasureData>, TagSet::Hash>&
+  const std::unordered_map<opencensus::tags::TagMap, std::vector<MeasureData>,
+                           opencensus::tags::TagMap::Hash>&
   delta() const {
     return delta_;
   }
@@ -58,7 +60,9 @@ class Delta final {
 
   // The actual data. Each MeasureData[] contains one element for each
   // registered measure.
-  std::unordered_map<TagSet, std::vector<MeasureData>, TagSet::Hash> delta_;
+  std::unordered_map<opencensus::tags::TagMap, std::vector<MeasureData>,
+                     opencensus::tags::TagMap::Hash>
+      delta_;
 };
 
 // DeltaProducer is thread-safe.
@@ -74,8 +78,8 @@ class DeltaProducer final {
   // exist.
   void AddBoundaries(uint64_t index, const BucketBoundaries& boundaries);
 
-  void Record(std::initializer_list<Measurement> measurements, TagSet tags)
-      LOCKS_EXCLUDED(delta_mu_);
+  void Record(std::initializer_list<Measurement> measurements,
+              opencensus::tags::TagMap tags) LOCKS_EXCLUDED(delta_mu_);
 
   // Flushes the active delta and blocks until it is harvested.
   void Flush() LOCKS_EXCLUDED(delta_mu_, harvester_mu_);
diff --git a/opencensus/stats/internal/recording.cc b/opencensus/stats/internal/recording.cc
@@ -17,12 +17,13 @@
 #include "absl/time/clock.h"
 #include "opencensus/stats/internal/delta_producer.h"
 #include "opencensus/stats/measure.h"
-#include "opencensus/stats/tag_set.h"
+#include "opencensus/tags/tag_map.h"
 
 namespace opencensus {
 namespace stats {
 
-void Record(std::initializer_list<Measurement> measurements, TagSet tags) {
+void Record(std::initializer_list<Measurement> measurements,
+            opencensus::tags::TagMap tags) {
   DeltaProducer::Get()->Record(measurements, std::move(tags));
 }
 
diff --git a/opencensus/stats/internal/stats_manager.cc b/opencensus/stats/internal/stats_manager.cc
@@ -26,9 +26,9 @@
 #include "opencensus/stats/internal/delta_producer.h"
 #include "opencensus/stats/internal/measure_data.h"
 #include "opencensus/stats/internal/measure_registry_impl.h"
-#include "opencensus/stats/tag_key.h"
-#include "opencensus/stats/tag_set.h"
 #include "opencensus/stats/view_descriptor.h"
+#include "opencensus/tags/tag_key.h"
+#include "opencensus/tags/tag_map.h"
 
 namespace opencensus {
 namespace stats {
@@ -66,13 +66,13 @@ int StatsManager::ViewInformation::RemoveConsumer() {
   return --num_consumers_;
 }
 
-void StatsManager::ViewInformation::MergeMeasureData(const TagSet& tags,
-                                                     const MeasureData& data,
-                                                     absl::Time now) {
+void StatsManager::ViewInformation::MergeMeasureData(
+    const opencensus::tags::TagMap& tags, const MeasureData& data,
+    absl::Time now) {
   mu_->AssertHeld();
   std::vector<std::string> tag_values(descriptor_.columns().size());
   for (int i = 0; i < tag_values.size(); ++i) {
-    const TagKey column = descriptor_.columns()[i];
+    const opencensus::tags::TagKey column = descriptor_.columns()[i];
     for (const auto& tag : tags.tags()) {
       if (tag.first == column) {
         tag_values[i] = std::string(tag.second);
@@ -98,9 +98,9 @@ std::unique_ptr<ViewDataImpl> StatsManager::ViewInformation::GetData() {
 // ==========================================================================
 // // StatsManager::MeasureInformation
 
-void StatsManager::MeasureInformation::MergeMeasureData(const TagSet& tags,
-                                                        const MeasureData& data,
-                                                        absl::Time now) {
+void StatsManager::MeasureInformation::MergeMeasureData(
+    const opencensus::tags::TagMap& tags, const MeasureData& data,
+    absl::Time now) {
   mu_->AssertHeld();
   for (auto& view : views_) {
     view->MergeMeasureData(tags, data, now);
diff --git a/opencensus/stats/internal/stats_manager.h b/opencensus/stats/internal/stats_manager.h
@@ -26,9 +26,9 @@
 #include "opencensus/stats/internal/measure_data.h"
 #include "opencensus/stats/internal/view_data_impl.h"
 #include "opencensus/stats/measure.h"
-#include "opencensus/stats/tag_key.h"
-#include "opencensus/stats/tag_set.h"
 #include "opencensus/stats/view_descriptor.h"
+#include "opencensus/tags/tag_key.h"
+#include "opencensus/tags/tag_map.h"
 
 namespace opencensus {
 namespace stats {
@@ -58,8 +58,8 @@ class StatsManager final {
     int RemoveConsumer();
 
     // Adds 'data' under 'tags' as of 'now'. Requires holding *mu_;
-    void MergeMeasureData(const TagSet& tags, const MeasureData& data,
-                          absl::Time now);
+    void MergeMeasureData(const opencensus::tags::TagMap& tags,
+                          const MeasureData& data, absl::Time now);
 
     // Retrieves a copy of the data.
     std::unique_ptr<ViewDataImpl> GetData() LOCKS_EXCLUDED(*mu_);
@@ -108,8 +108,8 @@ class StatsManager final {
 
     // Merges measure_data into all views under this measure. Requires holding
     // *mu_;
-    void MergeMeasureData(const TagSet& tags, const MeasureData& data,
-                          absl::Time now);
+    void MergeMeasureData(const opencensus::tags::TagMap& tags,
+                          const MeasureData& data, absl::Time now);
 
     ViewInformation* AddConsumer(const ViewDescriptor& descriptor);
     void RemoveView(const ViewInformation* handle);
diff --git a/opencensus/stats/internal/stats_manager_benchmark.cc b/opencensus/stats/internal/stats_manager_benchmark.cc
diff --git a/opencensus/stats/internal/stats_manager_test.cc b/opencensus/stats/internal/stats_manager_test.cc
diff --git a/opencensus/stats/internal/view_descriptor.cc b/opencensus/stats/internal/view_descriptor.cc
diff --git a/opencensus/stats/recording.h b/opencensus/stats/recording.h
diff --git a/opencensus/stats/view_descriptor.h b/opencensus/stats/view_descriptor.h

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,9 @@ opencensus::stats::MeasureInt64 LettersMeasure() {`
`54`	`54`	`return measure;`
`55`	`55`	`}`
`56`	`56`
`57`		`-opencensus::stats::TagKey CaseKey() {`
`58`		`- static const opencensus::stats::TagKey key =`
`59`		`- opencensus::stats::TagKey::Register("example_uppercased");`
	`57`	`+opencensus::tags::TagKey CaseKey() {`
	`58`	`+ static const opencensus::tags::TagKey key =`
	`59`	`+ opencensus::tags::TagKey::Register("example_uppercased");`
`60`	`60`	`return key;`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,9 @@ opencensus::stats::MeasureInt64 VideoSizeMeasure() {`
`44`	`44`	`return video_size;`
`45`	`45`	`}`
`46`	`46`
`47`		`-opencensus::stats::TagKey FrontendKey() {`
	`47`	`+opencensus::tags::TagKey FrontendKey() {`
`48`	`48`	`static const auto frontend_key =`
`49`		`- opencensus::stats::TagKey::Register("my.org/keys/frontend");`
	`49`	`+ opencensus::tags::TagKey::Register("my.org/keys/frontend");`
`50`	`50`	`return frontend_key;`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,9 @@ opencensus::stats::MeasureDouble FooUsage() {`
`34`	`34`	`return foo_usage;`
`35`	`35`	`}`
`36`	`36`
`37`		`-opencensus::stats::TagKey FooIdTagKey() {`
	`37`	`+opencensus::tags::TagKey FooIdTagKey() {`
`38`	`38`	`static const auto foo_id_tag_key =`
`39`		`- opencensus::stats::TagKey::Register("foo_id");`
	`39`	`+ opencensus::tags::TagKey::Register("foo_id");`
`40`	`40`	`return foo_id_tag_key;`
`41`	`41`	`}`
`42`	`42`