Merge remote-tracking branch 'couchbase/cheshire-cat'

* couchbase/cheshire-cat:
  MB-43675 Part 0.5 (7.0.1): GSI Audit Service integration feature
  MB-42915: Add 'subdoc.operate' tracing span
  MB-32779: Make "test producer disk backfill limits" single threaded
  BP: MB-42916: Add the response code to slow log

Change-Id: Ib3304cf844835088901fe34371bd584db9c7e6f5

daemon/subdocument.cc

@@ -32,6 +32,7 @@
 #include <memcached/durability_spec.h>
 #include <memcached/types.h>
 #include <platform/histogram.h>
+#include <platform/scope_timer.h>
 #include <utilities/engine_errc_2_mcbp.h>
 #include <xattr/blob.h>
 
@@ -1003,8 +1004,11 @@ static bool subdoc_operate(SubdocCmdContext& context) {
         return true;
     }
 
-    HdrMicroSecBlockTimer bt(
-            &context.connection.getBucket().subjson_operation_times);
+    ScopeTimer2<HdrMicroSecStopwatch, cb::tracing::SpanStopwatch> timer(
+            std::forward_as_tuple(
+                    context.connection.getBucket().subjson_operation_times),
+            std::forward_as_tuple(context.cookie,
+                                  cb::tracing::Code::SubdocOperate));
 
     context.overall_status = cb::mcbp::Status::Success;
 

include/memcached/tracer.h

@@ -45,6 +45,8 @@ enum class Code : uint8_t {
     SnappyDecompress,
     /// Time spent validating if incoming value is JSON.
     JsonValidate,
+    /// Time spent performing subdoc lookup / mutation (all paths).
+    SubdocOperate,
     /// Time spent waiting for a background fetch operation to be scheduled.
     BackgroundWait,
     /// Time spent performing the actual background load from disk.

tracing/tracer.cc

@@ -148,6 +148,8 @@ MEMCACHED_PUBLIC_API std::string to_string(const cb::tracing::Code tracecode) {
         return "snappy.decompress";
     case Code::JsonValidate:
         return "json_validate";
+    case Code::SubdocOperate:
+        return "subdoc.operate";
     case Code::BackgroundWait:
         return "bg.wait";
     case Code::BackgroundLoad: