Feature request: convert ws-auth to produce numerical stats.

pdns/rec_channel.hh

@@ -63,7 +63,7 @@ private:
   static bool s_init;
 };
 
-std::map<std::string, std::string> getAllStatsMap();
+std::map<std::string, int> getAllStatsMap();
 extern pthread_mutex_t g_carbon_config_lock;
 void sortPublicSuffixList();
 std::vector<std::pair<DNSName, uint16_t> >* pleaseGetQueryRing();

pdns/rec_channel_rec.cc

@@ -98,34 +98,34 @@ optional<uint64_t> get(const string& name)
   return ret;
 }
 
-map<string,string> getAllStatsMap()
+map<string,uint64_t> getAllStatsMap()
 {
-  map<string,string> ret;
+  map<string,uint64_t> ret;
 
   for(const auto& the32bits :  d_get32bitpointers) {
-    ret.insert(make_pair(the32bits.first, std::to_string(*the32bits.second)));
+    ret.insert(make_pair(the32bits.first, *the32bits.second));
   }
   for(const auto& the64bits :  d_get64bitpointers) {
-    ret.insert(make_pair(the64bits.first, std::to_string(*the64bits.second)));
+    ret.insert(make_pair(the64bits.first, *the64bits.second));
   }
   for(const auto& atomic :  d_getatomics) {
-    ret.insert(make_pair(atomic.first, std::to_string(atomic.second->load())));
+    ret.insert(make_pair(atomic.first, atomic.second->load()));
   }
 
   for(const auto& the64bitmembers :  d_get64bitmembers) { 
     if(the64bitmembers.first == "cache-bytes" || the64bitmembers.first=="packetcache-bytes")
       continue; // too slow for 'get-all'
-    ret.insert(make_pair(the64bitmembers.first, std::to_string(the64bitmembers.second())));
+    ret.insert(make_pair(the64bitmembers.first, the64bitmembers.second()));
   }
   Lock l(&d_dynmetricslock);
   for(const auto& a : d_dynmetrics)
-    ret.insert({a.first, std::to_string(*a.second)});
+    ret.insert({a.first, *a.second});
   return ret;
 }
 
 string getAllStats()
 {
-  typedef map<string, string> varmap_t;
+  typedef map<string, uint64_t> varmap_t;
   varmap_t varmap = getAllStatsMap();
   string ret;
   for(varmap_t::value_type& tup :  varmap) {

pdns/ws-api.cc

@@ -195,16 +195,16 @@ void apiServerStatistics(HttpRequest* req, HttpResponse* resp) {
   if(req->method != "GET")
     throw HttpMethodNotAllowedException();
 
-  map<string,int> items;
+  map<string,uint64_t> items;
   productServerStatisticsFetch(items);
 
   Json::array doc;
-  typedef map<string, int> items_t;
+  typedef map<string, uint64_t> items_t;
   for(const items_t::value_type& item : items) {
     doc.push_back(Json::object {
       { "type", "StatisticItem" },
       { "name", item.first },
-      { "value", item.second },
+      { "value", static_cast<double>(item.second) },
     });
   }
 

pdns/ws-api.hh

@@ -41,6 +41,6 @@ void apiCheckQNameAllowedCharacters(const string& name);
 DNSName apiNameToDNSName(const string& name);
 
 // To be provided by product code.
-void productServerStatisticsFetch(std::map<string,int>& out);
+void productServerStatisticsFetch(std::map<string,uint64_t>& out);
 
 #endif /* PDNS_WSAPI_HH */

pdns/ws-auth.cc

@@ -424,11 +424,11 @@ static void fillZone(const DNSName& zonename, HttpResponse* resp) {
   resp->setBody(doc);
 }
 
-void productServerStatisticsFetch(map<string,int>& out)
+void productServerStatisticsFetch(map<string,uint64_t>& out)
 {
   vector<string> items = S.getEntries();
   for(const string& item :  items) {
-    out[item] = std::stoi(std::to_string(S.read(item)));
+    out[item] = S.read(item);
   }
 
   // add uptime

pdns/ws-recursor.cc

@@ -44,9 +44,9 @@ extern __thread FDMultiplexer* t_fdm;
 
 using json11::Json;
 
-void productServerStatisticsFetch(map<string,int>& out)
+void productServerStatisticsFetch(map<string,uint64_t>& out)
 {
-  //map<string,string> stats = getAllStatsMap();
+  map<string,uint64_t> stats = getAllStatsMap();
   out.swap(stats);
 }