Merge pull request #2798 from snehal-das/metrics-removal-phase-1

Phase 1 of metrics removal

Author: cjn

bftengine/src/bcstatetransfer/BCStateTran.cpp

@@ -175,7 +175,6 @@ BCStateTran::Metrics BCStateTran::createRegisterMetrics() {
       metrics_component_.RegisterCounter("irrelevant_item_data_msg"),
 
       metrics_component_.RegisterAtomicCounter("create_checkpoint"),
-      metrics_component_.RegisterCounter("mark_checkpoint_as_stable"),
       metrics_component_.RegisterAtomicCounter("load_reserved_page"),
       metrics_component_.RegisterAtomicCounter("load_reserved_page_from_pending"),
       metrics_component_.RegisterAtomicCounter("load_reserved_page_from_checkpoint"),

bftengine/src/bcstatetransfer/BCStateTran.hpp

@@ -635,7 +635,6 @@ class BCStateTran : public IStateTransfer {
     CounterHandle irrelevant_item_data_msg_;
 
     AtomicCounterHandle create_checkpoint_;
-    CounterHandle mark_checkpoint_as_stable_;
     AtomicCounterHandle load_reserved_page_;
     AtomicCounterHandle load_reserved_page_from_pending_;
     AtomicCounterHandle load_reserved_page_from_checkpoint_;

bftengine/src/bcstatetransfer/RVBManager.cpp

@@ -35,8 +35,7 @@ RVBManager::RVBManager(const Config& config, const IAppState* state_api, const s
       rvb_data_source_(RvbDataInitialSource::NIL),
       metrics_component_{
           concordMetrics::Component("state_transfer_rvb_manager", std::make_shared<concordMetrics::Aggregator>())},
-      metrics_{metrics_component_.RegisterCounter("report_during_checkpointing_errors"),
-               metrics_component_.RegisterCounter("pruning_reports"),
+      metrics_{metrics_component_.RegisterCounter("pruning_reports"),
                metrics_component_.RegisterCounter("failures_while_setting_serialized_rvt"),
                metrics_component_.RegisterGauge("pruning_vector_elements_count", 0),
                metrics_component_.RegisterGauge("pruning_vector_size_in_bytes", 0),

bftengine/src/bcstatetransfer/RVBManager.hpp

@@ -170,7 +170,6 @@ class RVBManager {
 
   concordMetrics::Component metrics_component_;
   struct Metrics {
-    concordMetrics::CounterHandle report_during_checkpointing_errors_;
     concordMetrics::CounterHandle pruning_reports_;
     concordMetrics::CounterHandle failures_while_setting_serialized_rvt_;
     concordMetrics::GaugeHandle pruning_vector_elements_count_;

bftengine/src/preprocessor/PreProcessor.cpp

@@ -374,7 +374,6 @@ PreProcessor::PreProcessor(shared_ptr<MsgsCommunicator> &msgsCommunicator,
                            metricsComponent_.RegisterCounter("preProcBatchReqReceived"),
                            metricsComponent_.RegisterCounter("preProcReqInvalid"),
                            metricsComponent_.RegisterAtomicCounter("preProcReqIgnored"),
-                           metricsComponent_.RegisterAtomicCounter("preProcReqRejected"),
                            metricsComponent_.RegisterCounter("preProcConsensusNotReached"),
                            metricsComponent_.RegisterCounter("preProcessRequestTimedOut"),
                            metricsComponent_.RegisterCounter("preProcPossiblePrimaryFaultDetected"),

bftengine/src/preprocessor/PreProcessor.hpp

@@ -337,7 +337,6 @@ class PreProcessor {
     concordMetrics::CounterHandle preProcBatchReqReceived;
     concordMetrics::CounterHandle preProcReqInvalid;
     concordMetrics::AtomicCounterHandle preProcReqIgnored;
-    concordMetrics::AtomicCounterHandle preProcReqRejected;
     concordMetrics::CounterHandle preProcConsensusNotReached;
     concordMetrics::CounterHandle preProcessRequestTimedOut;
     concordMetrics::CounterHandle preProcPossiblePrimaryFaultDetected;

reconfiguration/include/reconfiguration/dispatcher.hpp

@@ -81,7 +81,6 @@ class Dispatcher {
   concordMetrics::Component component_;
   concordMetrics::CounterHandle executions_;
   concordMetrics::CounterHandle failures_;
-  concordMetrics::CounterHandle auth_failures_;
 };
 
 }  // namespace concord::reconfiguration

reconfiguration/src/dispatcher.cpp

@@ -103,8 +103,7 @@ Dispatcher::Dispatcher()
     : aggregator_{std::make_shared<concordMetrics::Aggregator>()},
       component_{"reconfiguration_dispatcher", aggregator_},
       executions_{component_.RegisterCounter("executions")},
-      failures_{component_.RegisterCounter("failures")},
-      auth_failures_{component_.RegisterCounter("auth_failures")} {
+      failures_{component_.RegisterCounter("failures")} {
   component_.Register();
   component_.UpdateAggregator();
 }