couchbase 3.7.0 → 3.8.1

data/ext/couchbase/core/tls_context_provider.hxx

@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ * Copyright 2022-Present Couchbase, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ * ANY KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#pragma once
+
+#include <memory>
+
+namespace asio
+{
+namespace ssl
+{
+class context;
+} // namespace ssl
+} // namespace asio
+
+namespace couchbase::core
+{
+
+class tls_context_provider
+{
+public:
+  tls_context_provider();
+
+  explicit tls_context_provider(std::shared_ptr<asio::ssl::context> ctx);
+
+  void set_ctx(std::shared_ptr<asio::ssl::context> new_ctx);
+  [[nodiscard]] auto get_ctx() const -> std::shared_ptr<asio::ssl::context>;
+
+private:
+  std::shared_ptr<asio::ssl::context> ctx_;
+};
+} // namespace couchbase::core

data/ext/couchbase/core/topology/configuration.cxx

@@ -17,6 +17,7 @@
 
 #include "configuration.hxx"
 
+#include "core/impl/node_id.hxx"
 #include "core/logger/logger.hxx"
 #include "core/service_type_fmt.hxx"
 #include "core/utils/crc32.hxx"
@@ -171,6 +172,26 @@ configuration::node::endpoint(const std::string& network, service_type type, boo
   return fmt::format("{}:{}", hostname_for(network), p);
 }
 
+auto
+configuration::node::effective_node_id(bool is_tls) const -> couchbase::node_id
+{
+  return internal_node_id::build(node_uuid, hostname, port_or(service_type::key_value, is_tls, 0));
+}
+
+auto
+configuration::effective_node_ids(bool is_tls) const -> std::vector<couchbase::node_id>
+{
+  std::vector<couchbase::node_id> result;
+  result.reserve(nodes.size());
+  for (const auto& n : nodes) {
+    if (n.port_or(service_type::key_value, is_tls, 0) == 0) {
+      continue;
+    }
+    result.push_back(n.effective_node_id(is_tls));
+  }
+  return result;
+}
+
 auto
 configuration::has_node(const std::string& network,
                         service_type type,

data/ext/couchbase/core/topology/configuration.hxx

@@ -21,6 +21,8 @@
 #include "core/platform/uuid.h"
 #include "core/service_type.hxx"
 
+#include <couchbase/node_id.hxx>
+
 #include <map>
 #include <optional>
 #include <set>
@@ -83,10 +85,36 @@ struct configuration {
 
     [[nodiscard]] auto endpoint(const std::string& network, service_type type, bool is_tls) const
       -> std::optional<std::string>;
+
+    /**
+     * Returns a node_id built from this node's UUID (when available on
+     * Server 8.0.1+) with fallback to a deterministic hash of hostname +
+     * KV port for older servers.
+     *
+     * The KV port selected mirrors what mcbp_session uses for the same node
+     * (TLS port when @p is_tls, plain port otherwise), ensuring that the
+     * node_id surfaced on the request side via collection::node_id_for
+     * matches the node_id attached to results and errors.
+     */
+    [[nodiscard]] auto effective_node_id(bool is_tls) const -> couchbase::node_id;
   };
 
   [[nodiscard]] auto select_network(const std::string& bootstrap_hostname) const -> std::string;
 
+  /**
+   * Returns one node_id per cluster node that currently serves the
+   * key-value service over the requested transport. Nodes that do not
+   * expose a KV port for @p is_tls are filtered out — without a KV port
+   * the fallback hash would be derived from a meaningless port=0 and
+   * could collide with a sibling node that is also missing its KV port.
+   *
+   * The returned vector preserves topology order; callers that want a
+   * set semantic should hash the entries themselves (couchbase::node_id
+   * is hashable). Topology nodes are unique by construction, so no
+   * dedup is performed here.
+   */
+  [[nodiscard]] auto effective_node_ids(bool is_tls) const -> std::vector<couchbase::node_id>;
+
   using vbucket_map = typename std::vector<std::vector<std::int16_t>>;
 
   std::optional<std::int64_t> epoch{};

data/ext/couchbase/core/tracing/attribute_helpers.hxx

@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *     Copyright 2025 Couchbase, Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+#pragma once
+
+#include <couchbase/durability_level.hxx>
+#include <couchbase/tracing/request_span.hxx>
+
+#include "constants.hxx"
+
+namespace couchbase::core::tracing
+{
+void inline set_durability_level_attribute(
+  const std::shared_ptr<couchbase::tracing::request_span>& span,
+  const durability_level durability)
+{
+  switch (durability) {
+    case durability_level::none:
+      break;
+    case durability_level::majority:
+      span->add_tag(attributes::op::durability_level, "majority");
+      break;
+    case durability_level::majority_and_persist_to_active:
+      span->add_tag(attributes::op::durability_level, "majority_and_persist_active");
+      break;
+    case durability_level::persist_to_majority:
+      span->add_tag(attributes::op::durability_level, "persist_majority");
+      break;
+  }
+}
+} // namespace couchbase::core::tracing

data/ext/couchbase/core/tracing/constants.hxx

@@ -27,72 +27,151 @@ namespace couchbase::core::tracing
 {
 namespace operation
 {
-constexpr auto step_dispatch = "cb.dispatch_to_server";
-constexpr auto step_request_encoding = "cb.request_encoding";
-constexpr auto http_query = "cb.query";
-constexpr auto http_analytics = "cb.analytics";
-constexpr auto http_search = "cb.search";
-constexpr auto http_views = "cb.views";
-constexpr auto http_manager = "cb.manager";
-constexpr auto http_eventing = "cb.eventing";
-constexpr auto http_manager_analytics = "cb.manager_analytics";
-constexpr auto http_manager_query = "cb.manager_query";
-constexpr auto http_manager_buckets = "cb.manager_buckets";
-constexpr auto http_manager_collections = "cb.manager_collections";
-constexpr auto http_manager_search = "cb.manager_search";
-constexpr auto http_manager_users = "cb.manager_users";
-constexpr auto http_manager_views = "cb.manager_views";
-constexpr auto mcbp_get = "cb.get";
-constexpr auto mcbp_get_replica = "cb.get_replica";
-constexpr auto mcbp_upsert = "cb.upsert";
-constexpr auto mcbp_replace = "cb.replace";
-constexpr auto mcbp_insert = "cb.insert";
-constexpr auto mcbp_remove = "cb.remove";
-constexpr auto mcbp_get_and_lock = "cb.get_and_lock";
-constexpr auto mcbp_get_and_touch = "cb.get_and_touch";
-constexpr auto mcbp_exists = "cb.exists";
-constexpr auto mcbp_touch = "cb.touch";
-constexpr auto mcbp_unlock = "cb.unlock";
-constexpr auto mcbp_lookup_in = "cb.lookup_in";
-constexpr auto mcbp_mutate_in = "cb.mutate_in";
-constexpr auto mcbp_append = "cb.append";
-constexpr auto mcbp_prepend = "cb.prepend";
-constexpr auto mcbp_increment = "cb.increment";
-constexpr auto mcbp_decrement = "cb.decrement";
-constexpr auto mcbp_observe = "cb.observe";
-constexpr auto mcbp_range_scan_create = "cb.range_scan_create";
-constexpr auto mcbp_range_scan_continue = "cb.range_scan_continue";
-constexpr auto mcbp_range_scan_cancel = "cb.range_scan_cancel";
-/* multi-command operations */
-constexpr auto mcbp_get_all_replicas = "cb.get_all_replicas";
-constexpr auto mcbp_get_any_replica = "cb.get_any_replica";
-constexpr auto mcbp_list = "cb.list";
-constexpr auto mcbp_set = "cb.set";
-constexpr auto mcbp_map = "cb.map";
-constexpr auto mcbp_queue = "cb.queue";
-constexpr auto mcbp_ping = "cb.ping";
-
-constexpr auto mcbp_internal = "cb.internal";
+constexpr auto step_dispatch = "dispatch_to_server";
+constexpr auto step_request_encoding = "request_encoding";
+
+constexpr auto query = "query";
+constexpr auto analytics = "analytics";
+constexpr auto search = "search";
+constexpr auto views = "views";
+constexpr auto manager = "manager";
+constexpr auto eventing = "eventing";
+
+// KV operations
+constexpr auto mcbp_get = "get";
+constexpr auto mcbp_get_replica = "get_replica";
+constexpr auto mcbp_upsert = "upsert";
+constexpr auto mcbp_replace = "replace";
+constexpr auto mcbp_insert = "insert";
+constexpr auto mcbp_remove = "remove";
+constexpr auto mcbp_get_and_lock = "get_and_lock";
+constexpr auto mcbp_get_and_touch = "get_and_touch";
+constexpr auto mcbp_exists = "exists";
+constexpr auto mcbp_touch = "touch";
+constexpr auto mcbp_unlock = "unlock";
+constexpr auto mcbp_lookup_in = "lookup_in";
+constexpr auto mcbp_lookup_in_replica = "lookup_in_replica";
+constexpr auto mcbp_mutate_in = "mutate_in";
+constexpr auto mcbp_append = "append";
+constexpr auto mcbp_prepend = "prepend";
+constexpr auto mcbp_increment = "increment";
+constexpr auto mcbp_decrement = "decrement";
+constexpr auto mcbp_range_scan_create = "range_scan_create";
+constexpr auto mcbp_range_scan_continue = "range_scan_continue";
+constexpr auto mcbp_range_scan_cancel = "range_scan_cancel";
+constexpr auto mcbp_internal = "internal";
+
+// Multi-command operations
+constexpr auto mcbp_get_all_replicas = "get_all_replicas";
+constexpr auto mcbp_get_any_replica = "get_any_replica";
+constexpr auto mcbp_lookup_in_all_replicas = "lookup_in_all_replicas";
+constexpr auto mcbp_lookup_in_any_replica = "lookup_in_any_replica";
+constexpr auto mcbp_scan = "scan";
+constexpr auto ping = "ping";
+constexpr auto diagnostics = "diagnostics";
+
+// Collection management operations
+constexpr auto mgr_collections_create_collection = "manager_collections_create_collection";
+constexpr auto mgr_collections_drop_collection = "manager_collections_drop_collection";
+constexpr auto mgr_collections_update_collection = "manager_collections_update_collection";
+constexpr auto mgr_collections_create_scope = "manager_collections_create_scope";
+constexpr auto mgr_collections_drop_scope = "manager_collections_drop_scope";
+constexpr auto mgr_collections_get_all_scopes = "manager_collections_get_all_scopes";
+
+// Bucket management operations
+constexpr auto mgr_buckets_get_bucket = "manager_buckets_get_bucket";
+constexpr auto mgr_buckets_get_all_buckets = "manager_buckets_get_all_buckets";
+constexpr auto mgr_buckets_create_bucket = "manager_buckets_create_bucket";
+constexpr auto mgr_buckets_update_bucket = "manager_buckets_update_bucket";
+constexpr auto mgr_buckets_drop_bucket = "manager_buckets_drop_bucket";
+constexpr auto mgr_buckets_flush_bucket = "manager_buckets_flush_bucket";
+
+// Query index management operations
+constexpr auto mgr_query_build_deferred_indexes = "manager_query_build_deferred_indexes";
+constexpr auto mgr_query_create_index = "manager_query_create_index";
+constexpr auto mgr_query_create_primary_index = "manager_query_create_primary_index";
+constexpr auto mgr_query_drop_index = "manager_query_drop_index";
+constexpr auto mgr_query_drop_primary_index = "manager_query_drop_primary_index";
+constexpr auto mgr_query_get_all_indexes = "manager_query_get_all_indexes";
+constexpr auto mgr_query_watch_indexes = "manager_query_watch_indexes";
+constexpr auto mgr_query_get_all_deferred_indexes = "manager_query_get_all_deferred_indexes";
+constexpr auto mgr_query_build_indexes = "manager_query_build_indexes";
+
+// Search index management operations
+constexpr auto mgr_search_get_index = "manager_search_get_index";
+constexpr auto mgr_search_get_all_indexes = "manager_search_get_all_indexes";
+constexpr auto mgr_search_upsert_index = "manager_search_upsert_index";
+constexpr auto mgr_search_drop_index = "manager_search_drop_index";
+constexpr auto mgr_search_get_indexed_documents_count =
+  "manager_search_get_indexed_documents_count";
+constexpr auto mgr_search_pause_ingest = "manager_search_pause_ingest";
+constexpr auto mgr_search_resume_ingest = "manager_search_resume_ingest";
+constexpr auto mgr_search_allow_querying = "manager_search_allow_querying";
+constexpr auto mgr_search_disallow_querying = "manager_search_disallow_querying";
+constexpr auto mgr_search_freeze_plan = "manager_search_freeze_plan";
+constexpr auto mgr_search_unfreeze_plan = "manager_search_unfreeze_plan";
+constexpr auto mgr_search_analyze_document = "manager_search_analyze_document";
+
+// Analytics index management operations
+constexpr auto mgr_analytics_create_dataverse = "manager_analytics_create_dataverse";
+constexpr auto mgr_analytics_drop_dataverse = "manager_analytics_drop_dataverse";
+constexpr auto mgr_analytics_create_dataset = "manager_analytics_create_dataset";
+constexpr auto mgr_analytics_drop_dataset = "manager_analytics_drop_dataset";
+constexpr auto mgr_analytics_get_all_datasets = "manager_analytics_get_all_datasets";
+constexpr auto mgr_analytics_create_index = "manager_analytics_create_index";
+constexpr auto mgr_analytics_drop_index = "manager_analytics_drop_index";
+constexpr auto mgr_analytics_get_all_indexes = "manager_analytics_get_all_indexes";
+constexpr auto mgr_analytics_connect_link = "manager_analytics_connect_link";
+constexpr auto mgr_analytics_disconnect_link = "manager_analytics_disconnect_link";
+constexpr auto mgr_analytics_get_pending_mutations = "manager_analytics_get_pending_mutations";
+constexpr auto mgr_analytics_create_link = "manager_analytics_create_link";
+constexpr auto mgr_analytics_replace_link = "manager_analytics_replace_link";
+constexpr auto mgr_analytics_drop_link = "manager_analytics_drop_link";
+constexpr auto mgr_analytics_get_links = "manager_analytics_get_links";
 } // namespace operation
 
 namespace attributes
 {
-constexpr auto system = "db.system";
-constexpr auto cluster_name = "db.couchbase.cluster_name";
-constexpr auto cluster_uuid = "db.couchbase.cluster_uuid";
-
-constexpr auto span_kind = "span.kind";
-constexpr auto component = "db.couchbase.component";
-constexpr auto instance = "db.instance";
-
-constexpr auto orphan = "cb.orphan";
-constexpr auto service = "cb.service";
-constexpr auto operation_id = "cb.operation_id";
-
-constexpr auto server_duration = "cb.server_duration";
-constexpr auto local_id = "cb.local_id";
-constexpr auto local_socket = "cb.local_socket";
-constexpr auto remote_socket = "cb.remote_socket";
+// Attributes present on all spans
+namespace common
+{
+constexpr auto system = "db.system.name";
+constexpr auto cluster_name = "couchbase.cluster.name";
+constexpr auto cluster_uuid = "couchbase.cluster.uuid";
+} // namespace common
+
+// Operation-level attributes
+namespace op
+{
+constexpr auto service = "couchbase.service";
+constexpr auto retry_count = "couchbase.retries";
+constexpr auto durability_level = "couchbase.durability";
+constexpr auto bucket_name = "db.namespace";
+constexpr auto scope_name = "couchbase.scope.name";
+constexpr auto collection_name = "couchbase.collection.name";
+constexpr auto query_statement = "db.query.text";
+constexpr auto operation_name = "db.operation.name";
+constexpr auto error_type = "error.type";
+} // namespace op
+
+// Dispatch-level attributes
+namespace dispatch
+{
+constexpr auto server_duration = "couchbase.server_duration";
+constexpr auto local_id = "couchbase.local_id";
+constexpr auto server_address = "server.address";
+constexpr auto server_port = "server.port";
+constexpr auto peer_address = "network.peer.address";
+constexpr auto peer_port = "network.peer.port";
+constexpr auto network_transport = "network.transport";
+constexpr auto operation_id = "couchbase.operation_id";
+} // namespace dispatch
+
+// Reserved attributes for internal use
+namespace reserved
+{
+constexpr auto target_unit = "__unit";
+} // namespace reserved
 } // namespace attributes
 
 namespace service
@@ -104,6 +183,7 @@ constexpr auto view = "views";
 constexpr auto analytics = "analytics";
 constexpr auto management = "management";
 constexpr auto eventing = "eventing";
+constexpr auto transactions = "transactions";
 } // namespace service
 
 constexpr auto
@@ -111,22 +191,22 @@ span_name_for_http_service(service_type type)
 {
   switch (type) {
     case service_type::query:
-      return operation::http_query;
+      return operation::query;
 
     case service_type::analytics:
-      return operation::http_analytics;
+      return operation::analytics;
 
     case service_type::search:
-      return operation::http_search;
+      return operation::search;
 
     case service_type::view:
-      return operation::http_views;
+      return operation::views;
 
     case service_type::management:
-      return operation::http_manager;
+      return operation::manager;
 
     case service_type::eventing:
-      return operation::http_eventing;
+      return operation::eventing;
 
     case service_type::key_value:
       return "unexpected_http_service";

data/ext/couchbase/core/tracing/threshold_logging_options.hxx

@@ -24,9 +24,6 @@
 namespace couchbase::core::tracing
 {
 struct threshold_logging_options {
-  std::chrono::milliseconds orphaned_emit_interval{ std::chrono::seconds{ 10 } };
-  std::size_t orphaned_sample_size{ 64 };
-
   std::chrono::milliseconds threshold_emit_interval{ std::chrono::seconds{ 10 } };
   std::size_t threshold_sample_size{ 64 };
   std::chrono::milliseconds key_value_threshold{ 500 };