Build fix: cmake-format and bazel.

* Format with cmake-format 0.6.0.

The new version changes the amount of indentation.

* Upgrade bazel or else we get a prometheus-cpp BUILD error.

Author: g-easy

CMakeLists.txt

@@ -21,7 +21,10 @@ if(CCACHE_PROGRAM)
   set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CCACHE_PROGRAM}")
 endif()
 
-project(opencensus-cpp VERSION 0.5.0 LANGUAGES CXX)
+project(
+  opencensus-cpp
+  VERSION 0.5.0
+  LANGUAGES CXX)
 
 option(FUZZER "Either OFF or e.g. -fsanitize=fuzzer,address" OFF)
 

cmake/OpenCensusDeps.cmake

@@ -14,18 +14,22 @@
 
 include(FetchContent)
 
-FetchContent_Declare(googletest
-                     GIT_REPOSITORY https://github.com/abseil/googletest
-                     GIT_TAG ed2fe122f8dc9aca844d724986d1d5cf5b65ea4e)
-FetchContent_Declare(abseil
-                     GIT_REPOSITORY https://github.com/abseil/abseil-cpp
-                     GIT_TAG 2c8421e1c6cef0da9e8a20b01c15256ec9ec116d)
-FetchContent_Declare(prometheus
-                     GIT_REPOSITORY https://github.com/jupp0r/prometheus-cpp
-                     GIT_TAG master)
-FetchContent_Declare(benchmark
-                     GIT_REPOSITORY https://github.com/google/benchmark
-                     GIT_TAG master)
+FetchContent_Declare(
+  googletest
+  GIT_REPOSITORY https://github.com/abseil/googletest
+  GIT_TAG ed2fe122f8dc9aca844d724986d1d5cf5b65ea4e)
+FetchContent_Declare(
+  abseil
+  GIT_REPOSITORY https://github.com/abseil/abseil-cpp
+  GIT_TAG 2c8421e1c6cef0da9e8a20b01c15256ec9ec116d)
+FetchContent_Declare(
+  prometheus
+  GIT_REPOSITORY https://github.com/jupp0r/prometheus-cpp
+  GIT_TAG master)
+FetchContent_Declare(
+  benchmark
+  GIT_REPOSITORY https://github.com/google/benchmark
+  GIT_TAG master)
 
 FetchContent_GetProperties(googletest)
 if(BUILD_TESTING)
@@ -60,12 +64,18 @@ endif()
 FetchContent_GetProperties(prometheus)
 if(NOT prometheus_POPULATED)
   message(STATUS "Dependency: prometheus")
-  set(ENABLE_PUSH OFF CACHE BOOL "Build prometheus-cpp push library" FORCE)
-  set(ENABLE_PULL OFF CACHE BOOL "Build prometheus-cpp pull library" FORCE)
+  set(ENABLE_PUSH
+      OFF
+      CACHE BOOL "Build prometheus-cpp push library" FORCE)
+  set(ENABLE_PULL
+      OFF
+      CACHE BOOL "Build prometheus-cpp pull library" FORCE)
   set(ENABLE_COMPRESSION
       OFF
       CACHE BOOL "Enable gzip compression for prometheus-cpp" FORCE)
-  set(ENABLE_TESTING OFF CACHE BOOL "Build test for prometheus-cpp" FORCE)
+  set(ENABLE_TESTING
+      OFF
+      CACHE BOOL "Build test for prometheus-cpp" FORCE)
   FetchContent_Populate(prometheus)
   add_subdirectory(${prometheus_SOURCE_DIR} ${prometheus_BINARY_DIR}
                    EXCLUDE_FROM_ALL)

cmake/OpenCensusHelpers.cmake

@@ -22,7 +22,9 @@ function(prepend_opencensus OUT DEPS)
       list(APPEND _DEPS "opencensus_${dep}")
     endif()
   endforeach()
-  set(${OUT} ${_DEPS} PARENT_SCOPE)
+  set(${OUT}
+      ${_DEPS}
+      PARENT_SCOPE)
 endfunction()
 
 # Helper function like bazel's cc_test. Usage:
@@ -33,10 +35,7 @@ function(opencensus_test NAME SRC)
     set(_NAME "opencensus_${NAME}")
     add_executable(${_NAME} ${SRC})
     prepend_opencensus(DEPS "${ARGN}")
-    target_link_libraries(${_NAME}
-                          "${DEPS}"
-                          gmock
-                          gtest_main)
+    target_link_libraries(${_NAME} "${DEPS}" gmock gtest_main)
     add_test(NAME ${_NAME} COMMAND ${_NAME})
   endif()
 endfunction()
@@ -57,11 +56,7 @@ endfunction()
 # Helper function like bazel's cc_library.  Libraries are namespaced as
 # opencensus_* and public libraries are also aliased as opencensus-cpp::*.
 function(opencensus_lib NAME)
-  cmake_parse_arguments(ARG
-                        "PUBLIC"
-                        ""
-                        "SRCS;DEPS"
-                        ${ARGN})
+  cmake_parse_arguments(ARG "PUBLIC" "" "SRCS;DEPS" ${ARGN})
   set(_NAME "opencensus_${NAME}")
   prepend_opencensus(ARG_DEPS "${ARG_DEPS}")
   if(ARG_SRCS)

examples/helloworld/CMakeLists.txt

@@ -15,10 +15,11 @@
 find_package(Threads REQUIRED)
 
 add_executable(opencensus_examples_helloworld helloworld.cc)
-target_link_libraries(opencensus_examples_helloworld
-                      absl::strings
-                      opencensus-cpp::exporters_stats_stdout
-                      opencensus-cpp::exporters_trace_stdout
-                      opencensus-cpp::stats
-                      opencensus-cpp::trace
-                      Threads::Threads)
+target_link_libraries(
+  opencensus_examples_helloworld
+  absl::strings
+  opencensus-cpp::exporters_stats_stdout
+  opencensus-cpp::exporters_trace_stdout
+  opencensus-cpp::stats
+  opencensus-cpp::trace
+  Threads::Threads)

opencensus/common/internal/CMakeLists.txt

@@ -12,19 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-opencensus_lib(common_hostname
-               SRCS
-               hostname.cc
-               DEPS
-               absl::strings)
-
-opencensus_lib(common_random
-               SRCS
-               random.cc
-               DEPS
-               absl::base
-               absl::synchronization
-               absl::time)
+opencensus_lib(common_hostname SRCS hostname.cc DEPS absl::strings)
+
+opencensus_lib(
+  common_random
+  SRCS
+  random.cc
+  DEPS
+  absl::base
+  absl::synchronization
+  absl::time)
 
 opencensus_lib(common_stats_object DEPS absl::time)
 
@@ -40,8 +37,5 @@ opencensus_test(common_random_test random_test.cc common_random)
 
 opencensus_benchmark(common_random_benchmark random_benchmark.cc common_random)
 
-opencensus_test(common_stats_object_test
-                stats_object_test.cc
-                common_stats_object
-                absl::strings
-                absl::span)
+opencensus_test(common_stats_object_test stats_object_test.cc
+                common_stats_object absl::strings absl::span)

opencensus/context/CMakeLists.txt

@@ -12,22 +12,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-opencensus_lib(context
-               PUBLIC
-               SRCS
-               internal/context.cc
-               internal/with_context.cc
-               DEPS
-               tags
-               trace)
+opencensus_lib(
+  context
+  PUBLIC
+  SRCS
+  internal/context.cc
+  internal/with_context.cc
+  DEPS
+  tags
+  trace)
 
-opencensus_test(context_context_test
-                internal/context_test.cc
-                context
-                tags_context_util
-                tags_with_tag_map
-                trace_context_util
-                trace_with_span)
+opencensus_test(
+  context_context_test
+  internal/context_test.cc
+  context
+  tags_context_util
+  tags_with_tag_map
+  trace_context_util
+  trace_with_span)
 
 opencensus_test(context_with_context_test internal/with_context_test.cc context)
 

opencensus/exporters/stats/prometheus/CMakeLists.txt

@@ -12,25 +12,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-opencensus_lib(exporters_stats_prometheus
-               PUBLIC
-               SRCS
-               internal/prometheus_exporter.cc
-               DEPS
-               exporters_stats_prometheus_utils
-               stats)
+opencensus_lib(
+  exporters_stats_prometheus
+  PUBLIC
+  SRCS
+  internal/prometheus_exporter.cc
+  DEPS
+  exporters_stats_prometheus_utils
+  stats)
 
-opencensus_lib(exporters_stats_prometheus_utils
-               SRCS
-               internal/prometheus_utils.cc
-               DEPS
-               stats
-               absl::strings
-               absl::time
-               prometheus-cpp::core)
+opencensus_lib(
+  exporters_stats_prometheus_utils
+  SRCS
+  internal/prometheus_utils.cc
+  DEPS
+  stats
+  absl::strings
+  absl::time
+  prometheus-cpp::core)
 
-opencensus_test(exporters_stats_prometheus_utils_test
-                internal/prometheus_utils_test.cc
-                exporters_stats_prometheus_utils
-                stats
-                stats_test_utils)
+opencensus_test(
+  exporters_stats_prometheus_utils_test internal/prometheus_utils_test.cc
+  exporters_stats_prometheus_utils stats stats_test_utils)

opencensus/exporters/stats/stdout/CMakeLists.txt

@@ -12,19 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-opencensus_lib(exporters_stats_stdout
-               PUBLIC
-               SRCS
-               internal/stdout_exporter.cc
-               DEPS
-               stats
-               absl::memory
-               absl::strings
-               absl::time)
+opencensus_lib(
+  exporters_stats_stdout
+  PUBLIC
+  SRCS
+  internal/stdout_exporter.cc
+  DEPS
+  stats
+  absl::memory
+  absl::strings
+  absl::time)
 
-opencensus_test(exporters_stats_stdout_test
-                internal/stdout_exporter_test.cc
-                exporters_stats_stdout
-                stats
-                stats_test_utils
-                absl::time)
+opencensus_test(exporters_stats_stdout_test internal/stdout_exporter_test.cc
+                exporters_stats_stdout stats stats_test_utils absl::time)

opencensus/exporters/trace/stdout/CMakeLists.txt

@@ -12,17 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-opencensus_lib(exporters_trace_stdout
-               PUBLIC
-               SRCS
-               internal/stdout_exporter.cc
-               DEPS
-               trace
-               absl::base
-               absl::memory)
+opencensus_lib(
+  exporters_trace_stdout
+  PUBLIC
+  SRCS
+  internal/stdout_exporter.cc
+  DEPS
+  trace
+  absl::base
+  absl::memory)
 
-opencensus_test(exporters_trace_stdout_test
-                internal/stdout_exporter_test.cc
-                exporters_trace_stdout
-                trace
-                absl::time)
+opencensus_test(exporters_trace_stdout_test internal/stdout_exporter_test.cc
+                exporters_trace_stdout trace absl::time)