couchbase 4.4.3 → 4.4.4

package/deps/couchbase-cxx-client/core/operations/management/analytics_link_get_all.cxx

@@ -38,25 +38,33 @@ analytics_link_get_all_request::encode_to(encoded_request_type& encoded,
   encoded.headers["content-type"] = "application/x-www-form-urlencoded";
   encoded.headers["accept"] = "application/json";
   encoded.method = "GET";
-  if (!link_type.empty()) {
-    values["type"] = link_type;
+  if (link_type.has_value() && !link_type.value().empty()) {
+    values["type"] = link_type.value();
   }
-  if (std::count(dataverse_name.begin(), dataverse_name.end(), '/') == 0) {
-    if (!dataverse_name.empty()) {
-      values["dataverse"] = dataverse_name;
-      if (!link_name.empty()) {
-        values["name"] = link_name;
+  if ((link_name.has_value() && !link_name.value().empty()) &&
+      (!dataverse_name.has_value() || dataverse_name.value().empty())) {
+    return couchbase::errc::common::invalid_argument;
+  }
+
+  if (dataverse_name.has_value() && !dataverse_name.value().empty()) {
+    if (std::count(dataverse_name.value().begin(), dataverse_name.value().end(), '/') == 0) {
+      values["dataverse"] = dataverse_name.value();
+      if (link_name.has_value() && !link_name.value().empty()) {
+        values["name"] = link_name.value();
       }
-    }
-    encoded.path = "/analytics/link";
-  } else {
-    if (link_name.empty()) {
-      encoded.path =
-        fmt::format("/analytics/link/{}", utils::string_codec::v2::path_escape(dataverse_name));
+      encoded.path = "/analytics/link";
     } else {
-      encoded.path = fmt::format(
-        "/analytics/link/{}/{}", utils::string_codec::v2::path_escape(dataverse_name), link_name);
+      if (!link_name.has_value() || link_name.value().empty()) {
+        encoded.path = fmt::format("/analytics/link/{}",
+                                   utils::string_codec::v2::path_escape(dataverse_name.value()));
+      } else {
+        encoded.path = fmt::format("/analytics/link/{}/{}",
+                                   utils::string_codec::v2::path_escape(dataverse_name.value()),
+                                   link_name.value());
+      }
     }
+  } else {
+    encoded.path = "/analytics/link";
   }
   if (!values.empty()) {
     encoded.path.append(fmt::format("?{}", utils::string_codec::v2::form_encode(values)));

package/deps/couchbase-cxx-client/core/operations/management/analytics_link_get_all.hxx

@@ -48,10 +48,11 @@ struct analytics_link_get_all_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::analytics;
+  static const inline std::string observability_identifier = "manager_analytics_get_links";
 
-  std::string link_type{};
-  std::string link_name{};
-  std::string dataverse_name{};
+  std::optional<std::string> link_type{};
+  std::optional<std::string> link_name{};
+  std::optional<std::string> dataverse_name{};
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};

package/deps/couchbase-cxx-client/core/operations/management/analytics_link_replace.hxx

@@ -51,6 +51,7 @@ struct analytics_link_replace_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::analytics;
+  static const inline std::string observability_identifier = "manager_analytics_replace_link";
 
   analytics_link_type link{};
 

package/deps/couchbase-cxx-client/core/operations/management/bucket_create.hxx

@@ -38,6 +38,7 @@ struct bucket_create_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier = "manager_buckets_create_bucket";
 
   couchbase::core::management::cluster::bucket_settings bucket{};
 

package/deps/couchbase-cxx-client/core/operations/management/bucket_describe.hxx

@@ -76,6 +76,7 @@ struct bucket_describe_request {
   std::string name;
 
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier = "manager_buckets_describe_bucket";
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};

package/deps/couchbase-cxx-client/core/operations/management/bucket_drop.hxx

@@ -36,6 +36,7 @@ struct bucket_drop_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier = "manager_buckets_drop_bucket";
 
   std::string name;
 

package/deps/couchbase-cxx-client/core/operations/management/bucket_flush.hxx

@@ -36,6 +36,7 @@ struct bucket_flush_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier = "manager_buckets_flush_bucket";
 
   std::string name;
 

package/deps/couchbase-cxx-client/core/operations/management/bucket_get.hxx

@@ -38,6 +38,7 @@ struct bucket_get_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier = "manager_buckets_get_bucket";
 
   std::string name;
 

package/deps/couchbase-cxx-client/core/operations/management/bucket_get_all.hxx

@@ -38,6 +38,7 @@ struct bucket_get_all_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier = "manager_buckets_get_all_buckets";
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};

package/deps/couchbase-cxx-client/core/operations/management/bucket_update.hxx

@@ -39,6 +39,7 @@ struct bucket_update_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier = "manager_buckets_update_bucket";
 
   couchbase::core::management::cluster::bucket_settings bucket{};
 

package/deps/couchbase-cxx-client/core/operations/management/change_password.hxx

@@ -37,6 +37,7 @@ struct change_password_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier = "manager_users_change_password";
 
   std::string newPassword{};
 

package/deps/couchbase-cxx-client/core/operations/management/cluster_describe.hxx

@@ -61,6 +61,7 @@ struct cluster_describe_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier = "cluster_describe";
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};

package/deps/couchbase-cxx-client/core/operations/management/cluster_developer_preview_enable.hxx

@@ -36,6 +36,7 @@ struct cluster_developer_preview_enable_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier = "enable_developer_preview";
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};

package/deps/couchbase-cxx-client/core/operations/management/collection_create.hxx

@@ -37,6 +37,8 @@ struct collection_create_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier =
+    "manager_collections_create_collection";
 
   std::string bucket_name;
   std::string scope_name;

package/deps/couchbase-cxx-client/core/operations/management/collection_drop.hxx

@@ -37,6 +37,7 @@ struct collection_drop_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier = "manager_collections_drop_collection";
 
   std::string bucket_name;
   std::string scope_name;

package/deps/couchbase-cxx-client/core/operations/management/collection_update.hxx

@@ -37,6 +37,8 @@ struct collection_update_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier =
+    "manager_collections_update_collection";
 
   std::string bucket_name;
   std::string scope_name;

package/deps/couchbase-cxx-client/core/operations/management/collections_manifest_get.hxx

@@ -40,6 +40,8 @@ struct collections_manifest_get_request {
   using encoded_response_type =
     protocol::client_response<protocol::get_collections_manifest_response_body>;
 
+  static const inline std::string observability_identifier = "get_collection_manifest";
+
   document_id id{};
   std::uint16_t partition{};
   std::uint32_t opaque{};

package/deps/couchbase-cxx-client/core/operations/management/eventing_deploy_function.hxx

@@ -38,13 +38,14 @@ struct eventing_deploy_function_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline service_type type = service_type::eventing;
+  static const inline std::string observability_identifier = "manager_eventing_deploy_function";
+
   std::string name;
 
   std::optional<std::string> bucket_name{};
   std::optional<std::string> scope_name{};
 
-  static const inline service_type type = service_type::eventing;
-
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
 

package/deps/couchbase-cxx-client/core/operations/management/eventing_drop_function.hxx

@@ -38,13 +38,14 @@ struct eventing_drop_function_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline service_type type = service_type::eventing;
+  static const inline std::string observability_identifier = "manager_eventing_drop_function";
+
   std::string name;
 
   std::optional<std::string> bucket_name{};
   std::optional<std::string> scope_name{};
 
-  static const inline service_type type = service_type::eventing;
-
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
 

package/deps/couchbase-cxx-client/core/operations/management/eventing_get_all_functions.hxx

@@ -39,11 +39,12 @@ struct eventing_get_all_functions_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline service_type type = service_type::eventing;
+  static const inline std::string observability_identifier = "manager_eventing_drop_function";
+
   std::optional<std::string> bucket_name{};
   std::optional<std::string> scope_name{};
 
-  static const inline service_type type = service_type::eventing;
-
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
 

package/deps/couchbase-cxx-client/core/operations/management/eventing_get_function.hxx

@@ -39,12 +39,13 @@ struct eventing_get_function_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline service_type type = service_type::eventing;
+  static const inline std::string observability_identifier = "manager_eventing_get_function";
+
   std::string name;
   std::optional<std::string> bucket_name{};
   std::optional<std::string> scope_name{};
 
-  static const inline service_type type = service_type::eventing;
-
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
 

package/deps/couchbase-cxx-client/core/operations/management/eventing_get_status.hxx

@@ -41,11 +41,12 @@ struct eventing_get_status_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline service_type type = service_type::eventing;
+  static const inline std::string observability_identifier = "manager_eventing_functions_status";
+
   std::optional<std::string> bucket_name{};
   std::optional<std::string> scope_name{};
 
-  static const inline service_type type = service_type::eventing;
-
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
 

package/deps/couchbase-cxx-client/core/operations/management/eventing_pause_function.hxx

@@ -38,13 +38,14 @@ struct eventing_pause_function_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline service_type type = service_type::eventing;
+  static const inline std::string observability_identifier = "manager_eventing_pause_function";
+
   std::string name;
 
   std::optional<std::string> bucket_name{};
   std::optional<std::string> scope_name{};
 
-  static const inline service_type type = service_type::eventing;
-
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
 

package/deps/couchbase-cxx-client/core/operations/management/eventing_resume_function.hxx

@@ -38,13 +38,14 @@ struct eventing_resume_function_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline service_type type = service_type::eventing;
+  static const inline std::string observability_identifier = "manager_eventing_resume_function";
+
   std::string name;
 
   std::optional<std::string> bucket_name{};
   std::optional<std::string> scope_name{};
 
-  static const inline service_type type = service_type::eventing;
-
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
 

package/deps/couchbase-cxx-client/core/operations/management/eventing_undeploy_function.hxx

@@ -38,13 +38,14 @@ struct eventing_undeploy_function_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline service_type type = service_type::eventing;
+  static const inline std::string observability_identifier = "manager_eventing_undeploy_function";
+
   std::string name;
 
   std::optional<std::string> bucket_name{};
   std::optional<std::string> scope_name{};
 
-  static const inline service_type type = service_type::eventing;
-
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
 

package/deps/couchbase-cxx-client/core/operations/management/eventing_upsert_function.hxx

@@ -38,13 +38,14 @@ struct eventing_upsert_function_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline service_type type = service_type::eventing;
+  static const inline std::string observability_identifier = "manager_eventing_upsert_function";
+
   couchbase::core::management::eventing::function function{};
 
   std::optional<std::string> bucket_name{};
   std::optional<std::string> scope_name{};
 
-  static const inline service_type type = service_type::eventing;
-
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
 

package/deps/couchbase-cxx-client/core/operations/management/freeform.hxx

@@ -39,6 +39,8 @@ struct freeform_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline std::string observability_identifier = "freeform_http";
+
   service_type type{};
   std::string method;
   std::string path;

package/deps/couchbase-cxx-client/core/operations/management/group_drop.hxx

@@ -35,6 +35,7 @@ struct group_drop_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline std::string observability_identifier = "manager_users_drop_group";
   static const inline service_type type = service_type::management;
 
   std::string name{};

package/deps/couchbase-cxx-client/core/operations/management/group_get.hxx

@@ -37,6 +37,7 @@ struct group_get_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline std::string observability_identifier = "manager_users_get_group";
   static const inline service_type type = service_type::management;
 
   std::string name{};

package/deps/couchbase-cxx-client/core/operations/management/group_get_all.hxx

@@ -37,6 +37,7 @@ struct group_get_all_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline std::string observability_identifier = "manager_users_get_all_groups";
   static const inline service_type type = service_type::management;
 
   std::optional<std::string> client_context_id{};

package/deps/couchbase-cxx-client/core/operations/management/group_upsert.hxx

@@ -37,6 +37,7 @@ struct group_upsert_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline std::string observability_identifier = "manager_users_upsert_group";
   static const inline service_type type = service_type::management;
 
   couchbase::core::management::rbac::group group{};

package/deps/couchbase-cxx-client/core/operations/management/query_index_build.hxx

@@ -43,6 +43,8 @@ struct query_index_build_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::query;
+  static const inline std::string observability_identifier = "manager_query_build_indexes";
+
   static constexpr auto namespace_id = "default";
 
   std::string bucket_name;

package/deps/couchbase-cxx-client/core/operations/management/query_index_build_deferred.hxx

@@ -44,6 +44,9 @@ struct query_index_build_deferred_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline service_type type = service_type::query;
+  static const inline std::string observability_identifier = "manager_query_build_deferred_indexes";
+
   static constexpr auto namespace_id = "default";
 
   std::string bucket_name;

package/deps/couchbase-cxx-client/core/operations/management/query_index_create.hxx

@@ -43,6 +43,7 @@ struct query_index_create_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::query;
+  static const inline std::string observability_identifier = "manager_query_create_index";
 
   static constexpr auto namespace_id = "default";
   std::string bucket_name;

package/deps/couchbase-cxx-client/core/operations/management/query_index_drop.hxx

@@ -43,6 +43,7 @@ struct query_index_drop_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::query;
+  static const inline std::string observability_identifier = "manager_query_drop_index";
 
   static constexpr auto namespace_id = "default";
   std::string bucket_name;

package/deps/couchbase-cxx-client/core/operations/management/query_index_get_all.hxx

@@ -40,6 +40,8 @@ struct query_index_get_all_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::query;
+  static const inline std::string observability_identifier = "manager_query_get_all_indexes";
+
   static constexpr auto namespace_id = "default";
 
   std::string bucket_name;

package/deps/couchbase-cxx-client/core/operations/management/query_index_get_all_deferred.hxx

@@ -40,6 +40,9 @@ struct query_index_get_all_deferred_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::query;
+  static const inline std::string observability_identifier =
+    "manager_query_get_all_deferred_indexes";
+
   static constexpr auto namespace_id = "default";
 
   std::string bucket_name;

package/deps/couchbase-cxx-client/core/operations/management/role_get_all.hxx

@@ -37,6 +37,7 @@ struct role_get_all_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline std::string observability_identifier = "manager_users_get_roles";
   static const inline service_type type = service_type::management;
 
   std::optional<std::string> client_context_id{};

package/deps/couchbase-cxx-client/core/operations/management/scope_create.hxx

@@ -37,6 +37,7 @@ struct scope_create_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier = "manager_collections_create_scope";
 
   std::string bucket_name;
   std::string scope_name;

package/deps/couchbase-cxx-client/core/operations/management/scope_drop.hxx

@@ -37,6 +37,7 @@ struct scope_drop_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier = "manager_collections_drop_scope";
 
   std::string bucket_name;
   std::string scope_name;

package/deps/couchbase-cxx-client/core/operations/management/scope_get_all.hxx

@@ -38,6 +38,7 @@ struct scope_get_all_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier = "manager_collections_get_all_scopes";
 
   std::string bucket_name;
 

package/deps/couchbase-cxx-client/core/operations/management/search_get_stats.hxx

@@ -37,6 +37,7 @@ struct search_get_stats_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_get_stats";
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};

package/deps/couchbase-cxx-client/core/operations/management/search_index_analyze_document.hxx

@@ -39,6 +39,7 @@ struct search_index_analyze_document_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_analyze_document";
 
   std::string index_name;
   std::string encoded_document;

package/deps/couchbase-cxx-client/core/operations/management/search_index_control_ingest.hxx

@@ -38,6 +38,7 @@ struct search_index_control_ingest_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_control_ingest";
 
   std::string index_name;
   bool pause;

package/deps/couchbase-cxx-client/core/operations/management/search_index_control_plan_freeze.hxx

@@ -40,6 +40,7 @@ struct search_index_control_plan_freeze_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_control_plan_freeze";
 
   std::string index_name;
   bool freeze;

package/deps/couchbase-cxx-client/core/operations/management/search_index_control_query.hxx

@@ -38,6 +38,7 @@ struct search_index_control_query_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_control_querying";
 
   std::string index_name;
   bool allow;

package/deps/couchbase-cxx-client/core/operations/management/search_index_drop.hxx

@@ -38,6 +38,7 @@ struct search_index_drop_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_drop_index";
 
   std::string index_name;
 

package/deps/couchbase-cxx-client/core/operations/management/search_index_get.hxx

@@ -40,6 +40,7 @@ struct search_index_get_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_get_index";
 
   std::string index_name;
   std::optional<std::string> bucket_name;

package/deps/couchbase-cxx-client/core/operations/management/search_index_get_all.hxx

@@ -40,6 +40,7 @@ struct search_index_get_all_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_get_all_indexes";
 
   std::optional<std::string> bucket_name;
   std::optional<std::string> scope_name;

package/deps/couchbase-cxx-client/core/operations/management/search_index_get_documents_count.hxx

@@ -39,6 +39,8 @@ struct search_index_get_documents_count_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier =
+    "manager_search_get_indexed_documents_count";
 
   std::string index_name;
 

package/deps/couchbase-cxx-client/core/operations/management/search_index_get_stats.hxx

@@ -39,6 +39,7 @@ struct search_index_get_stats_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_get_stats";
 
   std::string index_name;
 

package/deps/couchbase-cxx-client/core/operations/management/search_index_upsert.hxx

@@ -41,6 +41,7 @@ struct search_index_upsert_request {
   using error_context_type = error_context::http;
 
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_upsert_index";
 
   couchbase::core::management::search::index index;
 

package/deps/couchbase-cxx-client/core/operations/management/user_drop.hxx

@@ -36,6 +36,7 @@ struct user_drop_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline std::string observability_identifier = "manager_users_drop_user";
   static const inline service_type type = service_type::management;
 
   std::string username{};

package/deps/couchbase-cxx-client/core/operations/management/user_get.hxx

@@ -37,6 +37,7 @@ struct user_get_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline std::string observability_identifier = "manager_users_get_user";
   static const inline service_type type = service_type::management;
 
   std::string username{};