couchbase 4.4.2 → 4.4.3

package/CMakeLists.txt

@@ -194,6 +194,7 @@ set(COUCHBASE_CXX_SOURCE_DIR "${PROJECT_SOURCE_DIR}/deps/couchbase-cxx-client")
 if(CMAKE_JS_VERSION VERSION_GREATER_EQUAL "7.0.0")
   target_include_directories(${PROJECT_NAME}
     PRIVATE ${NODEJS_INC_DIR}
+            "${COUCHBASE_CXX_BINARY_DIR}/generated"
             "${COUCHBASE_CXX_SOURCE_DIR}"
             "${COUCHBASE_CXX_SOURCE_DIR}/third_party/cxx_function"
             "${COUCHBASE_CXX_SOURCE_DIR}/third_party/expected/include")
@@ -208,6 +209,7 @@ else()
   target_include_directories(${PROJECT_NAME}
     PRIVATE ${NODEJS_INC_DIR}
             ${NODE_ADDON_API_DIR}
+            "${COUCHBASE_CXX_BINARY_DIR}/generated"
             "${COUCHBASE_CXX_SOURCE_DIR}"
             "${COUCHBASE_CXX_SOURCE_DIR}/third_party/cxx_function"
             "${COUCHBASE_CXX_SOURCE_DIR}/third_party/expected/include")

package/deps/couchbase-cxx-client/CMakeLists.txt

@@ -21,7 +21,7 @@ endif()
 
 project(
   couchbase_cxx_client
-  VERSION "1.0.2"
+  VERSION "1.0.3"
   LANGUAGES CXX C)
 message(STATUS "Couchbase C++ client ${couchbase_cxx_client_VERSION} build ${couchbase_cxx_client_BUILD_NUMBER}, master: ${COUCHBASE_CXX_CLIENT_MASTER_PROJECT}")
 message(STATUS "System: ${CMAKE_SYSTEM_NAME}, ${CMAKE_SYSTEM_VERSION}, ${CMAKE_SYSTEM_PROCESSOR}")
@@ -76,19 +76,6 @@ include(cmake/OpenSSL.cmake)
 
 include(cmake/VersionInfo.cmake)
 
-include(cmake/DetectStandardFilesystem.cmake)
-couchbase_cxx_check_filesystem(
-  couchbase_cxx_client
-  "filesystem"
-  "std::filesystem"
-  "stdc++fs;c++fs"
-  STD_FILESYSTEM)
-if(STD_FILESYSTEM)
-  message(STATUS "Using std::filesystem")
-else()
-  message(FATAL_ERROR "Couchbase C++ Client requires C++17, including an implementation of std::filesystem.")
-endif()
-
 add_subdirectory(core/platform)
 set(couchbase_cxx_client_FILES
     ${CMAKE_CURRENT_BINARY_DIR}/generated/mozilla_ca_bundle.cxx
@@ -242,6 +229,7 @@ set(couchbase_cxx_client_FILES
     core/io/mcbp_message.cxx
     core/io/mcbp_parser.cxx
     core/io/mcbp_session.cxx
+    core/io/streams.cxx
     core/key_value_config.cxx
     core/logger/custom_rotating_file_sink.cxx
     core/logger/logger.cxx
@@ -260,6 +248,7 @@ set(couchbase_cxx_client_FILES
     core/mcbp/server_duration.cxx
     core/meta/version.cxx
     core/metrics/logging_meter.cxx
+    core/metrics/meter_wrapper.cxx
     core/n1ql_query_options.cxx
     core/operations/document_analytics.cxx
     core/operations/document_append.cxx
@@ -412,6 +401,7 @@ set(couchbase_cxx_client_FILES
     core/seed_config.cxx
     core/topology/configuration.cxx
     core/tracing/threshold_logging_tracer.cxx
+    core/tracing/tracer_wrapper.cxx
     core/transactions/active_transaction_record.cxx
     core/transactions/async_attempt_context.cxx
     core/transactions/atr_cleanup_entry.cxx
@@ -492,6 +482,19 @@ if(WIN32 OR NOT COUCHBASE_CXX_CLIENT_BUILD_SHARED)
 endif()
 
 foreach(TARGET ${couchbase_cxx_client_LIBRARIES})
+  include(cmake/DetectStandardFilesystem.cmake)
+  couchbase_cxx_check_filesystem(
+    ${TARGET}
+    "filesystem"
+    "std::filesystem"
+    "stdc++fs;c++fs"
+    STD_FILESYSTEM)
+  if(STD_FILESYSTEM)
+    message(STATUS "Using std::filesystem")
+  else()
+    message(FATAL_ERROR "Couchbase C++ Client requires C++17, including an implementation of std::filesystem.")
+  endif()
+
   set_target_properties(${TARGET} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
   target_include_directories(

package/deps/couchbase-cxx-client/README.md

@@ -21,9 +21,9 @@ CPMAddPackage(
   NAME
   couchbase_cxx_client
   GIT_TAG
-  1.0.2
+  1.0.3
   VERSION
-  1.0.2
+  1.0.3
   GITHUB_REPOSITORY
   "couchbase/couchbase-cxx-client"
   OPTIONS

package/deps/couchbase-cxx-client/cmake/Packaging.cmake

@@ -62,6 +62,7 @@ set(CPM_USE_LOCAL_PACKAGES OFF CACHE BOOL \"\" FORCE)
 set(CPM_SOURCE_CACHE \"\${PROJECT_SOURCE_DIR}/third_party_cache\" CACHE STRING \"\" FORCE)
 set(COUCHBASE_CXX_CLIENT_GIT_REVISION \"${COUCHBASE_CXX_CLIENT_GIT_REVISION}\")
 set(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE \"${COUCHBASE_CXX_CLIENT_GIT_DESCRIBE}\")
+set(COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP \"${COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP}\")
 set(COUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE_ROOT \"\${PROJECT_SOURCE_DIR}/third_party_cache\" CACHE STRING \"\" FORCE)
 message(STATUS \"Building from Tarball: ${COUCHBASE_CXX_CLIENT_TARBALL_NAME}.tar.gz\")
 ")
@@ -132,8 +133,11 @@ if(COUCHBASE_CXX_CLIENT_RPM_TARGETS)
   add_custom_target(packaging_srpm DEPENDS ${COUCHBASE_CXX_CLIENT_SRPM})
 
   list(APPEND COUCHBASE_CXX_CLIENT_SUPPORTED_ROOTS
+    "opensuse-leap-15.5-${CMAKE_SYSTEM_PROCESSOR}"
     "rocky-9-${CMAKE_SYSTEM_PROCESSOR}"
+    "rocky-8-${CMAKE_SYSTEM_PROCESSOR}"
     "amazonlinux-2023-${CMAKE_SYSTEM_PROCESSOR}"
+    "fedora-40-${CMAKE_SYSTEM_PROCESSOR}"
   )
 
   message(STATUS "Supported build roots for RPM packages: ${COUCHBASE_CXX_CLIENT_SUPPORTED_ROOTS}")

package/deps/couchbase-cxx-client/cmake/Testing.cmake

@@ -15,7 +15,7 @@ if(COUCHBASE_CXX_CLIENT_ENABLE_VALGRIND)
   if(VALGRIND)
     set(VALGRIND_COMMAND "${VALGRIND}")
     set(VALGRIND_COMMAND_OPTIONS
-        "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe"
+        "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe --suppressions=${PROJECT_SOURCE_DIR}/.valgrind_suppressions.txt"
     )
     set(MEMORYCHECK_COMMAND "${VALGRIND}")
     set(MEMORYCHECK_COMMAND_OPTIONS "${VALGRIND_COMMAND_OPTIONS}")

package/deps/couchbase-cxx-client/cmake/VersionInfo.cmake

@@ -24,8 +24,30 @@ if(NOT COUCHBASE_CXX_CLIENT_GIT_DESCRIBE)
   endif()
 endif()
 
-string(TIMESTAMP COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP "%Y-%m-%dT%H:%M:%S" UTC)
-string(TIMESTAMP COUCHBASE_CXX_CLIENT_BUILD_DATE "%Y-%m-%d" UTC)
+if(NOT COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP)
+  if(GIT)
+    execute_process(
+      COMMAND git describe --tags --abbrev=0 HEAD
+      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+      RESULT_VARIABLE tag_result
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      OUTPUT_VARIABLE last_tag)
+
+    if (tag_result EQUAL 0)
+      execute_process(
+        COMMAND git log --max-count=1 --no-patch --format=%cd --date=format:%Y-%m-%dT%H:%M:%S ${last_tag}
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        OUTPUT_VARIABLE COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP)
+    endif()
+  endif()
+
+  if (NOT COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP)
+    string(TIMESTAMP COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP "%Y-%m-%dT%H:%M:%S" UTC)
+  endif()
+endif()
+
+string(REGEX REPLACE "T.*" "" COUCHBASE_CXX_CLIENT_BUILD_DATE "${COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP}")
 
 # set(couchbase_cxx_client_BUILD_NUMBER 142)
 # set(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE "1.0.0-beta.4-27-g6807da0") #-> "couchbase_cxx_client-1.0.0-beta.4+142.27.6807da0"

package/deps/couchbase-cxx-client/cmake/couchbase-cxx-client.spec.in

@@ -1,3 +1,9 @@
+%if 0%{?suse_version}
+%global license_dir %{_datadir}/doc
+%else
+%global license_dir %{_docdir}
+%endif
+
 Name: couchbase-cxx-client
 Summary: Couchbase C++ SDK
 Version: @COUCHBASE_CXX_CLIENT_PACKAGE_VERSION@
@@ -6,10 +12,20 @@ Vendor: Couchbase, Inc.
 Packager: Couchbase SDK Team <support@couchbase.com>
 License: ASL 2.0
 URL: https://docs.couchbase.com/cxx-sdk/current/hello-world/overview.html
+%if 0%{?suse_version} == 1500
+BuildRequires: gcc13, gcc13-c++
+%else
 BuildRequires: gcc, gcc-c++
+%endif
 BuildRequires: cmake >= 3.19
 Source0: @COUCHBASE_CXX_CLIENT_TARBALL_NAME@.tar.gz
 
+%if 0%{?amzn}
+# The additional linker flags break AmazonLinux
+# https://bugzilla.redhat.com/show_bug.cgi?id=2043092
+%undefine _package_note_flags
+%endif
+
 %description
 This is the client and protocol library for Couchbase project.
 
@@ -28,6 +44,13 @@ Development files for the Couchbase C++ SDK.
 %prep
 %autosetup -p1 -n@COUCHBASE_CXX_CLIENT_TARBALL_NAME@
 %cmake \
+%if 0%{?rhel} == 8 || 0%{?rocky} == 8 || 0%{?ol} == 8
+    -S "." -B "redhat-linux-build" \
+%endif
+%if 0%{?suse_version} == 1500
+    -DCMAKE_C_COMPILER=gcc-13 \
+    -DCMAKE_CXX_COMPILER=g++-13 \
+%endif
     -DBUILD_SHARED_LIBS=OFF \
     -DCOUCHBASE_CXX_CLIENT_INSTALL=ON \
     -DCOUCHBASE_CXX_CLIENT_STATIC_BORINGSSL=ON \
@@ -38,15 +61,32 @@ Development files for the Couchbase C++ SDK.
     -DCOUCHBASE_CXX_CLIENT_BUILD_SHARED=ON
 
 %build
+%if 0%{?rhel} == 8 || 0%{?rocky} == 8 || 0%{?ol} == 8
+/usr/bin/cmake --build "redhat-linux-build" -j${RPM_BUILD_NCPUS} --verbose
+%else
+%if 0%{?suse_version} == 1500
+cd build
+%endif
 %cmake_build
+%endif
 
 %install
+%if 0%{?rhel} == 8 || 0%{?rocky} == 8 || 0%{?ol} == 8
+DESTDIR="%{buildroot}" /usr/bin/cmake --install "redhat-linux-build"
+%else
 %cmake_install
+%endif
+%if 0%{?suse_version} == 1500
+%{__mkdir_p} %{buildroot}%{license_dir}/tao/json %{buildroot}%{_libdir}/cmake
+%{__mv} %{buildroot}%{license_dir}/taocpp-json/tao/json/LICENSE %{buildroot}%{license_dir}/tao/json/LICENSE
+%{__mv} %{buildroot}%{_datadir}/taocpp-json/cmake %{buildroot}%{_libdir}/cmake/taocpp-json
+%{__mv} %{buildroot}%{_datadir}/pegtl/cmake %{buildroot}%{_libdir}/cmake/pegtl
+%endif
 
 %files
-%license %{_docdir}/couchbase_cxx_client/LICENSE.txt
-%license %{_docdir}/tao/pegtl/LICENSE
-%license %{_docdir}/tao/json/LICENSE
+%license %{license_dir}/couchbase_cxx_client/LICENSE.txt
+%license %{license_dir}/tao/pegtl/LICENSE
+%license %{license_dir}/tao/json/LICENSE
 %{_libdir}/libcouchbase_cxx_client.so.*
 
 %files tools
@@ -62,4 +102,3 @@ Development files for the Couchbase C++ SDK.
 %changelog
 * @COUCHBASE_CXX_CLIENT_RPM_DATE@ Couchbase SDK Team <support@couchbase.com> - @COUCHBASE_CXX_CLIENT_PACKAGE_VERSION@-@COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE@
 - Automated build.
-%{_libdir}/libcouchbase_cxx_client_static.a

package/deps/couchbase-cxx-client/core/agent_group.cxx

@@ -132,7 +132,11 @@ public:
 
   auto free_form_http_request(const http_request& request,
                               free_form_http_request_callback&& callback)
+#ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+    -> tl::expected<std::shared_ptr<pending_operation>, error_union>
+#else
     -> tl::expected<std::shared_ptr<pending_operation>, std::error_code>
+#endif
   {
     return cluster_agent_.free_form_http_request(request, std::move(callback));
   }
@@ -221,7 +225,11 @@ agent_group::search_query(const search_query_options& options, search_query_call
 auto
 agent_group::free_form_http_request(const http_request& request,
                                     free_form_http_request_callback&& callback)
+#ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+  -> tl::expected<std::shared_ptr<pending_operation>, error_union>
+#else
   -> tl::expected<std::shared_ptr<pending_operation>, std::error_code>
+#endif
 {
   return impl_->free_form_http_request(request, std::move(callback));
 }

package/deps/couchbase-cxx-client/core/agent_group.hxx

@@ -70,7 +70,11 @@ public:
 
   auto free_form_http_request(const http_request& request,
                               free_form_http_request_callback&& callback)
+#ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+    -> tl::expected<std::shared_ptr<pending_operation>, error_union>;
+#else
     -> tl::expected<std::shared_ptr<pending_operation>, std::error_code>;
+#endif
 
   auto wait_until_ready(std::chrono::milliseconds timeout,
                         const wait_until_ready_options& options,

package/deps/couchbase-cxx-client/core/bucket.cxx

@@ -25,11 +25,13 @@
 #include "core/io/mcbp_message.hxx"
 #include "core/logger/logger.hxx"
 #include "core/mcbp/codec.hxx"
+#include "core/metrics/meter_wrapper.hxx"
 #include "core/protocol/client_opcode.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/hello_feature.hxx"
 #include "core/response_handler.hxx"
 #include "core/service_type.hxx"
+#include "core/tracing/tracer_wrapper.hxx"
 #include "core/utils/movable_function.hxx"
 #include "dispatcher.hxx"
 #include "impl/bootstrap_state_listener.hxx"
@@ -42,10 +44,8 @@
 #include "retry_orchestrator.hxx"
 
 #include <couchbase/error_codes.hxx>
-#include <couchbase/metrics/meter.hxx>
 #include <couchbase/retry_reason.hxx>
 #include <couchbase/retry_strategy.hxx>
-#include <couchbase/tracing/request_tracer.hxx>
 
 #include <asio/bind_executor.hpp>
 #include <asio/error.hpp>
@@ -82,8 +82,8 @@ public:
   bucket_impl(std::string client_id,
               std::string name,
               couchbase::core::origin origin,
-              std::shared_ptr<couchbase::tracing::request_tracer> tracer,
-              std::shared_ptr<couchbase::metrics::meter> meter,
+              std::shared_ptr<tracing::tracer_wrapper> tracer,
+              std::shared_ptr<metrics::meter_wrapper> meter,
               std::vector<protocol::hello_feature> known_features,
               std::shared_ptr<impl::bootstrap_state_listener> state_listener,
               asio::io_context& ctx,
@@ -114,15 +114,11 @@ public:
                         std::optional<key_value_error_map_info> error_info)
   {
     // TODO(SA): copy from mcbp_command, subject to refactor later
-    static const std::string meter_name = "db.couchbase.operations";
-    static const std::map<std::string, std::string> tags = {
-      { "db.couchbase.service", "kv" },
-      { "db.operation", fmt::format("{}", req->command_) },
+    metrics::metric_attributes attrs{
+      service_type::key_value, fmt::format("{}", req->command_), ec, name_, req->scope_name_,
+      req->collection_name_,
     };
-    meter_->get_value_recorder(meter_name, tags)
-      ->record_value(std::chrono::duration_cast<std::chrono::microseconds>(
-                       std::chrono::steady_clock::now() - req->dispatched_time_)
-                       .count());
+    meter_->record_value(std::move(attrs), req->dispatched_time_);
 
     if (ec == asio::error::operation_aborted) {
       // TODO(SA): fix tracing
@@ -894,12 +890,12 @@ public:
     return configured_;
   }
 
-  [[nodiscard]] auto tracer() const -> std::shared_ptr<couchbase::tracing::request_tracer>
+  [[nodiscard]] auto tracer() const -> std::shared_ptr<tracing::tracer_wrapper>
   {
     return tracer_;
   }
 
-  [[nodiscard]] auto meter() const -> std::shared_ptr<couchbase::metrics::meter>
+  [[nodiscard]] auto meter() const -> std::shared_ptr<metrics::meter_wrapper>
   {
     return meter_;
   }
@@ -952,8 +948,8 @@ private:
   const std::string name_;
   const std::string log_prefix_;
   const origin origin_;
-  const std::shared_ptr<couchbase::tracing::request_tracer> tracer_;
-  const std::shared_ptr<couchbase::metrics::meter> meter_;
+  const std::shared_ptr<tracing::tracer_wrapper> tracer_;
+  const std::shared_ptr<metrics::meter_wrapper> meter_;
   const std::vector<protocol::hello_feature> known_features_;
   const std::shared_ptr<impl::bootstrap_state_listener> state_listener_;
   mcbp::codec codec_;
@@ -985,8 +981,8 @@ private:
 bucket::bucket(std::string client_id,
                asio::io_context& ctx,
                asio::ssl::context& tls,
-               std::shared_ptr<couchbase::tracing::request_tracer> tracer,
-               std::shared_ptr<couchbase::metrics::meter> meter,
+               std::shared_ptr<tracing::tracer_wrapper> tracer,
+               std::shared_ptr<metrics::meter_wrapper> meter,
                std::string name,
                couchbase::core::origin origin,
                std::vector<protocol::hello_feature> known_features,
@@ -1054,13 +1050,13 @@ bucket::log_prefix() const -> const std::string&
 }
 
 auto
-bucket::tracer() const -> std::shared_ptr<couchbase::tracing::request_tracer>
+bucket::tracer() const -> std::shared_ptr<tracing::tracer_wrapper>
 {
   return impl_->tracer();
 }
 
 auto
-bucket::meter() const -> std::shared_ptr<couchbase::metrics::meter>
+bucket::meter() const -> std::shared_ptr<metrics::meter_wrapper>
 {
   return impl_->meter();
 }

package/deps/couchbase-cxx-client/core/bucket.hxx

@@ -33,14 +33,6 @@
 
 namespace couchbase
 {
-namespace metrics
-{
-class meter;
-} // namespace metrics
-namespace tracing
-{
-class request_tracer;
-} // namespace tracing
 namespace core
 {
 namespace mcbp
@@ -52,6 +44,14 @@ namespace diag
 class ping_collector;
 struct diagnostics_result;
 } // namespace diag
+namespace tracing
+{
+class tracer_wrapper;
+} // namespace tracing
+namespace metrics
+{
+class meter_wrapper;
+} // namespace metrics
 namespace impl
 {
 class bootstrap_state_listener;
@@ -68,8 +68,8 @@ public:
   bucket(std::string client_id,
          asio::io_context& ctx,
          asio::ssl::context& tls,
-         std::shared_ptr<couchbase::tracing::request_tracer> tracer,
-         std::shared_ptr<couchbase::metrics::meter> meter,
+         std::shared_ptr<tracing::tracer_wrapper> tracer,
+         std::shared_ptr<metrics::meter_wrapper> meter,
          std::string name,
          couchbase::core::origin origin,
          std::vector<protocol::hello_feature> known_features,
@@ -200,8 +200,8 @@ public:
 
   [[nodiscard]] auto name() const -> const std::string&;
   [[nodiscard]] auto log_prefix() const -> const std::string&;
-  [[nodiscard]] auto tracer() const -> std::shared_ptr<couchbase::tracing::request_tracer>;
-  [[nodiscard]] auto meter() const -> std::shared_ptr<couchbase::metrics::meter>;
+  [[nodiscard]] auto tracer() const -> std::shared_ptr<tracing::tracer_wrapper>;
+  [[nodiscard]] auto meter() const -> std::shared_ptr<metrics::meter_wrapper>;
   [[nodiscard]] auto default_retry_strategy() const -> std::shared_ptr<couchbase::retry_strategy>;
   [[nodiscard]] auto is_closed() const -> bool;
   [[nodiscard]] auto is_configured() const -> bool;

package/deps/couchbase-cxx-client/core/cluster.cxx

@@ -39,6 +39,7 @@
 #include "core/mcbp/queue_request.hxx"
 #include "core/meta/version.hxx"
 #include "core/metrics/logging_meter.hxx"
+#include "core/metrics/meter_wrapper.hxx"
 #include "core/metrics/noop_meter.hxx"
 #include "core/operations/document_analytics.hxx"
 #include "core/operations/document_append.hxx"
@@ -145,6 +146,7 @@
 #include "core/topology/capabilities.hxx"
 #include "core/tracing/noop_tracer.hxx"
 #include "core/tracing/threshold_logging_tracer.hxx"
+#include "core/tracing/tracer_wrapper.hxx"
 #include "core/utils/join_strings.hxx"
 #include "core/utils/movable_function.hxx"
 #include "crud_component.hxx"
@@ -352,30 +354,7 @@ public:
                  id_,
                  couchbase::core::meta::sdk_semver(),
                  origin_.to_json());
-    // ignore the enable_tracing flag if a tracer was passed in
-    if (nullptr != origin_.options().tracer) {
-      tracer_ = origin_.options().tracer;
-    } else {
-      if (origin_.options().enable_tracing) {
-        tracer_ = std::make_shared<tracing::threshold_logging_tracer>(
-          ctx_, origin_.options().tracing_options);
-      } else {
-        tracer_ = std::make_shared<tracing::noop_tracer>();
-      }
-    }
-    tracer_->start();
-    // ignore the metrics options if a meter was passed in.
-    if (nullptr != origin_.options().meter) {
-      meter_ = origin_.options().meter;
-    } else {
-      if (origin_.options().enable_metrics) {
-        meter_ = std::make_shared<metrics::logging_meter>(ctx_, origin_.options().metrics_options);
-      } else {
-        meter_ = std::make_shared<metrics::noop_meter>();
-      }
-    }
-    meter_->start();
-    session_manager_->set_tracer(tracer_);
+    setup_observability();
     if (origin_.options().enable_dns_srv) {
       std::string hostname;
       std::string port;
@@ -433,30 +412,7 @@ public:
                  id_,
                  couchbase::core::meta::sdk_semver(),
                  origin_.to_json());
-    // ignore the enable_tracing flag if a tracer was passed in
-    if (nullptr != origin_.options().tracer) {
-      tracer_ = origin_.options().tracer;
-    } else {
-      if (origin_.options().enable_tracing) {
-        tracer_ = std::make_shared<tracing::threshold_logging_tracer>(
-          ctx_, origin_.options().tracing_options);
-      } else {
-        tracer_ = std::make_shared<tracing::noop_tracer>();
-      }
-    }
-    tracer_->start();
-    // ignore the metrics options if a meter was passed in.
-    if (nullptr != origin_.options().meter) {
-      meter_ = origin_.options().meter;
-    } else {
-      if (origin_.options().enable_metrics) {
-        meter_ = std::make_shared<metrics::logging_meter>(ctx_, origin_.options().metrics_options);
-      } else {
-        meter_ = std::make_shared<metrics::noop_meter>();
-      }
-    }
-    meter_->start();
-    session_manager_->set_tracer(tracer_);
+    setup_observability();
     session_manager_->set_dispatch_timeout(origin_.options().dispatch_timeout);
     // at this point we will infinitely try to connect
     if (origin_.options().enable_dns_srv) {
@@ -493,6 +449,10 @@ public:
         b = std::make_shared<bucket>(
           id_, ctx_, tls_, tracer_, meter_, bucket_name, origin, known_features, dns_srv_tracker_);
         buckets_.try_emplace(bucket_name, b);
+
+        // Register the tracer & the meter for config updates to track Cluster name & UUID
+        b->on_configuration_update(tracer_);
+        b->on_configuration_update(meter_);
       }
     }
     if (b == nullptr) {
@@ -1092,7 +1052,7 @@ public:
             if (cluster->session_) {
               cluster->session_->ping(collector->build_reporter(), timeout);
             }
-            cluster->for_each_bucket([&collector, &timeout](auto bucket) {
+            cluster->for_each_bucket([&collector, &timeout](const auto& bucket) {
               bucket->ping(collector, timeout);
             });
           }
@@ -1145,7 +1105,7 @@ public:
         }
         self->retry_backoff_.cancel();
 #endif
-        self->for_each_bucket([](auto bucket) {
+        self->for_each_bucket([](const auto& bucket) {
           bucket->close();
         });
         self->session_manager_->close();
@@ -1221,6 +1181,38 @@ public:
   }
 
 private:
+  void setup_observability()
+  {
+    // ignore the enable_tracing flag if a tracer was passed in
+    if (nullptr != origin_.options().tracer) {
+      tracer_ = tracing::tracer_wrapper::create(origin_.options().tracer);
+    } else {
+      if (origin_.options().enable_tracing) {
+        tracer_ =
+          tracing::tracer_wrapper::create(std::make_shared<tracing::threshold_logging_tracer>(
+            ctx_, origin_.options().tracing_options));
+      } else {
+        tracer_ = tracing::tracer_wrapper::create(std::make_shared<tracing::noop_tracer>());
+      }
+    }
+    tracer_->start();
+    // ignore the metrics options if a meter was passed in.
+    if (nullptr != origin_.options().meter) {
+      meter_ = metrics::meter_wrapper::create(origin_.options().meter);
+    } else {
+      if (origin_.options().enable_metrics) {
+        meter_ = metrics::meter_wrapper::create(
+          std::make_shared<metrics::logging_meter>(ctx_, origin_.options().metrics_options));
+      } else {
+        meter_ = metrics::meter_wrapper::create(std::make_shared<metrics::noop_meter>());
+      }
+    }
+    meter_->start();
+
+    session_manager_->set_tracer(tracer_);
+    session_manager_->set_meter(meter_);
+  }
+
   std::string id_{ uuid::to_string(uuid::random()) };
   asio::io_context& ctx_;
   asio::executor_work_guard<asio::io_context::executor_type> work_;
@@ -1231,8 +1223,8 @@ private:
   std::mutex buckets_mutex_{};
   std::map<std::string, std::shared_ptr<bucket>> buckets_{};
   couchbase::core::origin origin_{};
-  std::shared_ptr<couchbase::tracing::request_tracer> tracer_{ nullptr };
-  std::shared_ptr<couchbase::metrics::meter> meter_{ nullptr };
+  std::shared_ptr<tracing::tracer_wrapper> tracer_{ nullptr };
+  std::shared_ptr<metrics::meter_wrapper> meter_{ nullptr };
   std::atomic_bool stopped_{ false };
 #ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
   std::shared_ptr<couchbase::core::io::cluster_config_tracker> config_tracker_{};

package/deps/couchbase-cxx-client/core/cluster_agent.cxx

@@ -42,7 +42,11 @@ public:
 
   auto free_form_http_request(const http_request& request,
                               free_form_http_request_callback&& callback)
+#ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+    -> tl::expected<std::shared_ptr<pending_operation>, error_union>
+#else
     -> tl::expected<std::shared_ptr<pending_operation>, std::error_code>
+#endif
   {
     return http_.do_http_request(request, std::move(callback));
   }
@@ -61,7 +65,11 @@ cluster_agent::cluster_agent(asio::io_context& io, cluster_agent_config config)
 auto
 cluster_agent::free_form_http_request(const couchbase::core::http_request& request,
                                       couchbase::core::free_form_http_request_callback&& callback)
+#ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+  -> tl::expected<std::shared_ptr<pending_operation>, error_union>
+#else
   -> tl::expected<std::shared_ptr<pending_operation>, std::error_code>
+#endif
 {
   return impl_->free_form_http_request(request, std::move(callback));
 }

package/deps/couchbase-cxx-client/core/cluster_agent.hxx

@@ -40,7 +40,11 @@ public:
 
   auto free_form_http_request(const http_request& request,
                               free_form_http_request_callback&& callback)
+#ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+    -> tl::expected<std::shared_ptr<pending_operation>, error_union>;
+#else
     -> tl::expected<std::shared_ptr<pending_operation>, std::error_code>;
+#endif
 
 private:
   std::shared_ptr<cluster_agent_impl> impl_;

package/deps/couchbase-cxx-client/core/collections_component.cxx

@@ -430,7 +430,7 @@ collection_id_cache_entry_impl::refresh_collection_id(
         self->manager_.lock()->remove(req->scope_name_, req->collection_name_);
         auto queue = self->swap_queue();
         queue->close();
-        return queue->drain([ec](auto r) {
+        return queue->drain([ec](const auto& r) {
           r->try_callback({}, ec);
         });
       }
@@ -443,7 +443,7 @@ collection_id_cache_entry_impl::refresh_collection_id(
                    res.collection_id);
       auto queue = self->swap_queue();
       queue->close();
-      return queue->drain([self](auto r) {
+      return queue->drain([self](const auto& r) {
         if (auto ec = self->assign_collection_id(r); ec) {
           CB_LOG_DEBUG("failed to set collection ID \"{}.{}\" on request (OP={}): {}",
                        r->scope_name_,