couchbase 4.4.2 → 4.4.4

package/deps/couchbase-cxx-client/core/operations/http_noop.hxx

@@ -35,6 +35,8 @@ struct http_noop_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
 
+  static const inline std::string observability_identifier = "noop";
+
   service_type type{};
 
   std::optional<std::string> client_context_id{};

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

@@ -39,6 +39,7 @@ struct analytics_dataset_create_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_create_dataset";
 
   std::string dataverse_name{ "Default" };
   std::string dataset_name;

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

@@ -39,6 +39,7 @@ struct analytics_dataset_drop_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_drop_dataset";
 
   std::string dataverse_name{ "Default" };
   std::string dataset_name;

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

@@ -41,6 +41,7 @@ struct analytics_dataset_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_all_datasets";
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};

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

@@ -39,6 +39,7 @@ struct analytics_dataverse_create_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_create_dataverse";
 
   std::string dataverse_name;
 

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

@@ -39,6 +39,7 @@ struct analytics_dataverse_drop_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_drop_dataverse";
 
   std::string dataverse_name;
 

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

@@ -40,6 +40,8 @@ struct analytics_get_pending_mutations_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_pending_mutations";
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};

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

@@ -39,6 +39,7 @@ struct analytics_index_create_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_create_index";
 
   std::string dataverse_name{ "Default" };
   std::string dataset_name;

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

@@ -39,6 +39,7 @@ struct analytics_index_drop_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_drop_index";
 
   std::string dataverse_name{ "Default" };
   std::string dataset_name;

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

@@ -41,6 +41,7 @@ struct analytics_index_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_all_indexes";
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};

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

@@ -43,6 +43,7 @@ struct analytics_link_connect_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_connect_link";
 
   std::string dataverse_name{ "Default" };
   std::string link_name{ "Local" };

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

@@ -51,6 +51,7 @@ struct analytics_link_create_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_create_link";
 
   analytics_link_type link{};
   std::optional<std::string> client_context_id{};

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

@@ -43,6 +43,7 @@ struct analytics_link_disconnect_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_disconnect_link";
 
   std::string dataverse_name{ "Default" };
   std::string link_name{ "Local" };

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

@@ -43,6 +43,7 @@ struct analytics_link_drop_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_drop_link";
 
   std::string link_name{};
   std::string dataverse_name{};

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.cxx

@@ -18,6 +18,7 @@
 #include "bucket_describe.hxx"
 
 #include "core/utils/json.hxx"
+#include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
 
 #include <fmt/core.h>
@@ -33,7 +34,7 @@ bucket_describe_request::encode_to(encoded_request_type& encoded,
                                    http_context& /* context */) const -> std::error_code
 {
   encoded.method = "GET";
-  encoded.path = fmt::format("/pools/default/b/{}", name);
+  encoded.path = fmt::format("/pools/default/b/{}", utils::string_codec::v2::path_escape(name));
   return {};
 }
 

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.cxx

@@ -17,6 +17,7 @@
 
 #include "bucket_drop.hxx"
 
+#include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
 
 #include <fmt/core.h>
@@ -28,7 +29,8 @@ bucket_drop_request::encode_to(encoded_request_type& encoded,
                                http_context& /* context */) const -> std::error_code
 {
   encoded.method = "DELETE";
-  encoded.path = fmt::format("/pools/default/buckets/{}", name);
+  encoded.path =
+    fmt::format("/pools/default/buckets/{}", utils::string_codec::v2::path_escape(name));
   return {};
 }
 

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.cxx

@@ -17,6 +17,7 @@
 
 #include "bucket_flush.hxx"
 
+#include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
 
 #include <fmt/core.h>
@@ -28,7 +29,8 @@ bucket_flush_request::encode_to(encoded_request_type& encoded,
                                 http_context& /* context */) const -> std::error_code
 {
   encoded.method = "POST";
-  encoded.path = fmt::format("/pools/default/buckets/{}/controller/doFlush", name);
+  encoded.path = fmt::format("/pools/default/buckets/{}/controller/doFlush",
+                             utils::string_codec::v2::path_escape(name));
   return {};
 }
 

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.cxx

@@ -19,6 +19,7 @@
 
 #include "core/management/bucket_settings_json.hxx"
 #include "core/utils/json.hxx"
+#include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
 
 #include <fmt/core.h>
@@ -31,7 +32,8 @@ bucket_get_request::encode_to(encoded_request_type& encoded,
                               http_context& /* context */) const -> std::error_code
 {
   encoded.method = "GET";
-  encoded.path = fmt::format("/pools/default/buckets/{}", name);
+  encoded.path =
+    fmt::format("/pools/default/buckets/{}", utils::string_codec::v2::path_escape(name));
   return {};
 }
 

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.cxx

@@ -20,6 +20,7 @@
 #include "core/management/bucket_settings.hxx"
 #include "core/utils/join_strings.hxx"
 #include "core/utils/json.hxx"
+#include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
 
 #include <couchbase/durability_level.hxx>
@@ -33,7 +34,8 @@ bucket_update_request::encode_to(encoded_request_type& encoded,
                                  http_context& /* context */) const -> std::error_code
 {
   encoded.method = "POST";
-  encoded.path = fmt::format("/pools/default/buckets/{}", bucket.name);
+  encoded.path =
+    fmt::format("/pools/default/buckets/{}", utils::string_codec::v2::path_escape(bucket.name));
 
   encoded.headers["content-type"] = "application/x-www-form-urlencoded";
 

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.cxx

@@ -33,8 +33,9 @@ collection_create_request::encode_to(encoded_request_type& encoded,
                                      http_context& /*context*/) const -> std::error_code
 {
   encoded.method = "POST";
-  encoded.path =
-    fmt::format("/pools/default/buckets/{}/scopes/{}/collections", bucket_name, scope_name);
+  encoded.path = fmt::format("/pools/default/buckets/{}/scopes/{}/collections",
+                             utils::string_codec::v2::path_escape(bucket_name),
+                             utils::string_codec::v2::path_escape(scope_name));
   encoded.headers["content-type"] = "application/x-www-form-urlencoded";
   encoded.body = fmt::format("name={}", utils::string_codec::form_encode(collection_name));
   if (max_expiry) {

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.cxx

@@ -18,6 +18,7 @@
 #include "collection_drop.hxx"
 
 #include "core/utils/json.hxx"
+#include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
 
 #include <fmt/core.h>
@@ -32,8 +33,10 @@ collection_drop_request::encode_to(encoded_request_type& encoded,
                                    http_context& /* context */) const -> std::error_code
 {
   encoded.method = "DELETE";
-  encoded.path = fmt::format(
-    "/pools/default/buckets/{}/scopes/{}/collections/{}", bucket_name, scope_name, collection_name);
+  encoded.path = fmt::format("/pools/default/buckets/{}/scopes/{}/collections/{}",
+                             utils::string_codec::v2::path_escape(bucket_name),
+                             utils::string_codec::v2::path_escape(scope_name),
+                             utils::string_codec::v2::path_escape(collection_name));
   return {};
 }
 

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.cxx

@@ -33,8 +33,10 @@ collection_update_request::encode_to(encoded_request_type& encoded,
                                      http_context& /*context*/) const -> std::error_code
 {
   encoded.method = "PATCH";
-  encoded.path = fmt::format(
-    "/pools/default/buckets/{}/scopes/{}/collections/{}", bucket_name, scope_name, collection_name);
+  encoded.path = fmt::format("/pools/default/buckets/{}/scopes/{}/collections/{}",
+                             utils::string_codec::v2::path_escape(bucket_name),
+                             utils::string_codec::v2::path_escape(scope_name),
+                             utils::string_codec::v2::path_escape(collection_name));
   encoded.headers["content-type"] = "application/x-www-form-urlencoded";
   std::map<std::string, std::string> values{};
   if (max_expiry.has_value()) {

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{};