RubyGems - couchbase - Versions diffs - 3.7.0 → 3.8.1 - Mend

couchbase 3.7.0 → 3.8.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (349) hide show

data/ext/couchbase/core/operations/management/error_utils.cxx CHANGED Viewed

@@ -16,12 +16,11 @@
  */
 #include "error_utils.hxx"
+#include "core/utils/contains_string.hxx"
 #include "core/utils/json.hxx"
 #include <tao/json/value.hpp>
-#include <regex>
 namespace couchbase::core::operations::management
 {
@@ -46,6 +45,9 @@ extract_common_query_error_code(std::uint64_t code, const std::string& message)
   -> std::optional<std::error_code>
 {
   switch (code) {
+    case 3000: /* ICode: E_PARSE_SYNTAX, IKey: "parse.syntax_error" */
+      return errc::common::parsing_failure;
     case 1191: /* ICode: E_SERVICE_USER_REQUEST_EXCEEDED, IKey: "service.requests.exceeded" */
     case 1192: /* ICode: E_SERVICE_USER_REQUEST_RATE_EXCEEDED, IKey: "service.request.rate.exceeded"
                 */
@@ -55,7 +57,7 @@ extract_common_query_error_code(std::uint64_t code, const std::string& message)
                 */
       return errc::common::rate_limited;
-    case 13014: /*ICode: E_DATASTORE_INSUFFICIENT_CREDENTIALS, IKey:
+    case 13014: /* ICode: E_DATASTORE_INSUFFICIENT_CREDENTIALS, IKey:
                    "datastore.couchbase.insufficient_credentials" */
       return errc::common::authentication_failure;
@@ -140,12 +142,16 @@ translate_query_error_code(std::uint64_t error, const std::string& message, std:
 {
   switch (error) {
     case 5000: /* IKey: "Internal Error" */
-      if (std::regex_search(message, std::regex{ ".*[iI]ndex .*already exist.*" })) {
+      if (utils::contains_string(message, "index", true) &&
+          utils::contains_string(message, "already exist", true)) {
         return errc::common::index_exists;
-      } else if (message.find("Index does not exist") != std::string::npos ||
-                 std::regex_search(message, std::regex{ ".*[iI]ndex .*[nN]ot [fF]ound.*" })) {
+      }
+      if (utils::contains_string(message, "Index does not exist") ||
+          (utils::contains_string(message, "index", true) &&
+           utils::contains_string(message, "not found", true))) {
         return errc::common::index_not_found;
-      } else if (message.find("Bucket Not Found") != std::string::npos) {
+      }
+      if (message.find("Bucket Not Found") != std::string::npos) {
         return errc::common::bucket_not_found;
       }
       break;

data/ext/couchbase/core/operations/management/eventing_deploy_function.hxx CHANGED Viewed

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/eventing_function.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 #include "eventing_problem.hxx"
@@ -48,6 +49,7 @@ struct eventing_deploy_function_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/eventing_drop_function.hxx CHANGED Viewed

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/eventing_function.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 #include "eventing_problem.hxx"
@@ -48,6 +49,7 @@ struct eventing_drop_function_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/eventing_get_all_functions.hxx CHANGED Viewed

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/eventing_function.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 #include "eventing_problem.hxx"
@@ -47,6 +48,7 @@ struct eventing_get_all_functions_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/eventing_get_function.hxx CHANGED Viewed

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/eventing_function.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 #include "eventing_problem.hxx"
@@ -48,6 +49,7 @@ struct eventing_get_function_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/eventing_get_status.hxx CHANGED Viewed

@@ -23,6 +23,7 @@
 #include "core/management/eventing_function.hxx"
 #include "core/management/eventing_status.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 #include "eventing_problem.hxx"
@@ -49,6 +50,7 @@ struct eventing_get_status_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/eventing_pause_function.hxx CHANGED Viewed

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/eventing_function.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 #include "eventing_problem.hxx"
@@ -48,6 +49,7 @@ struct eventing_pause_function_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/eventing_resume_function.hxx CHANGED Viewed

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/eventing_function.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 #include "eventing_problem.hxx"
@@ -48,6 +49,7 @@ struct eventing_resume_function_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/eventing_undeploy_function.hxx CHANGED Viewed

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/eventing_function.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 #include "eventing_problem.hxx"
@@ -48,6 +49,7 @@ struct eventing_undeploy_function_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/eventing_upsert_function.hxx CHANGED Viewed

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/eventing_function.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 #include "eventing_problem.hxx"
@@ -48,6 +49,7 @@ struct eventing_upsert_function_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/freeform.hxx CHANGED Viewed

@@ -21,6 +21,7 @@
 #include "core/io/http_context.hxx"
 #include "core/io/http_message.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/service_type.hxx"
 #include "core/timeout_defaults.hxx"
@@ -49,6 +50,7 @@ struct freeform_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/group_drop.hxx CHANGED Viewed

@@ -21,6 +21,7 @@
 #include "core/io/http_context.hxx"
 #include "core/io/http_message.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 namespace couchbase::core::operations::management
@@ -42,6 +43,7 @@ struct group_drop_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/group_get.hxx CHANGED Viewed

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/rbac.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 namespace couchbase::core::operations::management
@@ -44,6 +45,7 @@ struct group_get_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/group_get_all.hxx CHANGED Viewed

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/rbac.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 namespace couchbase::core::operations::management
@@ -42,6 +43,7 @@ struct group_get_all_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/group_upsert.hxx CHANGED Viewed

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/rbac.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 namespace couchbase::core::operations::management
@@ -44,6 +45,7 @@ struct group_upsert_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/query_index_build.hxx CHANGED Viewed

@@ -21,6 +21,7 @@
 #include "core/io/http_context.hxx"
 #include "core/io/http_message.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/query_context.hxx"
 #include "core/timeout_defaults.hxx"
@@ -55,6 +56,7 @@ struct query_index_build_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] auto encode_to(encoded_request_type& encoded, http_context& context) const
     -> std::error_code;

data/ext/couchbase/core/operations/management/query_index_build_deferred.hxx CHANGED Viewed

@@ -21,7 +21,9 @@
 #include "core/operations/management/query_index_build.hxx"
 #include "core/operations/management/query_index_get_all_deferred.hxx"
 #include "core/operations/operation_traits.hxx"
+#include "core/public_fwd.hxx"
 #include "core/query_context.hxx"
+#include "core/tracing/constants.hxx"
 #include "couchbase/management/query_index.hxx"
 namespace couchbase::core::operations
@@ -56,6 +58,7 @@ struct query_index_build_deferred_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] response_type make_response(error_context::http&& ctx,
                                             const encoded_response_type& /* encoded */) const
@@ -85,36 +88,71 @@ struct query_index_build_deferred_request {
   template<typename Core, typename Handler>
   void execute(Core core, Handler handler)
   {
-    core->execute(query_index_get_all_deferred_request{ bucket_name,
-                                                        scope_name.value_or(""),
-                                                        collection_name.value_or(""),
-                                                        query_ctx,
-                                                        client_context_id,
-                                                        timeout },
-                  [core,
-                   handler = std::move(handler),
-                   bucket_name = bucket_name,
-                   scope_name = scope_name.value_or(""),
-                   collection_name = collection_name.value_or(""),
-                   query_ctx = query_ctx,
-                   client_context_id = client_context_id,
-                   timeout = timeout](query_index_get_all_deferred_response resp1) mutable {
-                    auto list_resp = std::move(resp1);
-                    if (list_resp.ctx.ec || list_resp.index_names.empty()) {
-                      return handler(convert_response(std::move(list_resp)));
-                    }
-                    core->execute(query_index_build_request{ std::move(bucket_name),
-                                                             scope_name,
-                                                             collection_name,
-                                                             query_ctx,
-                                                             std::move(list_resp.index_names),
-                                                             client_context_id,
-                                                             timeout },
-                                  [handler = std::move(handler)](
-                                    query_index_build_response build_resp) mutable {
-                                    return handler(convert_response(std::move(build_resp)));
-                                  });
-                  });
+    auto get_deferred_indexes_span = core->tracer()->create_span(
+      tracing::operation::mgr_query_get_all_deferred_indexes, parent_span);
+    if (get_deferred_indexes_span->uses_tags()) {
+      get_deferred_indexes_span->add_tag(tracing::attributes::op::service, tracing::service::query);
+      get_deferred_indexes_span->add_tag(tracing::attributes::op::bucket_name, bucket_name);
+      if (scope_name.has_value()) {
+        get_deferred_indexes_span->add_tag(tracing::attributes::op::scope_name, scope_name.value());
+      }
+      if (collection_name.has_value()) {
+        get_deferred_indexes_span->add_tag(tracing::attributes::op::collection_name,
+                                           collection_name.value());
+      }
+    }
+    core->execute(
+      query_index_get_all_deferred_request{ bucket_name,
+                                            scope_name.value_or(""),
+                                            collection_name.value_or(""),
+                                            query_ctx,
+                                            client_context_id,
+                                            timeout,
+                                            get_deferred_indexes_span },
+      [core,
+       handler = std::move(handler),
+       bucket_name = bucket_name,
+       scope_name = scope_name.value_or(""),
+       collection_name = collection_name.value_or(""),
+       query_ctx = query_ctx,
+       client_context_id = client_context_id,
+       timeout = timeout,
+       get_deferred_indexes_span = std::move(get_deferred_indexes_span)](
+        query_index_get_all_deferred_response resp1) mutable {
+        get_deferred_indexes_span->end();
+        auto list_resp = std::move(resp1);
+        if (list_resp.ctx.ec || list_resp.index_names.empty()) {
+          return handler(convert_response(std::move(list_resp)));
+        }
+        auto build_indexes_span = core->tracer()->create_span(
+          tracing::operation::mgr_query_build_indexes, get_deferred_indexes_span);
+        if (build_indexes_span->uses_tags()) {
+          build_indexes_span->add_tag(tracing::attributes::op::service, tracing::service::query);
+          build_indexes_span->add_tag(tracing::attributes::op::bucket_name, bucket_name);
+          if (!scope_name.empty()) {
+            build_indexes_span->add_tag(tracing::attributes::op::scope_name, scope_name);
+          }
+          if (!collection_name.empty()) {
+            build_indexes_span->add_tag(tracing::attributes::op::collection_name, collection_name);
+          }
+        }
+        core->execute(
+          query_index_build_request{ std::move(bucket_name),
+                                     scope_name,
+                                     collection_name,
+                                     query_ctx,
+                                     std::move(list_resp.index_names),
+                                     client_context_id,
+                                     timeout,
+                                     build_indexes_span },
+          [handler = std::move(handler), build_indexes_span = std::move(build_indexes_span)](
+            query_index_build_response build_resp) mutable {
+            build_indexes_span->end();
+            return handler(convert_response(std::move(build_resp)));
+          });
+      });
   }
 };
 } // namespace management

data/ext/couchbase/core/operations/management/query_index_create.cxx CHANGED Viewed

@@ -17,6 +17,7 @@
 #include "query_index_create.hxx"
+#include "core/utils/contains_string.hxx"
 #include "core/utils/json.hxx"
 #include "core/utils/keyspace.hxx"
 #include "error_utils.hxx"
@@ -24,8 +25,6 @@
 #include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
-#include <regex>
 namespace couchbase::core::operations::management
 {
 auto
@@ -118,13 +117,15 @@ query_index_create_request::make_response(error_context::http&& ctx,
         error.message = entry.at("msg").get_string();
         switch (error.code) {
           case 5000: /* IKey: "Internal Error" */
-            if (std::regex_search(error.message, std::regex{ ".*[iI]ndex .*already exist.*" })) {
+          {
+            if (utils::contains_string(error.message, "index", true) &&
+                utils::contains_string(error.message, "already exist", true)) {
               index_already_exists = true;
             }
             if (error.message.find("Bucket Not Found") != std::string::npos) {
               bucket_not_found = true;
             }
-            break;
+          } break;
           case 12003: /* IKey: "datastore.couchbase.keyspace_not_found" */
             if (error.message.find("missing_collection") != std::string::npos) {

data/ext/couchbase/core/operations/management/query_index_create.hxx CHANGED Viewed

@@ -21,6 +21,7 @@
 #include "core/io/http_context.hxx"
 #include "core/io/http_message.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/query_context.hxx"
 #include "core/timeout_defaults.hxx"
@@ -60,6 +61,7 @@ struct query_index_create_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/query_index_drop.cxx CHANGED Viewed

@@ -17,6 +17,7 @@
 #include "query_index_drop.hxx"
+#include "core/utils/contains_string.hxx"
 #include "core/utils/json.hxx"
 #include "core/utils/keyspace.hxx"
 #include "error_utils.hxx"
@@ -24,13 +25,11 @@
 #include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
-#include <regex>
 namespace couchbase::core::operations::management
 {
 auto
-query_index_drop_request::encode_to(encoded_request_type& encoded,
-                                    http_context& /*context*/) const -> std::error_code
+query_index_drop_request::encode_to(encoded_request_type& encoded, http_context& /*context*/) const
+  -> std::error_code
 {
   if (!utils::check_query_management_request(*this)) {
     return errc::common::invalid_argument;
@@ -87,10 +86,12 @@ query_index_drop_request::make_response(error_context::http&& ctx,
         error.message = entry.at("msg").get_string();
         switch (error.code) {
           case 5000: /* IKey: "Internal Error" */
-            if (std::regex_search(error.message, std::regex{ ".*[iI]ndex .*[nN]ot [fF]ound.*" })) {
+          {
+            if (utils::contains_string(error.message, "index", true) &&
+                utils::contains_string(error.message, "not found", true)) {
               index_not_found = true;
             }
-            break;
+          } break;
           case 12003: /* IKey: "datastore.couchbase.keyspace_not_found" */
             if (error.message.find("missing_collection") != std::string::npos) {

data/ext/couchbase/core/operations/management/query_index_drop.hxx CHANGED Viewed

@@ -21,6 +21,7 @@
 #include "core/io/http_context.hxx"
 #include "core/io/http_message.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/query_context.hxx"
 #include "core/timeout_defaults.hxx"
@@ -56,6 +57,7 @@ struct query_index_drop_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/query_index_get_all.hxx CHANGED Viewed

@@ -17,13 +17,13 @@
 #pragma once
+#include <couchbase/management/query_index.hxx>
 #include "core/error_context/http.hxx"
 #include "core/io/http_context.hxx"
 #include "core/io/http_message.hxx"
-#include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/query_context.hxx"
-#include "core/timeout_defaults.hxx"
-#include "couchbase/management/query_index.hxx"
 namespace couchbase::core::operations::management
 {
@@ -50,6 +50,7 @@ struct query_index_get_all_request {
   query_context query_ctx;
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/query_index_get_all_deferred.hxx CHANGED Viewed

@@ -21,9 +21,9 @@
 #include "core/io/http_context.hxx"
 #include "core/io/http_message.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/query_context.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/management/query_index.hxx"
 namespace couchbase::core::operations::management
 {
@@ -51,6 +51,7 @@ struct query_index_get_all_deferred_request {
   query_context query_ctx;
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/role_get_all.hxx CHANGED Viewed

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/rbac.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 namespace couchbase::core::operations::management
@@ -42,6 +43,7 @@ struct role_get_all_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;