Disabling unwanted metrics, removing the flag from CMakeLists and a corretion in State Transfer code

Author: snehal-das

CMakeLists.txt

@@ -47,7 +47,6 @@ option(BUILD_THIRDPARTY "Wheter to build third party librarie or use preinstalle
 option(CODECOVERAGE "Enable Code Coverage Metrics in Clang" OFF)
 option(ENABLE_RESTART_RECOVERY_TESTS "Enable tests for restart recovery" OFF)
 option(BUILD_UTT "Build UTT library" OFF)
-option(CONCORD_ENABLE_ALL_METRICS "Enable all metrics in concord" ON)
 
 if(USE_OPENSSL AND NOT BUILD_THIRDPARTY)
     set(OPENSSL_ROOT_DIR /usr/local/ssl) # not to confuse with system ssl libs

Makefile

@@ -64,7 +64,7 @@ CONCORD_BFT_CMAKE_CODECOVERAGE?=FALSE
 CONCORD_BFT_CMAKE_CCACHE?=TRUE
 CONCORD_BFT_CMAKE_USE_FAKE_CLOCK_IN_TIME_SERVICE?=FALSE
 ENABLE_RESTART_RECOVERY_TESTS?=FALSE
-CONCORD_ENABLE_ALL_METRICS?=TRUE
+CONCORD_ENABLE_ALL_METRICS?=FALSE
 
 ifeq (${CONCORD_BFT_CMAKE_ASAN},TRUE)
 	CONCORD_BFT_CMAKE_CXX_FLAGS_RELEASE='-O0 -g'

bftengine/src/bcstatetransfer/BCStateTran.hpp

@@ -663,8 +663,8 @@ class BCStateTran : public IStateTransfer {
 
 #ifdef ENABLE_ALL_METRICS
     CounterHandle handle_AskForCheckpointSummaries_msg_;
-#endif
     CounterHandle handle_CheckpointsSummary_msg_;
+#endif
     CounterHandle handle_FetchBlocks_msg_;
     CounterHandle handle_FetchResPages_msg_;
     CounterHandle handle_RejectFetching_msg_;