Update core stat descriptions

Update stat descriptions and add verification code in the
stats test that all reported stats from the core contains
a description.

Change-Id: I2fe8f17af0b59ca42de5d5a6a599593cef56f461
Reviewed-on: https://review.couchbase.org/c/kv_engine/+/196746
Tested-by: Build Bot <[email protected]>
Reviewed-by: Jim Walker <[email protected]>

Author: trondn

daemon/protocol/mcbp/stats_context.cc

@@ -176,7 +176,7 @@ static cb::engine_errc stat_sched_executor(const std::string& arg,
     }
 
     if (arg == "aggregate") {
-        static const std::string key = {"aggregate"};
+        static const std::string key = {"Thread-aggregate"};
         Hdr1sfMicroSecHistogram histogram{};
         for (const auto& h : scheduler_info) {
             histogram += h;
@@ -246,7 +246,8 @@ static cb::engine_errc stat_bucket_details_executor(const std::string& arg,
         auto json = bucket.to_json();
         if (!json.empty() && json["name"] == arg) {
             const auto stats_str = json.dump();
-            append_stats(arg, stats_str, cookie);
+            append_stats(
+                    fmt::format("bucket details:{}", arg), stats_str, cookie);
             return cb::engine_errc::success;
         }
     }
@@ -618,7 +619,7 @@ static cb::engine_errc stat_threads_executor(const std::string& arg,
                         e.what());
         }
 
-        append_stats("details", json.dump(), cookie);
+        append_stats("threads:details", json.dump(), cookie);
         return cb::engine_errc::success;
     }
 

include/mcbp/protocol/response.h

@@ -183,6 +183,10 @@ class Response {
     cb::byte_buffer getKey() {
         return reinterpret_cast<Header*>(this)->getKey();
     }
+    std::string_view getKeyString() const {
+        auto ret = getKey();
+        return {reinterpret_cast<const char*>(ret.data()), ret.size()};
+    }
 
     cb::const_byte_buffer getValue() const {
         return reinterpret_cast<const Header*>(this)->getValue();

protocol/connection/client_connection.cc

@@ -914,6 +914,7 @@ std::unique_ptr<MemcachedConnection> MemcachedConnection::clone(
     ret->tls12_ciphers = tls12_ciphers;
     ret->tls13_ciphers = tls13_ciphers;
     ret->packet_dump_callback = packet_dump_callback;
+    ret->userValidateReceivedFrameCallback = userValidateReceivedFrameCallback;
     if (connect) {
         ret->connect();
         ret->applyFeatures(effective_features);
@@ -936,6 +937,10 @@ void MemcachedConnection::doValidateReceivedFrame(
                             sizeof(packet)})));
     }
 
+    if (userValidateReceivedFrameCallback) {
+        userValidateReceivedFrameCallback(packet);
+    }
+
     const auto magic = Magic(packet.getMagic());
     if (is_server_magic(magic) || is_request(magic)) {
         return;

protocol/connection/client_connection.h

@@ -1035,14 +1035,25 @@ class MemcachedConnection {
         packet_dump_callback = std::move(callback);
     }
 
-    /// Enable / disable validation of the received frame. Validation include
-    ///  a) The frame header is valid
-    ///  b) The datatype received is one of the ones we've enabled support for
-    ///  c) The value is what the datatype say it is
+    /**
+     * Enable / disable validation of the received frame. Validation include
+     *  a) The frame header is valid
+     *  b) The optional user-provided validate callback completes
+     *  c) The datatype received is one of the ones we've enabled support for
+     *  d) The value is what the datatype say it is
+     *
+     * If validation fails it'll throw an exception
+     */
     void setValidateReceivedFrame(bool value) {
         validateReceivedFrame = value;
     }
 
+    /// Add an extra validate callback for received frames
+    void setUserValidateReceivedFrameCallback(
+            std::function<void(const cb::mcbp::Header&)> callback) {
+        userValidateReceivedFrameCallback = std::move(callback);
+    }
+
 protected:
     void sendBuffer(const std::vector<iovec>& buf);
     void sendBuffer(cb::const_byte_buffer buf);
@@ -1117,5 +1128,7 @@ class MemcachedConnection {
 
     bool validateReceivedFrame;
     void doValidateReceivedFrame(const cb::mcbp::Header& packet);
+    std::function<void(const cb::mcbp::Header&)>
+            userValidateReceivedFrameCallback;
     std::unique_ptr<cb::json::SyntaxValidator> jsonValidator;
 };