Merge branch 'master' into meastp_cmake_google_benchmark

Author: g-easy

cmake/OpenCensusDeps.cmake

@@ -30,10 +30,10 @@ fetchcontent_declare(prometheus
                      GIT_TAG
                      master)
 fetchcontent_declare(benchmark
-					 GIT_REPOSITORY 
-					 https://github.com/google/benchmark
-					 GIT_TAG 
-					 master)
+           					 GIT_REPOSITORY 
+					           https://github.com/google/benchmark
+					           GIT_TAG 
+					           master)
 
 fetchcontent_getproperties(googletest)
 if(BUILD_TESTING)
@@ -83,4 +83,4 @@ if(NOT benchmark_POPULATED)
   set(BENCHMARK_ENABLE_GTEST_TESTS OFF CACHE BOOL "Enable building the unit tests which depend on gtest" FORCE)
   fetchcontent_populate(benchmark)
   add_subdirectory(${benchmark_SOURCE_DIR} ${benchmark_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
+endif()

examples/grpc/hello_client.cc

@@ -51,7 +51,7 @@ int main(int argc, char **argv) {
   }
 
   // Register the OpenCensus gRPC plugin to enable stats and tracing in gRPC.
-  grpc::RegisterOpenCensusPlugin();
+  grpc_impl::RegisterOpenCensusPlugin();
 
   // Register exporters for Stackdriver.
   RegisterStackdriverExporters();

examples/grpc/hello_server.cc

@@ -78,7 +78,7 @@ class HelloServiceImpl final : public HelloService::Service {
   grpc::Status SayHello(grpc::ServerContext *context,
                         const HelloRequest *request,
                         HelloReply *reply) override {
-    opencensus::trace::Span span = grpc::GetSpanFromServerContext(context);
+    opencensus::trace::Span span = grpc_impl::GetSpanFromServerContext(context);
     span.AddAttribute("my_attribute", "red");
     span.AddAnnotation(
         "Constructing greeting.",
@@ -119,10 +119,10 @@ int main(int argc, char **argv) {
   }
 
   // Register the OpenCensus gRPC plugin to enable stats and tracing in gRPC.
-  grpc::RegisterOpenCensusPlugin();
+  grpc_impl::RegisterOpenCensusPlugin();
 
   // Register the gRPC views (latency, error count, etc).
-  grpc::RegisterOpenCensusViewsForExport();
+  grpc_impl::RegisterOpenCensusViewsForExport();
 
   // Register exporters for Stackdriver.
   RegisterStackdriverExporters();

tools/format.sh

@@ -42,7 +42,8 @@ else
 fi
 if which cmake-format >/dev/null; then
   echo "Running cmake-format $(cmake-format --version 2>&1)."
-  cmake-format -i $($FIND -name '*CMakeLists.txt' -print -o \
+  cmake-format -i $($FIND -name FetchContent.cmake -prune -o \
+    -name '*CMakeLists.txt' -print -o \
     -name '*.cmake' -print)
 else
   echo "Can't find cmake-format. It can be installed with:"