arangodb · mchacki · Mar 13, 2020 · Dec 3, 2019 · Dec 4, 2019 · Dec 4, 2019
diff --git a/arangod/Agency/Agent.cpp b/arangod/Agency/Agent.cpp
@@ -83,13 +83,18 @@ Agent::Agent(ApplicationServer& server, config_t const& config)
           "agency_agent_write_no_leader", 0, "Agency write no leader")),
       _read_ok(
         _server.getFeature<arangodb::MetricsFeature>().counter(
-          "agency_agent_read_ok", 0, "Agency write ok")),
+          "agency_agent_read_ok", 0, "Agency read ok")),
       _read_no_leader(
         _server.getFeature<arangodb::MetricsFeature>().counter(
-          "agency_agent_read_no_leader", 0, "Agency write no leader")),
+          "agency_agent_read_no_leader", 0, "Agency read no leader")),
       _write_hist_msec(
         _server.getFeature<arangodb::MetricsFeature>().histogram(
-          "agency_agent_write_hist", 10, 0., 20., "Agency write histogram [ms]")) {
+          "agency_agent_write_hist", log_scale_t(2.f, 0.f, 200.f, 10),
+          "Agency write histogram [ms]")),
+      _commit_hist_msec(
+        _server.getFeature<arangodb::MetricsFeature>().histogram(
+          "agency_agent_commit_hist", log_scale_t(std::exp(1.f), 0.f, 200.f, 10),
+          "Agency RAFT commit histogram [ms]")) {
   _state.configure(this);
   _constituent.configure(this);
   if (size() > 1) {
@@ -102,6 +107,11 @@ Agent::Agent(ApplicationServer& server, config_t const& config)
 /// This agent's id
 std::string Agent::id() const { return _config.id(); }
 
+// Under no circumstances guard the member. Metrics guard themselves.
+decltype(Agent::_commit_hist_msec) Agent::commitHist() const {
+  return _commit_hist_msec;
+}
+
 /// Agent's id is set once from state machine
 bool Agent::id(std::string const& id) {
   bool success;
@@ -1221,7 +1231,7 @@ write_ret_t Agent::write(query_t const& query, WriteMode const& wmode) {
       indices.insert(indices.end(), tmp.begin(), tmp.end());
     }
     _write_hist_msec.count(
-      duration<double,std::milli>(high_resolution_clock::now()-start).count());
+      duration<float,std::milli>(high_resolution_clock::now()-start).count());
   }
 
   // Maximum log index
@@ -1276,7 +1286,7 @@ read_ret_t Agent::read(query_t const& query) {
   // Retrieve data from readDB
   std::vector<bool> success = _readDB.read(query, result);
 
-  ++_read_no_leader;
+  ++_read_ok;
   return read_ret_t(true, leader, std::move(success), std::move(result));
 }
 

diff --git a/arangod/Agency/Agent.h b/arangod/Agency/Agent.h
@@ -331,6 +331,8 @@ class Agent final : public arangodb::Thread, public AgentInterface {
   /// the agency leader.
   void updateSomeConfigValues(VPackSlice);
 
+  Histogram<log_scale_t<float>>& commitHist() const;
+
  private:
 
   /// @brief load() has run
@@ -499,7 +501,8 @@ class Agent final : public arangodb::Thread, public AgentInterface {
   Counter& _write_no_leader;
   Counter& _read_ok;
   Counter& _read_no_leader;
-  Histogram<double>& _write_hist_msec;
+  Histogram<log_scale_t<float>>& _write_hist_msec;
+  Histogram<log_scale_t<float>>& _commit_hist_msec;
 
 };
 }  // namespace consensus

diff --git a/arangod/Agency/RestAgencyHandler.cpp b/arangod/Agency/RestAgencyHandler.cpp
@@ -209,6 +209,8 @@ RestStatus RestAgencyHandler::handleStore() {
 }
 
 RestStatus RestAgencyHandler::handleWrite() {
+
+  using namespace std::chrono;
   if (_request->requestType() != rest::RequestType::POST) {
     return reportMethodNotAllowed();
   }
@@ -238,6 +240,9 @@ RestStatus RestAgencyHandler::handleWrite() {
     return reportMessage(rest::ResponseCode::SERVICE_UNAVAILABLE, "No leader");
   }
 
+  // Start timing
+  auto const start = high_resolution_clock::now();
+
   // Do write
   write_ret_t ret;
   try {
@@ -295,6 +300,8 @@ RestStatus RestAgencyHandler::handleWrite() {
 
         if (max_index > 0) {
           result = _agent->waitFor(max_index);
+          _agent->commitHist().count(
+            duration<float,std::milli>(high_resolution_clock::now()-start).count());
         }
       }
     }

diff --git a/arangod/Cluster/ServerState.cpp b/arangod/Cluster/ServerState.cpp
@@ -492,10 +492,10 @@ std::string ServerState::roleToAgencyKey(ServerState::RoleEnum role) {
       return "Coordinator";
     case ROLE_SINGLE:
       return "Single";
-
-    case ROLE_UNDEFINED:
-    case ROLE_AGENT: {
-      TRI_ASSERT(false);
+    case ROLE_AGENT: 
+      return "Agent";
+    case ROLE_UNDEFINED: {
+      return "Undefined";
     }
   }
      return "INVALID_CLUSTER_ROLE";
@@ -740,6 +740,14 @@ bool ServerState::registerAtAgencyPhase1(AgencyComm& comm, ServerState::RoleEnum
   return false;
 }
 
+std::string ServerState::getShortName() const {
+  std::stringstream ss;  // ShortName
+  auto num = getShortId();
+  size_t width = std::max(std::to_string(num + 1).size(), static_cast<size_t>(4));
+  ss << roleToAgencyKey(getRole()) << std::setw(width) << std::setfill('0') << num + 1;
+  return ss.str();
+}
+
 bool ServerState::registerAtAgencyPhase2(AgencyComm& comm, bool const hadPersistedId) {
   TRI_ASSERT(!_id.empty() && !_myEndpoint.empty());
 

diff --git a/arangod/Cluster/ServerState.h b/arangod/Cluster/ServerState.h
@@ -212,6 +212,9 @@ class ServerState {
   /// @brief set the server short id
   void setShortId(uint32_t);
 
+  /// @brief set the server short id
+  std::string getShortName() const;
+
   RebootId getRebootId() const;
 
   void setRebootId(RebootId rebootId);

diff --git a/arangod/RestServer/Metrics.cpp b/arangod/RestServer/Metrics.cpp
@@ -48,13 +48,14 @@ std::ostream& operator<< (std::ostream& o, Metrics::hist_type const& v) {
   return o;
 }
 
-Metric::Metric(std::string const& name, std::string const& help)
-: _name(name), _help(help) {};
+Metric::Metric(std::string const& name, std::string const& help, std::string const& labels)
+  : _name(name), _help(help), _labels(labels) {};
 
 Metric::~Metric() {}
 
 std::string const& Metric::help() const { return _help; }
 std::string const& Metric::name() const { return _name; }
+std::string const& Metric::labels() const { return _labels; }
 
 Counter& Counter::operator++() {
   count();
@@ -102,12 +103,13 @@ void Counter::toPrometheus(std::string& result) const {
   _b.push();
   result += "#TYPE " + name() + " counter\n";
   result += "#HELP " + name() + " " + help() + "\n";
-  result += name() + " " + std::to_string(load()) + "\n";
+  result += name() + "{" + labels() + "} " + std::to_string(load()) + "\n";
 }
 
 Counter::Counter(
-  uint64_t const& val, std::string const& name, std::string const& help) :
-  Metric(name, help), _c(val), _b(_c) {}
+  uint64_t const& val, std::string const& name, std::string const& help,
+  std::string const& labels) :
+  Metric(name, help, labels), _c(val), _b(_c) {}
 
 Counter::~Counter() { _b.push(); }