couchbase 3.5.4 → 3.5.5

data/ext/couchbase/couchbase/metrics/otel_meter.hxx

@@ -20,6 +20,7 @@
 #include "opentelemetry/sdk/metrics/meter.h"
 #include <couchbase/metrics/meter.hxx>
 
+#include <algorithm>
 #include <iostream>
 #include <thread>
 #include <utility>
@@ -37,44 +38,39 @@ namespace couchbase::metrics
 class otel_sync_histogram
 {
 public:
-  otel_sync_histogram(nostd::shared_ptr<metrics_api::Histogram<long>> histogram_counter)
+  otel_sync_histogram(nostd::shared_ptr<metrics_api::Histogram<std::uint64_t>> histogram_counter)
     : histogram_counter_(histogram_counter)
   {
   }
-  void record(uint64_t value,
+
+  void record(std::uint64_t value,
               const opentelemetry::common::KeyValueIterable& tags,
               opentelemetry::context::Context& ctx)
   {
-    // overflow
-    if (value > LONG_MAX) {
-      value = LONG_MAX;
-    }
-    long lvalue = static_cast<long>(value);
-    histogram_counter_->Record(lvalue, tags, ctx);
+    histogram_counter_->Record(value, tags, ctx);
   }
 
 private:
-  nostd::shared_ptr<metrics_api::Histogram<long>> histogram_counter_;
+  nostd::shared_ptr<metrics_api::Histogram<std::uint64_t>> histogram_counter_;
   std::mutex mutex_;
 };
 
 class otel_value_recorder : public couchbase::metrics::value_recorder
 {
 public:
-  explicit otel_value_recorder(nostd::shared_ptr<metrics_api::Histogram<long>> histogram_counter,
-                               const std::map<std::string, std::string>& tags)
+  explicit otel_value_recorder(
+    nostd::shared_ptr<metrics_api::Histogram<std::uint64_t>> histogram_counter,
+    const std::map<std::string, std::string>& tags)
     : histogram_counter_(histogram_counter)
     , tags_(tags)
   {
   }
   void record_value(std::int64_t value) override
   {
-    if (value > LONG_MAX) {
-      value = LONG_MAX;
-    }
-    long lvalue = static_cast<long>(value);
+    value = std::max<int64_t>(value, 0);
+    auto uvalue = static_cast<std::uint64_t>(value);
     histogram_counter_->Record(
-      value, opentelemetry::common::KeyValueIterableView<decltype(tags_)>{ tags_ }, context_);
+      uvalue, opentelemetry::common::KeyValueIterableView<decltype(tags_)>{ tags_ }, context_);
   }
 
   const std::map<std::string, std::string> tags()
@@ -82,13 +78,13 @@ public:
     return tags_;
   }
 
-  nostd::shared_ptr<metrics_api::Histogram<long>> histogram_counter()
+  nostd::shared_ptr<metrics_api::Histogram<std::uint64_t>> histogram_counter()
   {
     return histogram_counter_;
   }
 
 private:
-  nostd::shared_ptr<metrics_api::Histogram<long>> histogram_counter_;
+  nostd::shared_ptr<metrics_api::Histogram<std::uint64_t>> histogram_counter_;
   const std::map<std::string, std::string> tags_;
   opentelemetry::context::Context context_{};
   std::mutex mutex_;
@@ -115,8 +111,8 @@ public:
       // api doesn't seem to allow this.
       return recorders_
         .insert({ name,
-                  std::make_shared<otel_value_recorder>(meter_->CreateLongHistogram(name, "", "us"),
-                                                        tags) })
+                  std::make_shared<otel_value_recorder>(
+                    meter_->CreateUInt64Histogram(name, "", "us"), tags) })
         ->second;
     }
     // so it is already, lets see if we already have one with those tags, or need

data/ext/extconf.rb

@@ -104,6 +104,7 @@ if ENV["CB_STATIC"] || ENV["CB_STATIC_BORINGSSL"]
 elsif ENV["CB_STATIC_OPENSSL"]
   cmake_flags << "-DCOUCHBASE_CXX_CLIENT_STATIC_OPENSSL=ON"
 end
+cmake_flags << "-DCOUCHBASE_CXX_CLIENT_WRAPPER_UNIFIED_ID=ruby/#{Couchbase::VERSION[:sdk]}"
 
 unless cmake_flags.grep(/BORINGSSL/)
   case RbConfig::CONFIG["target_os"]

data/ext/rcb_analytics.cxx

@@ -36,7 +36,7 @@
 #include <core/operations/management/analytics_link_get_all.hxx>
 #include <core/operations/management/analytics_link_replace.hxx>
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <future>
 #include <memory>
@@ -911,17 +911,17 @@ cb_Backend_analytics_link_get_all(VALUE self, VALUE options)
         cb_throw_error(
           resp.ctx,
           fmt::format(R"(unable to retrieve links type={}, dataverse="{}",  name="{}")",
-                      req.link_type,
-                      req.link_name,
-                      req.dataverse_name));
+                      req.link_type.value_or("-"),
+                      req.link_name.value_or("-"),
+                      req.dataverse_name.value_or("-")));
       } else {
         const auto& first_error = resp.errors.front();
         cb_throw_error(
           resp.ctx,
           fmt::format(R"(unable to retrieve links type={}, dataverse="{}",  name="{}" ({}: {}))",
-                      req.link_type,
-                      req.link_name,
-                      req.dataverse_name,
+                      req.link_type.value_or("-"),
+                      req.link_name.value_or("-"),
+                      req.dataverse_name.value_or("-"),
                       first_error.code,
                       first_error.message));
       }

data/ext/rcb_backend.cxx

@@ -22,7 +22,7 @@
 #include <core/utils/connection_string.hxx>
 
 #include <asio/io_context.hpp>
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <future>
 #include <memory>
@@ -208,6 +208,11 @@ initialize_cluster_options(const core::utils::connection_string& connstr,
     cluster_options.network().preferred_network(param.value());
   }
 
+  static const auto server_group = rb_id2sym(rb_intern("preferred_server_group"));
+  if (auto group = options::get_string(options, server_group); group) {
+    cluster_options.network().preferred_server_group(group.value());
+  }
+
   static const auto sym_use_ip_protocol = rb_id2sym(rb_intern("use_ip_protocol"));
   if (auto proto = options::get_symbol(options, sym_use_ip_protocol); proto) {
     static const auto sym_any = rb_id2sym(rb_intern("any"));

data/ext/rcb_buckets.cxx

@@ -24,7 +24,7 @@
 #include <core/operations/management/bucket_get_all.hxx>
 #include <core/operations/management/bucket_update.hxx>
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <future>
 #include <memory>

data/ext/rcb_collections.cxx

@@ -23,7 +23,7 @@
 #include <core/operations/management/scope_drop.hxx>
 #include <core/operations/management/scope_get_all.hxx>
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <future>
 #include <memory>

data/ext/rcb_crud.cxx

@@ -128,7 +128,7 @@ cb_Backend_document_get_any_replica(VALUE self,
                                     VALUE id,
                                     VALUE options)
 {
-  auto cluster = cb_backend_to_public_api_cluster(self);
+  auto cluster = cb_backend_to_core_api_cluster(self);
 
   Check_Type(bucket, T_STRING);
   Check_Type(scope, T_STRING);
@@ -136,23 +136,32 @@ cb_Backend_document_get_any_replica(VALUE self,
   Check_Type(id, T_STRING);
 
   try {
-    couchbase::get_any_replica_options opts;
-    set_timeout(opts, options);
+    core::document_id doc_id{
+      cb_string_new(bucket),
+      cb_string_new(scope),
+      cb_string_new(collection),
+      cb_string_new(id),
+    };
 
-    auto f = cluster.bucket(cb_string_new(bucket))
-               .scope(cb_string_new(scope))
-               .collection(cb_string_new(collection))
-               .get_any_replica(cb_string_new(id), opts);
-    auto [ctx, resp] = cb_wait_for_future(f);
-    if (ctx.ec()) {
-      cb_throw_error(ctx, "unable to get replica of the document");
+    core::operations::get_any_replica_request req{ doc_id };
+    cb_extract_timeout(req, options);
+    cb_extract_read_preference(req, options);
+
+    std::promise<core::operations::get_any_replica_response> promise;
+    auto f = promise.get_future();
+    cluster.execute(req, [promise = std::move(promise)](auto&& resp) mutable {
+      promise.set_value(std::forward<decltype(resp)>(resp));
+    });
+    auto resp = cb_wait_for_future(f);
+    if (resp.ctx.ec()) {
+      cb_throw_error(resp.ctx, "unable to get replica of the document");
     }
 
-    auto value = resp.content_as<passthrough_transcoder>();
     VALUE res = rb_hash_new();
-    rb_hash_aset(res, rb_id2sym(rb_intern("content")), cb_str_new(value.data));
-    rb_hash_aset(res, rb_id2sym(rb_intern("cas")), cb_cas_to_num(resp.cas()));
-    rb_hash_aset(res, rb_id2sym(rb_intern("flags")), UINT2NUM(value.flags));
+    rb_hash_aset(res, rb_id2sym(rb_intern("content")), cb_str_new(resp.value));
+    rb_hash_aset(res, rb_id2sym(rb_intern("cas")), cb_cas_to_num(resp.cas));
+    rb_hash_aset(res, rb_id2sym(rb_intern("flags")), UINT2NUM(resp.flags));
+    rb_hash_aset(res, rb_id2sym(rb_intern("replica")), resp.replica ? Qtrue : Qfalse);
     return res;
   } catch (const std::system_error& se) {
     rb_exc_raise(cb_map_error_code(
@@ -171,7 +180,7 @@ cb_Backend_document_get_all_replicas(VALUE self,
                                      VALUE id,
                                      VALUE options)
 {
-  auto cluster = cb_backend_to_public_api_cluster(self);
+  auto cluster = cb_backend_to_core_api_cluster(self);
 
   Check_Type(bucket, T_STRING);
   Check_Type(scope, T_STRING);
@@ -179,25 +188,35 @@ cb_Backend_document_get_all_replicas(VALUE self,
   Check_Type(id, T_STRING);
 
   try {
-    couchbase::get_all_replicas_options opts;
-    set_timeout(opts, options);
+    core::document_id doc_id{
+      cb_string_new(bucket),
+      cb_string_new(scope),
+      cb_string_new(collection),
+      cb_string_new(id),
+    };
 
-    auto f = cluster.bucket(cb_string_new(bucket))
-               .scope(cb_string_new(scope))
-               .collection(cb_string_new(collection))
-               .get_all_replicas(cb_string_new(id), opts);
-    auto [ctx, resp] = cb_wait_for_future(f);
-    if (ctx.ec()) {
-      cb_throw_error(ctx, "unable to get all replicas for the document");
+    core::operations::get_all_replicas_request req{ doc_id };
+    cb_extract_timeout(req, options);
+    cb_extract_read_preference(req, options);
+
+    std::promise<core::operations::get_all_replicas_response> promise;
+    auto f = promise.get_future();
+    cluster.execute(req, [promise = std::move(promise)](auto&& resp) mutable {
+      promise.set_value(std::forward<decltype(resp)>(resp));
+    });
+    auto resp = cb_wait_for_future(f);
+    if (resp.ctx.ec()) {
+      cb_throw_error(resp.ctx, "unable to get all replicas for the document");
     }
 
-    VALUE res = rb_ary_new_capa(static_cast<long>(resp.size()));
-    for (const auto& entry : resp) {
+    VALUE res = rb_ary_new_capa(static_cast<long>(resp.entries.size()));
+
+    for (const auto& entry : resp.entries) {
       VALUE response = rb_hash_new();
-      auto value = entry.content_as<passthrough_transcoder>();
-      rb_hash_aset(response, rb_id2sym(rb_intern("content")), cb_str_new(value.data));
-      rb_hash_aset(response, rb_id2sym(rb_intern("cas")), cb_cas_to_num(entry.cas()));
-      rb_hash_aset(response, rb_id2sym(rb_intern("flags")), UINT2NUM(value.flags));
+      rb_hash_aset(response, rb_id2sym(rb_intern("content")), cb_str_new(entry.value));
+      rb_hash_aset(response, rb_id2sym(rb_intern("cas")), cb_cas_to_num(entry.cas));
+      rb_hash_aset(response, rb_id2sym(rb_intern("flags")), UINT2NUM(entry.flags));
+      rb_hash_aset(response, rb_id2sym(rb_intern("replica")), entry.replica ? Qtrue : Qfalse);
       rb_ary_push(res, response);
     }
     return res;
@@ -1107,6 +1126,7 @@ cb_Backend_document_lookup_in_any_replica(VALUE self,
 
     core::operations::lookup_in_any_replica_request req{ doc_id };
     cb_extract_timeout(req, options);
+    cb_extract_read_preference(req, options);
 
     static VALUE xattr_property = rb_id2sym(rb_intern("xattr"));
     static VALUE path_property = rb_id2sym(rb_intern("path"));
@@ -1234,6 +1254,7 @@ cb_Backend_document_lookup_in_all_replicas(VALUE self,
 
     core::operations::lookup_in_all_replicas_request req{ doc_id };
     cb_extract_timeout(req, options);
+    cb_extract_read_preference(req, options);
 
     static VALUE xattr_property = rb_id2sym(rb_intern("xattr"));
     static VALUE path_property = rb_id2sym(rb_intern("path"));

data/ext/rcb_diagnostics.cxx

@@ -17,7 +17,7 @@
 
 #include <core/cluster.hxx>
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <future>
 

data/ext/rcb_exceptions.cxx

@@ -17,7 +17,6 @@
 
 #include <couchbase/error.hxx>
 #include <couchbase/error_codes.hxx>
-#include <couchbase/fmt/retry_reason.hxx>
 
 #include <core/error_context/analytics.hxx>
 #include <core/error_context/http.hxx>
@@ -27,7 +26,9 @@
 #include <core/error_context/view.hxx>
 #include <core/fmt/key_value_status_code.hxx>
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
+
+#include <couchbase/fmt/retry_reason.hxx>
 
 #include "rcb_exceptions.hxx"
 #include "rcb_utils.hxx"

data/ext/rcb_extras.cxx

@@ -26,8 +26,8 @@
 #include <core/utils/unsigned_leb128.hxx>
 #include <core/utils/url_codec.hxx>
 
-#include <fmt/core.h>
 #include <snappy.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <future>
 #include <string>

data/ext/rcb_range_scan.cxx

@@ -24,7 +24,7 @@
 #include <core/scan_result.hxx>
 #include <couchbase/error_codes.hxx>
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <future>
 

data/ext/rcb_search.cxx

@@ -30,8 +30,8 @@
 #include <core/operations/management/search_index_get_stats.hxx>
 #include <core/operations/management/search_index_upsert.hxx>
 
-#include <fmt/core.h>
 #include <gsl/narrow>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <future>
 #include <memory>

data/ext/rcb_users.cxx

@@ -28,8 +28,8 @@
 #include <core/operations/management/user_get_all.hxx>
 #include <core/operations/management/user_upsert.hxx>
 
-#include <fmt/core.h>
-#include <fmt/ranges.h>
+#include <spdlog/fmt/bundled/core.h>
+#include <spdlog/fmt/bundled/ranges.h>
 
 #include <future>
 #include <memory>

data/ext/rcb_utils.hxx

@@ -21,6 +21,7 @@
 #include <couchbase/cas.hxx>
 #include <couchbase/durability_level.hxx>
 #include <couchbase/persist_to.hxx>
+#include <couchbase/read_preference.hxx>
 #include <couchbase/replicate_to.hxx>
 #include <couchbase/store_semantics.hxx>
 
@@ -128,6 +129,37 @@ cb_extract_timeout(Request& req, VALUE options)
   }
 }
 
+template<typename Request>
+inline void
+cb_extract_read_preference(Request& req, VALUE options)
+{
+  static VALUE property_name = rb_id2sym(rb_intern("read_preference"));
+  if (!NIL_P(options)) {
+    if (TYPE(options) != T_HASH) {
+      throw ruby_exception(rb_eArgError,
+                           rb_sprintf("expected options to be Hash, given %+" PRIsVALUE, options));
+    }
+
+    VALUE val = rb_hash_aref(options, property_name);
+    if (NIL_P(val)) {
+      return;
+    }
+    if (TYPE(val) != T_SYMBOL) {
+      throw ruby_exception(
+        rb_eArgError, rb_sprintf("read_preference must be a Symbol, but given %+" PRIsVALUE, val));
+    }
+
+    if (ID mode = rb_sym2id(val); mode == rb_intern("no_preference")) {
+      req.read_preference = couchbase::read_preference::no_preference;
+    } else if (mode == rb_intern("selected_server_group")) {
+      req.read_preference = couchbase::read_preference::selected_server_group;
+    } else {
+      throw ruby_exception(rb_eArgError,
+                           rb_sprintf("unexpected read_preference, given %+" PRIsVALUE, val));
+    }
+  }
+}
+
 template<typename Field>
 inline void
 cb_extract_duration(Field& field, VALUE options, const char* name)

data/lib/couchbase/logger.rb

@@ -46,7 +46,7 @@ module Couchbase
 
   # Return logger associated with the library
   def self.logger
-    @logger # rubocop:disable ThreadSafety/InstanceVariableInClassMethod
+    @logger # rubocop:disable ThreadSafety/ClassInstanceVariable
   end
 
   # Associate logger with the library
@@ -67,8 +67,8 @@ module Couchbase
   #
   # @since 3.4.0
   def self.set_logger(logger, adapter_class: nil, verbose: false, level: :info)
-    @logger = logger # rubocop:disable ThreadSafety/InstanceVariableInClassMethod
-    if @logger.nil? # rubocop:disable ThreadSafety/InstanceVariableInClassMethod
+    @logger = logger # rubocop:disable ThreadSafety/ClassInstanceVariable
+    if @logger.nil? # rubocop:disable ThreadSafety/ClassInstanceVariable
       Backend.install_logger_shim(nil)
       return
     end

data/lib/couchbase/options.rb

@@ -237,10 +237,14 @@ module Couchbase
     # Options for {Collection#get_all_replicas}
     class GetAllReplicas < Base
       attr_accessor :transcoder # @return [JsonTranscoder, #decode(String, Integer)]
+      attr_accessor :read_preference # @return [Symbol]
 
       # Creates an instance of options for {Collection#get_all_replicas}
       #
       # @param [JsonTranscoder, #decode(String, Integer)] transcoder used for decoding
+      # @param [Symbol] read_preference decides how the replica nodes will be selected.
+      #  +:no_preference+:: no preference and will select any available replica. This is the default
+      #  +:selected_server_group+:: restrict to nodes in {Cluster#preferred_server_group}
       #
       # @param [Integer, #in_milliseconds, nil] timeout
       # @param [Proc, nil] retry_strategy the custom retry strategy, if set
@@ -249,12 +253,14 @@ module Couchbase
       #
       # @yieldparam [GetAllReplicas] self
       def initialize(transcoder: JsonTranscoder.new,
+                     read_preference: :no_preference,
                      timeout: nil,
                      retry_strategy: nil,
                      client_context: nil,
                      parent_span: nil)
         super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
         @transcoder = transcoder
+        @read_preference = read_preference
         yield self if block_given?
       end
 
@@ -262,6 +268,7 @@ module Couchbase
       def to_backend
         {
           timeout: Utils::Time.extract_duration(@timeout),
+          read_preference: @read_preference,
         }
       end
 
@@ -272,10 +279,14 @@ module Couchbase
     # Options for {Collection#get_any_replica}
     class GetAnyReplica < Base
       attr_accessor :transcoder # @return [JsonTranscoder, #decode(String, Integer)]
+      attr_accessor :read_preference # @return [Symbol]
 
       # Creates an instance of options for {Collection#get_any_replica}
       #
       # @param [JsonTranscoder, #decode(String, Integer)] transcoder used for decoding
+      # @param [Symbol] read_preference decides how the replica nodes will be selected.
+      #  +:no_preference+:: no preference and will select any available replica. This is the default
+      #  +:selected_server_group+:: restrict to nodes in {Cluster#preferred_server_group}
       #
       # @param [Integer, #in_milliseconds, nil] timeout
       # @param [Proc, nil] retry_strategy the custom retry strategy, if set
@@ -284,12 +295,14 @@ module Couchbase
       #
       # @yieldparam [GetAnyReplica] self
       def initialize(transcoder: JsonTranscoder.new,
+                     read_preference: :no_preference,
                      timeout: nil,
                      retry_strategy: nil,
                      client_context: nil,
                      parent_span: nil)
         super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
         @transcoder = transcoder
+        @read_preference = read_preference
         yield self if block_given?
       end
 
@@ -297,6 +310,7 @@ module Couchbase
       def to_backend
         {
           timeout: Utils::Time.extract_duration(@timeout),
+          read_preference: @read_preference,
         }
       end
 
@@ -1032,10 +1046,14 @@ module Couchbase
     # Options for {Collection#lookup_in_any_replica}
     class LookupInAnyReplica < Base
       attr_accessor :transcoder # @return [JsonTranscoder, #decode(String)]
+      attr_accessor :read_preference # @return [Symbol]
 
       # Creates an instance of options for {Collection#lookup_in_any_replica}
       #
       # @param [JsonTranscoder, #decode(String)] transcoder used for encoding
+      # @param [Symbol] read_preference decides how the replica nodes will be selected.
+      #  +:no_preference+:: no preference and will select any available replica. This is the default
+      #  +:selected_server_group+:: restrict to nodes in {Cluster#preferred_server_group}
       #
       # @param [Integer, #in_milliseconds, nil] timeout
       # @param [Proc, nil] retry_strategy the custom retry strategy, if set
@@ -1044,12 +1062,14 @@ module Couchbase
       #
       # @yieldparam [LookupIn] self
       def initialize(transcoder: JsonTranscoder.new,
+                     read_preference: :no_preference,
                      timeout: nil,
                      retry_strategy: nil,
                      client_context: nil,
                      parent_span: nil)
         super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
         @transcoder = transcoder
+        @read_preference = read_preference
         yield self if block_given?
       end
 
@@ -1057,6 +1077,7 @@ module Couchbase
       def to_backend
         {
           timeout: Utils::Time.extract_duration(@timeout),
+          read_preference: @read_preference,
         }
       end
 
@@ -1071,10 +1092,14 @@ module Couchbase
     # Options for {Collection#lookup_in_all_replicas}
     class LookupInAllReplicas < Base
       attr_accessor :transcoder # @return [JsonTranscoder, #decode(String)]
+      attr_accessor :read_preference # @return [Symbol]
 
       # Creates an instance of options for {Collection#lookup_in_all_replicas}
       #
       # @param [JsonTranscoder, #decode(String)] transcoder used for encoding
+      # @param [Symbol] read_preference decides how the replica nodes will be selected.
+      #  +:no_preference+:: no preference and will select any available replica. This is the default
+      #  +:selected_server_group+:: restrict to nodes in {Cluster#preferred_server_group}
       #
       # @param [Integer, #in_milliseconds, nil] timeout
       # @param [Proc, nil] retry_strategy the custom retry strategy, if set
@@ -1083,12 +1108,14 @@ module Couchbase
       #
       # @yieldparam [LookupInAllReplicas] self
       def initialize(transcoder: JsonTranscoder.new,
+                     read_preference: :no_preference,
                      timeout: nil,
                      retry_strategy: nil,
                      client_context: nil,
                      parent_span: nil)
         super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
         @transcoder = transcoder
+        @read_preference = read_preference
         yield self if block_given?
       end
 
@@ -1096,6 +1123,7 @@ module Couchbase
       def to_backend
         {
           timeout: Utils::Time.extract_duration(@timeout),
+          read_preference: @read_preference,
         }
       end
 
@@ -1646,6 +1674,8 @@ module Couchbase
     class Cluster
       attr_accessor :authenticator # @return [PasswordAuthenticator, CertificateAuthenticator]
 
+      attr_accessor :preferred_server_group # @return [String]
+
       attr_accessor :enable_metrics # @return [Boolean]
       attr_accessor :metrics_emit_interval # @return [nil, Integer, #in_milliseconds]
       attr_accessor :enable_tracing # @return [Boolean]
@@ -1679,6 +1709,7 @@ module Couchbase
       # Creates an instance of options for {Couchbase::Cluster.connect}
       #
       # @param [PasswordAuthenticator, CertificateAuthenticator] authenticator
+      # @param [String] preferred_server_group the server group to use for replica APIs e.g. {Collection#get_all_replicas}
       # @param [nil, Integer, #in_milliseconds] key_value_timeout default timeout for Key/Value operations, e.g. {Collection#get}
       # @param [nil, Integer, #in_milliseconds] view_timeout default timeout for View query
       # @param [nil, Integer, #in_milliseconds] query_timeout default timeout for N1QL query
@@ -1690,6 +1721,7 @@ module Couchbase
       #
       # @yieldparam [Cluster] self
       def initialize(authenticator: nil,
+                     preferred_server_group: nil,
                      enable_metrics: nil,
                      metrics_emit_interval: nil,
                      enable_tracing: nil,
@@ -1719,6 +1751,7 @@ module Couchbase
                      config_idle_redial_timeout: nil,
                      idle_http_connection_timeout: nil)
         @authenticator = authenticator
+        @preferred_server_group = preferred_server_group
         @enable_metrics = enable_metrics
         @metrics_emit_interval = metrics_emit_interval
         @enable_tracing = enable_tracing
@@ -1765,6 +1798,7 @@ module Couchbase
       def to_backend
         {
           enable_metrics: @enable_metrics,
+          preferred_server_group: @preferred_server_group,
           metrics_emit_interval: Utils::Time.extract_duration(@metrics_emit_interval),
           enable_tracing: @enable_tracing,
           orphaned_emit_interval: Utils::Time.extract_duration(@orphaned_emit_interval),
@@ -2841,6 +2875,20 @@ module Couchbase
       Scan.new(**args)
     end
 
+    # Construct {LookupInAnyReplica} options for {Collection#lookup_in_any_replica}
+    #
+    # @return [LookupInAnyReplica]
+    def LookupInAnyReplica(**args)
+      LookupInAnyReplica.new(**args)
+    end
+
+    # Construct {LookupInAllReplics} options for {Collection#lookup_in_all_replicas}
+    #
+    # @return [LookupInAllReplicas]
+    def LookupInAllReplicas(**args)
+      LookupInAllReplicas.new(**args)
+    end
+
     # rubocop:enable Naming/MethodName
   end
 end

data/lib/couchbase/version.rb

@@ -21,5 +21,5 @@ module Couchbase
   #   $ ruby -rcouchbase -e 'pp Couchbase::VERSION'
   #   {:sdk=>"3.4.0", :ruby_abi=>"3.1.0", :revision=>"416fe68e6029ec8a4c40611cf6e6b30d3b90d20f"}
   VERSION = {} unless defined?(VERSION) # rubocop:disable Style/MutableConstant
-  VERSION.update(:sdk => "3.5.4")
+  VERSION.update(:sdk => "3.5.5")
 end