Tidy up code. (#220)

g-easy · web-flow · commit e9a943b244f4 · 2018-10-11T19:14:10.000+11:00
* Remove some unnecessary includes.
* Some clang-tidy adjustments.
diff --git a/opencensus/common/internal/random.h b/opencensus/common/internal/random.h
@@ -15,12 +15,11 @@
 #ifndef OPENCENSUS_COMMON_INTERNAL_RANDOM_H_
 #define OPENCENSUS_COMMON_INTERNAL_RANDOM_H_
 
+#include <cstddef>
 #include <cstdint>
-#include <cstring>
-#include <memory>
 #include <random>
-#include <vector>
 
+#include "absl/base/thread_annotations.h"
 #include "absl/synchronization/mutex.h"
 #include "absl/time/clock.h"
 
diff --git a/opencensus/common/internal/random_benchmark.cc b/opencensus/common/internal/random_benchmark.cc
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <cstddef>
 #include <cstdint>
 #include <vector>
 
diff --git a/opencensus/common/internal/stats_object.h b/opencensus/common/internal/stats_object.h
@@ -25,7 +25,6 @@
 #include <vector>
 
 #include "absl/base/macros.h"
-#include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/substitute.h"
 #include "absl/time/clock.h"
diff --git a/opencensus/common/internal/stats_object_test.cc b/opencensus/common/internal/stats_object_test.cc
@@ -18,10 +18,7 @@
 #include <cstdlib>
 #include <deque>
 #include <iostream>
-#include <memory>
 #include <numeric>
-#include <random>
-#include <utility>
 
 #include "absl/strings/str_join.h"
 #include "absl/types/span.h"
diff --git a/opencensus/common/internal/string_vector_hash.h b/opencensus/common/internal/string_vector_hash.h
@@ -15,7 +15,7 @@
 #ifndef OPENCENSUS_COMMON_INTERNAL_STRING_VECTOR_HASH_H_
 #define OPENCENSUS_COMMON_INTERNAL_STRING_VECTOR_HASH_H_
 
-#include <functional>
+#include <cstddef>
 #include <string>
 #include <vector>
 
diff --git a/opencensus/context/internal/context_benchmark.cc b/opencensus/context/internal/context_benchmark.cc
@@ -12,11 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "opencensus/context/context.h"
-
 #include <functional>
 
 #include "benchmark/benchmark.h"
+#include "opencensus/context/context.h"
 
 namespace opencensus {
 namespace context {
diff --git a/opencensus/context/internal/with_context_test.cc b/opencensus/context/internal/with_context_test.cc
@@ -14,8 +14,8 @@
 
 #include "opencensus/context/with_context.h"
 
-#include <iostream>
 #include <thread>
+#include <utility>
 
 #include "gtest/gtest.h"
 #include "opencensus/context/context.h"
@@ -45,7 +45,7 @@ TEST(WithContextTest, WithContextConditional) {
 #ifndef NDEBUG
 TEST(WithContextDeathTest, DestructorOnWrongThread) {
   opencensus::context::Context ctx = opencensus::context::Context::Current();
-  EXPECT_DEATH_IF_SUPPORTED(
+  EXPECT_DEBUG_DEATH(
       {
         auto* wc = new opencensus::context::WithContext(ctx);
         std::thread t([wc]() {
diff --git a/opencensus/exporters/stats/stackdriver/internal/stackdriver_e2e_test.cc b/opencensus/exporters/stats/stackdriver/internal/stackdriver_e2e_test.cc
@@ -135,9 +135,8 @@ StackdriverE2eTest::RetrieveData(
     }
     if (response.next_page_token().empty()) {
       break;
-    } else {
-      request.set_page_token(response.next_page_token());
     }
+    request.set_page_token(response.next_page_token());
   }
   return data;
 }
diff --git a/opencensus/exporters/stats/stackdriver/internal/stackdriver_exporter.cc b/opencensus/exporters/stats/stackdriver/internal/stackdriver_exporter.cc
@@ -21,6 +21,7 @@
 #include <vector>
 
 #include <grpcpp/grpcpp.h>
+#include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/synchronization/mutex.h"
diff --git a/opencensus/exporters/stats/stdout/internal/stdout_exporter.cc b/opencensus/exporters/stats/stdout/internal/stdout_exporter.cc
@@ -15,8 +15,11 @@
 #include "opencensus/exporters/stats/stdout/stdout_exporter.h"
 
 #include <cstdint>
-#include <functional>
 #include <iostream>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
@@ -30,7 +33,7 @@ namespace stats {
 
 namespace {
 
-// Functions to print data for different aggregation types.
+// Functions to format data for different aggregation types.
 std::string DataToString(double data) { return absl::StrCat(": ", data, "\n"); }
 std::string DataToString(int64_t data) {
   return absl::StrCat(": ", data, "\n");
@@ -47,7 +50,7 @@ std::string DataToString(const opencensus::stats::Distribution& data) {
 
 class Handler : public opencensus::stats::StatsExporter::Handler {
  public:
-  Handler(std::ostream* stream) : stream_(stream) {}
+  explicit Handler(std::ostream* stream) : stream_(stream) {}
 
   void ExportViewData(
       const std::vector<std::pair<opencensus::stats::ViewDescriptor,
@@ -91,7 +94,7 @@ void Handler::ExportViewDataImpl(
     const opencensus::stats::ViewDescriptor& descriptor, absl::Time start_time,
     absl::Time end_time,
     const opencensus::stats::ViewData::DataMap<DataValueT>& data) {
-  if (data.size() == 0) {
+  if (data.empty()) {
     *stream_ << absl::StrCat("No data for view \"", descriptor.name(),
                              "\" from ", absl::FormatTime(start_time), ".\n\n");
     return;
diff --git a/opencensus/exporters/stats/stdout/internal/stdout_exporter_test.cc b/opencensus/exporters/stats/stdout/internal/stdout_exporter_test.cc
@@ -17,7 +17,6 @@
 #include <iostream>
 #include <sstream>
 
-#include "absl/time/clock.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "opencensus/stats/stats.h"
diff --git a/opencensus/exporters/trace/stdout/BUILD b/opencensus/exporters/trace/stdout/BUILD
@@ -30,7 +30,6 @@ cc_library(
         "//opencensus/trace",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/memory",
-        "@com_google_absl//absl/strings",
     ],
 )
 
diff --git a/opencensus/exporters/trace/stdout/internal/stdout_exporter.cc b/opencensus/exporters/trace/stdout/internal/stdout_exporter.cc
@@ -29,7 +29,7 @@ namespace {
 
 class Handler : public ::opencensus::trace::exporter::SpanExporter::Handler {
  public:
-  Handler(std::ostream* stream) : stream_(stream) {}
+  explicit Handler(std::ostream* stream) : stream_(stream) {}
 
   void Export(const std::vector<::opencensus::trace::exporter::SpanData>& spans)
       override {
diff --git a/opencensus/exporters/trace/stdout/internal/stdout_exporter_test.cc b/opencensus/exporters/trace/stdout/internal/stdout_exporter_test.cc
@@ -22,6 +22,7 @@
 #include "gtest/gtest.h"
 #include "opencensus/trace/exporter/span_exporter.h"
 #include "opencensus/trace/internal/local_span_store.h"
+#include "opencensus/trace/sampler.h"
 #include "opencensus/trace/span.h"
 
 namespace opencensus {
diff --git a/opencensus/exporters/trace/zipkin/internal/zipkin_exporter.cc b/opencensus/exporters/trace/zipkin/internal/zipkin_exporter.cc
@@ -178,9 +178,7 @@ std::string GetIpAddressHelper(ZipkinExporterOptions::AddressFamily af_type,
                                ifaddrs* ifaddr_list) {
   for (ifaddrs* if_address = ifaddr_list; if_address != nullptr;
        if_address = if_address->ifa_next) {
-    if (if_address->ifa_addr == nullptr) {
-      continue;
-    }
+    if (if_address->ifa_addr == nullptr) continue;
     if (if_address->ifa_addr->sa_family == AF_INET) {
       if (af_type != ZipkinExporterOptions::AddressFamily::kIpv4) continue;
       char address[INET_ADDRSTRLEN];
@@ -189,10 +187,8 @@ std::string GetIpAddressHelper(ZipkinExporterOptions::AddressFamily af_type,
                       ->sin_addr),
                 address, INET_ADDRSTRLEN);
       std::string ipv4_address(address);
-      if (ipv4_address.compare(ipv4_loopback) == 0)
-        continue;
-      else
-        return ipv4_address;
+      if (ipv4_address.compare(ipv4_loopback) == 0) continue;
+      return ipv4_address;
     } else if (if_address->ifa_addr->sa_family == AF_INET6) {
       if (af_type != ZipkinExporterOptions::AddressFamily::kIpv6) continue;
       char address[INET6_ADDRSTRLEN];
@@ -201,10 +197,8 @@ std::string GetIpAddressHelper(ZipkinExporterOptions::AddressFamily af_type,
                       ->sin6_addr),
                 address, INET6_ADDRSTRLEN);
       std::string ipv6_address(address);
-      if (ipv6_address.compare(ipv6_loopback) == 0)
-        continue;
-      else
-        return ipv6_address;
+      if (ipv6_address.compare(ipv6_loopback) == 0) continue;
+      return ipv6_address;
     }
   }
 
@@ -233,7 +227,7 @@ class CurlEnv {
 
 // static
 CurlEnv* CurlEnv::Get() {
-  static CurlEnv* g_curl_env = new CurlEnv;
+  static auto* const g_curl_env = new CurlEnv;
   return g_curl_env;
 }
 
@@ -329,7 +323,7 @@ CURLcode CurlSendMessage(const uint8_t* data,
 class ZipkinExportHandler
     : public ::opencensus::trace::exporter::SpanExporter::Handler {
  public:
-  ZipkinExportHandler(const ZipkinExporterOptions& options)
+  explicit ZipkinExportHandler(const ZipkinExporterOptions& options)
       : options_(options) {}
 
   void Export(const std::vector<::opencensus::trace::exporter::SpanData>& spans)
diff --git a/opencensus/exporters/trace/zipkin/zipkin_exporter.h b/opencensus/exporters/trace/zipkin/zipkin_exporter.h
@@ -25,7 +25,7 @@ namespace exporters {
 namespace trace {
 
 struct ZipkinExporterOptions {
-  ZipkinExporterOptions(absl::string_view url) : url(url) {}
+  explicit ZipkinExporterOptions(absl::string_view url) : url(url) {}
 
   // Uniform Resource Location for server that spans will be sent to.
   std::string url;
diff --git a/opencensus/stats/bucket_boundaries.h b/opencensus/stats/bucket_boundaries.h
@@ -15,7 +15,6 @@
 #ifndef OPENCENSUS_STATS_BUCKET_BOUNDARIES_H_
 #define OPENCENSUS_STATS_BUCKET_BOUNDARIES_H_
 
-#include <cstddef>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/opencensus/stats/internal/distribution_test.cc b/opencensus/stats/internal/distribution_test.cc
@@ -110,7 +110,7 @@ TEST(DistributionTest, ArbitrarySequence) {
                    *std::max_element(samples.begin(), samples.end()));
 }
 
-// As with stackdriver, non-finite values corrupt statistics.
+// As with Stackdriver, non-finite values corrupt statistics.
 TEST(DistributionTest, NaN) {
   BucketBoundaries buckets = BucketBoundaries::Explicit({});
   Distribution distribution = testing::TestUtils::MakeDistribution(&buckets);
diff --git a/opencensus/stats/internal/stats_exporter.cc b/opencensus/stats/internal/stats_exporter.cc
@@ -15,7 +15,7 @@
 #include "opencensus/stats/stats_exporter.h"
 #include "opencensus/stats/internal/stats_exporter_impl.h"
 
-#include <thread>  // NOLINT
+#include <thread>
 #include <utility>
 #include <vector>
 
diff --git a/opencensus/stats/internal/stats_exporter_impl.h b/opencensus/stats/internal/stats_exporter_impl.h
@@ -12,7 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <thread>  // NOLINT
+#ifndef OPENCENSUS_STATS_INTERNAL_STATS_EXPORTER_IMPL_H_
+#define OPENCENSUS_STATS_INTERNAL_STATS_EXPORTER_IMPL_H_
+
+#include <thread>
 #include <utility>
 #include <vector>
 
@@ -68,3 +71,5 @@ class StatsExporterImpl {
 
 }  // namespace stats
 }  // namespace opencensus
+
+#endif  // OPENCENSUS_STATS_INTERNAL_STATS_EXPORTER_IMPL_H_
diff --git a/opencensus/stats/measure.h b/opencensus/stats/measure.h
@@ -15,9 +15,10 @@
 #ifndef OPENCENSUS_STATS_MEASURE_H_
 #define OPENCENSUS_STATS_MEASURE_H_
 
-#include "opencensus/stats/measure_descriptor.h"
-
 #include <cstdint>
+#include <type_traits>
+
+#include "opencensus/stats/measure_descriptor.h"
 
 namespace opencensus {
 namespace stats {
diff --git a/opencensus/stats/measure_registry.h b/opencensus/stats/measure_registry.h
@@ -15,6 +15,7 @@
 #ifndef OPENCENSUS_STATS_MEASURE_REGISTRY_H_
 #define OPENCENSUS_STATS_MEASURE_REGISTRY_H_
 
+#include "absl/strings/string_view.h"
 #include "opencensus/stats/measure.h"
 #include "opencensus/stats/measure_descriptor.h"
 
diff --git a/opencensus/stats/recording.h b/opencensus/stats/recording.h
@@ -15,10 +15,8 @@
 #ifndef OPENCENSUS_STATS_RECORDING_H_
 #define OPENCENSUS_STATS_RECORDING_H_
 
-#include <cstdint>
 #include <initializer_list>
 
-#include "absl/strings/string_view.h"
 #include "opencensus/stats/measure.h"
 #include "opencensus/tags/tag_map.h"
 
diff --git a/opencensus/stats/stats_exporter.h b/opencensus/stats/stats_exporter.h
@@ -15,10 +15,7 @@
 #ifndef OPENCENSUS_STATS_STATS_EXPORTER_H_
 #define OPENCENSUS_STATS_STATS_EXPORTER_H_
 
-#include <cstdint>
-#include <functional>
 #include <memory>
-#include <unordered_map>
 #include <utility>
 #include <vector>
 
diff --git a/opencensus/stats/view_data.h b/opencensus/stats/view_data.h
@@ -15,6 +15,8 @@
 #ifndef OPENCENSUS_STATS_VIEW_DATA_H_
 #define OPENCENSUS_STATS_VIEW_DATA_H_
 
+#include <cstdint>
+#include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/opencensus/stats/view_descriptor.h b/opencensus/stats/view_descriptor.h
@@ -15,10 +15,12 @@
 #ifndef OPENCENSUS_STATS_VIEW_DESCRIPTOR_H_
 #define OPENCENSUS_STATS_VIEW_DESCRIPTOR_H_
 
-#include <cstdlib>
+#include <cstddef>
+#include <cstdint>
 #include <string>
 #include <vector>
 
+#include "absl/strings/string_view.h"
 #include "opencensus/stats/aggregation.h"
 #include "opencensus/stats/internal/aggregation_window.h"
 #include "opencensus/stats/measure_descriptor.h"
diff --git a/opencensus/tags/internal/tag_key.cc b/opencensus/tags/internal/tag_key.cc
@@ -17,8 +17,10 @@
 #include <cstdint>
 #include <string>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
+#include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 #include "absl/synchronization/mutex.h"
 
diff --git a/opencensus/tags/internal/tag_map.cc b/opencensus/tags/internal/tag_map.cc
@@ -16,7 +16,6 @@
 
 #include <algorithm>
 #include <cassert>
-#include <functional>
 #include <initializer_list>
 #include <string>
 #include <utility>
diff --git a/opencensus/tags/internal/with_tag_map_test.cc b/opencensus/tags/internal/with_tag_map_test.cc
@@ -127,7 +127,7 @@ TEST(WithTagsTest, DisabledViaConditional) {
 TEST(WithTagsDeathTest, DestructorOnWrongThread) {
   const auto tags = Tags1();
 
-  EXPECT_DEATH_IF_SUPPORTED(
+  EXPECT_DEBUG_DEATH(
       {
         auto* wt = new opencensus::tags::WithTagMap(tags);
         std::thread t([wt]() {
diff --git a/opencensus/tags/tag_map.h b/opencensus/tags/tag_map.h
@@ -15,6 +15,7 @@
 #ifndef OPENCENSUS_TAGS_TAG_MAP_H_
 #define OPENCENSUS_TAGS_TAG_MAP_H_
 
+#include <cstddef>
 #include <initializer_list>
 #include <string>
 #include <utility>
diff --git a/opencensus/trace/exporter/status.h b/opencensus/trace/exporter/status.h
@@ -34,7 +34,9 @@ class Status final {
       : code_(code), message_(code == StatusCode::OK ? "" : message) {}
 
   Status(const Status&) = default;
+  Status(Status&&) = default;
   Status& operator=(const Status& x) = default;
+  Status& operator=(Status&& x) = default;
 
   // Returns true if the Status is OK.
   ABSL_MUST_USE_RESULT bool ok() const { return code_ == StatusCode::OK; }
diff --git a/opencensus/trace/internal/span_exporter_impl.cc b/opencensus/trace/internal/span_exporter_impl.cc
diff --git a/opencensus/trace/internal/span_exporter_impl.h b/opencensus/trace/internal/span_exporter_impl.h
diff --git a/opencensus/trace/internal/with_span_test.cc b/opencensus/trace/internal/with_span_test.cc

Original file line number	Diff line number	Diff line change
`@@ -135,9 +135,8 @@ StackdriverE2eTest::RetrieveData(`
`135`	`135`	`}`
`136`	`136`	`if (response.next_page_token().empty()) {`
`137`	`137`	`break;`
`138`		`- } else {`
`139`		`- request.set_page_token(response.next_page_token());`
`140`	`138`	`}`
	`139`	`+ request.set_page_token(response.next_page_token());`
`141`	`140`	`}`
`142`	`141`	`return data;`
`143`	`142`	`}`