couchbase 4.4.3 → 4.4.5

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

@@ -15,7 +15,7 @@
 
 #include "agent_config.hxx"
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <string>
 

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

@@ -15,7 +15,7 @@
 
 #include "agent_group_config.hxx"
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <string>
 

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

@@ -52,8 +52,8 @@
 #include <asio/io_context.hpp>
 #include <asio/post.hpp>
 #include <asio/ssl/context.hpp>
-#include <fmt/format.h>
 #include <gsl/span>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <algorithm>
 #include <chrono>
@@ -225,8 +225,8 @@ public:
     return {};
   }
 
-  auto direct_re_queue(const std::shared_ptr<mcbp::queue_request>& req,
-                       bool is_retry) -> std::error_code
+  auto direct_re_queue(const std::shared_ptr<mcbp::queue_request>& req, bool is_retry)
+    -> std::error_code
   {
     auto handle_error = [is_retry, req](std::error_code ec) {
       // We only want to log an error on retries if the error isn't cancelled.
@@ -281,8 +281,8 @@ public:
     return {};
   }
 
-  auto backoff_and_retry(const std::shared_ptr<mcbp::queue_request>& request,
-                         retry_reason reason) -> bool
+  auto backoff_and_retry(const std::shared_ptr<mcbp::queue_request>& request, retry_reason reason)
+    -> bool
   {
     auto action = retry_orchestrator::should_retry(request, reason);
     auto retried = action.need_to_retry();
@@ -314,8 +314,8 @@ public:
     return {};
   }
 
-  [[nodiscard]] auto server_by_vbucket(std::uint16_t vbucket,
-                                       std::size_t node_index) -> std::optional<std::size_t>
+  [[nodiscard]] auto server_by_vbucket(std::uint16_t vbucket, std::size_t node_index)
+    -> std::optional<std::size_t>
   {
     const std::scoped_lock lock(config_mutex_);
     if (config_) {
@@ -1141,8 +1141,8 @@ bucket::direct_dispatch(std::shared_ptr<mcbp::queue_request> req) -> std::error_
 }
 
 auto
-bucket::direct_re_queue(const std::shared_ptr<mcbp::queue_request>& req,
-                        bool is_retry) -> std::error_code
+bucket::direct_re_queue(const std::shared_ptr<mcbp::queue_request>& req, bool is_retry)
+  -> std::error_code
 {
   return impl_->direct_re_queue(req, is_retry);
 }

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

@@ -164,12 +164,10 @@
 #include <asio/executor_work_guard.hpp>
 #include <asio/post.hpp>
 #include <asio/ssl/verify_mode.hpp>
-#include <fmt/core.h>
 
 #include <atomic>
 #include <chrono>
 #include <cstring>
-#include <fmt/format.h>
 #include <map>
 #include <memory>
 #include <mutex>

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

@@ -15,7 +15,7 @@
 
 #include "cluster_agent_config.hxx"
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <string>
 

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

@@ -42,7 +42,7 @@
 #include <asio/error.hpp>
 #include <asio/io_context.hpp>
 #include <asio/steady_timer.hpp>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 #include <tao/pegtl/parse_error.hpp>
 #include <tl/expected.hpp>

package/deps/couchbase-cxx-client/core/columnar/agent_config.cxx

@@ -17,8 +17,8 @@
 
 #include "agent_config.hxx"
 
-#include <fmt/chrono.h>
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/chrono.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <string>
 

package/deps/couchbase-cxx-client/core/columnar/error.hxx

@@ -18,7 +18,6 @@
 #pragma once
 
 #include <cstdint>
-#include <map>
 #include <memory>
 #include <string>
 #include <system_error>

package/deps/couchbase-cxx-client/core/columnar/query_component.cxx

@@ -33,9 +33,9 @@
 
 #include <asio/io_context.hpp>
 #include <asio/steady_timer.hpp>
-#include <fmt/chrono.h>
-#include <fmt/format.h>
 #include <gsl/util>
+#include <spdlog/fmt/bundled/chrono.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 #include <tl/expected.hpp>
 

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

@@ -20,7 +20,7 @@
 #include "cluster_options.hxx"
 #include "core/config_profile.hxx"
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <chrono>
 #include <mutex>

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

@@ -15,7 +15,7 @@
 
 #include "core_sdk_shim.hxx"
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <string>
 

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

@@ -39,11 +39,11 @@
 #include <asio/error.hpp>
 #include <asio/io_context.hpp>
 #include <asio/steady_timer.hpp>
-#include <fmt/format.h>
 #include <gsl/span>
 #include <gsl/span_ext>
 #include <gsl/util>
 #include <snappy.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 #include <tl/expected.hpp>
 

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

@@ -19,7 +19,7 @@
 
 #include "design_document_namespace.hxx"
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 template<>
 struct fmt::formatter<couchbase::core::design_document_namespace> {

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

@@ -19,7 +19,7 @@
 
 #include "diagnostics.hxx"
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 template<>
 struct fmt::formatter<couchbase::core::diag::cluster_state> {

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

@@ -20,7 +20,7 @@
 #include "core/utils/binary.hxx"
 #include "core/utils/unsigned_leb128.hxx"
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <algorithm>
 #include <cstddef>

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

@@ -19,7 +19,7 @@
 
 #include "document_id.hxx"
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 template<>
 struct fmt::formatter<couchbase::core::document_id> {

package/deps/couchbase-cxx-client/core/error_context/analytics_json.hxx

@@ -21,11 +21,13 @@
 #include "core/impl/retry_reason.hxx"
 
 #include <couchbase/error_codes.hxx>
-#include <couchbase/fmt/retry_reason.hxx>
 
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/forward.hpp>
 #include <tao/json/value.hpp>
 
+#include <couchbase/fmt/retry_reason.hxx>
+
 namespace tao::json
 {
 template<>

package/deps/couchbase-cxx-client/core/error_context/key_value_json.hxx

@@ -22,7 +22,7 @@
 
 #include "key_value_error_context.hxx"
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/format.h>
 #include <tao/json/forward.hpp>
 
 namespace tao::json

package/deps/couchbase-cxx-client/core/error_context/query_public_json.hxx

@@ -21,7 +21,7 @@
 
 #include <couchbase/fmt/retry_reason.hxx>
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/format.h>
 #include <tao/json/forward.hpp>
 
 namespace tao::json

package/deps/couchbase-cxx-client/core/error_context/subdocument_json.hxx

@@ -21,7 +21,7 @@
 
 #include <couchbase/fmt/retry_reason.hxx>
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/format.h>
 #include <tao/json/forward.hpp>
 
 #include "key_value_json.hxx"

package/deps/couchbase-cxx-client/core/fmt/key_value_error_map_attribute.hxx

@@ -19,7 +19,7 @@
 
 #include "core/error_context/key_value_error_map_attribute.hxx"
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 template<>
 struct fmt::formatter<couchbase::core::key_value_error_map_attribute> {

package/deps/couchbase-cxx-client/core/fmt/key_value_extended_error_info.hxx

@@ -19,7 +19,7 @@
 
 #include "core/error_context/key_value_extended_error_info.hxx"
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 /**
  * Helper for fmtlib to format @ref couchbase::key_value_extended_error_info objects.

package/deps/couchbase-cxx-client/core/fmt/key_value_status_code.hxx

@@ -19,7 +19,7 @@
 
 #include "core/error_context/key_value_status_code.hxx"
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 /**
  * Helper for fmtlib to format @ref couchbase::core::key_value_status_code objects.

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

@@ -25,7 +25,7 @@
 #include <couchbase/build_config.hxx>
 
 #include <asio/error.hpp>
-#include <fmt/chrono.h>
+#include <spdlog/fmt/bundled/chrono.h>
 #include <tl/expected.hpp>
 
 #include <memory>
@@ -269,8 +269,8 @@ public:
   ~pending_buffered_http_operation() override = default;
   pending_buffered_http_operation(const pending_buffered_http_operation&) = delete;
   pending_buffered_http_operation(pending_buffered_http_operation&&) = delete;
-  auto operator=(const pending_buffered_http_operation&) -> pending_buffered_http_operation =
-                                                              delete;
+  auto operator=(const pending_buffered_http_operation&)
+    -> pending_buffered_http_operation = delete;
   auto operator=(pending_buffered_http_operation&&) -> pending_buffered_http_operation = delete;
 
   void start(buffered_free_form_http_request_callback&& callback)

package/deps/couchbase-cxx-client/core/impl/analytics.cxx

@@ -167,6 +167,7 @@ build_analytics_request(std::string statement,
     std::move(options.client_context_id),
     options.timeout,
   };
+  request.parent_span = options.parent_span;
   if (!options.raw.empty()) {
     for (auto& [name, value] : options.raw) {
       request.raw[name] = std::move(value);

package/deps/couchbase-cxx-client/core/impl/best_effort_retry_strategy.cxx

@@ -21,7 +21,7 @@
 #include <couchbase/retry_reason.hxx>
 #include <couchbase/retry_request.hxx>
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <algorithm>
 #include <chrono>

package/deps/couchbase-cxx-client/core/impl/collection.cxx

@@ -90,7 +90,7 @@
 #include <couchbase/unlock_options.hxx>
 #include <couchbase/upsert_options.hxx>
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <chrono>
 #include <cstdint>
@@ -149,6 +149,7 @@ public:
           {},
           options.timeout,
           { options.retry_strategy },
+          options.parent_span,
         },
         [handler = std::move(handler)](auto resp) mutable {
           return handler(core::impl::make_error(std::move(resp.ctx)),
@@ -166,6 +167,7 @@ public:
         false,
         options.timeout,
         { options.retry_strategy },
+        options.parent_span,
       },
       [handler = std::move(handler)](auto resp) mutable {
         std::optional<std::chrono::system_clock::time_point> expiry_time{};
@@ -190,6 +192,7 @@ public:
         expiry,
         options.timeout,
         { options.retry_strategy },
+        options.parent_span,
       },
       [handler = std::move(handler)](auto resp) mutable {
         return handler(core::impl::make_error(std::move(resp.ctx)),
@@ -210,6 +213,7 @@ public:
         expiry,
         options.timeout,
         { options.retry_strategy },
+        options.parent_span,
       },
       [handler = std::move(handler)](const auto& resp) mutable {
         return handler(core::impl::make_error(std::move(resp.ctx)), result{ resp.cas });
@@ -279,6 +283,7 @@ public:
           options.durability_level,
           options.timeout,
           { options.retry_strategy },
+          options.parent_span,
         },
         [handler = std::move(handler)](auto resp) mutable {
           if (resp.ctx.ec()) {
@@ -290,7 +295,14 @@ public:
     }
 
     core::operations::remove_request request{
-      id, {}, {}, options.cas, durability_level::none, options.timeout, { options.retry_strategy },
+      id,
+      {},
+      {},
+      options.cas,
+      durability_level::none,
+      options.timeout,
+      { options.retry_strategy },
+      options.parent_span,
     };
     return core_.execute(std::move(request),
                          [core = core_, id = std::move(id), options, handler = std::move(handler)](
@@ -332,6 +344,7 @@ public:
         static_cast<uint32_t>(lock_duration.count()),
         options.timeout,
         { options.retry_strategy },
+        options.parent_span,
       },
       [handler = std::move(handler)](auto&& resp) mutable {
         return handler(core::impl::make_error(std::move(resp.ctx)),
@@ -352,6 +365,7 @@ public:
         cas,
         options.timeout,
         { options.retry_strategy },
+        options.parent_span,
       },
       [handler = std::move(handler)](auto&& resp) mutable {
         return handler(core::impl::make_error(std::move(resp.ctx)));
@@ -369,6 +383,7 @@ public:
         {},
         options.timeout,
         { options.retry_strategy },
+        options.parent_span,
       },
       [handler = std::move(handler)](auto&& resp) mutable {
         return handler(core::impl::make_error(std::move(resp.ctx)),
@@ -395,6 +410,7 @@ public:
         specs,
         options.timeout,
         { options.retry_strategy },
+        options.parent_span,
       },
       [handler = std::move(handler)](auto resp) mutable {
         if (resp.ctx.ec()) {
@@ -427,7 +443,7 @@ public:
         core::document_id{ bucket_name_, scope_name_, name_, std::move(document_key) },
         specs,
         options.timeout,
-        {},
+        options.parent_span,
         options.read_preference,
       },
       [handler = std::move(handler)](auto resp) mutable {
@@ -465,7 +481,7 @@ public:
         core::document_id{ bucket_name_, scope_name_, name_, std::move(document_key) },
         specs,
         options.timeout,
-        {},
+        options.parent_span,
         options.read_preference,
       },
       [handler = std::move(handler)](auto resp) mutable {
@@ -514,6 +530,7 @@ public:
           options.timeout,
           { options.retry_strategy },
           options.preserve_expiry,
+          options.parent_span,
         },
         [handler = std::move(handler)](auto resp) mutable {
           if (resp.ctx.ec()) {
@@ -548,6 +565,7 @@ public:
       options.timeout,
       { options.retry_strategy },
       options.preserve_expiry,
+      options.parent_span,
     };
     return core_.execute(
       std::move(request),
@@ -611,6 +629,7 @@ public:
           options.timeout,
           { options.retry_strategy },
           options.preserve_expiry,
+          options.parent_span,
         },
         [handler = std::move(handler)](auto resp) mutable {
           return handler(core::impl::make_error(std::move(resp.ctx)),
@@ -629,6 +648,7 @@ public:
       options.timeout,
       { options.retry_strategy },
       options.preserve_expiry,
+      options.parent_span,
     };
     return core_.execute(
       std::move(request),
@@ -681,6 +701,7 @@ public:
           options.durability_level,
           options.timeout,
           { options.retry_strategy },
+          options.parent_span,
         },
         [handler = std::move(handler)](auto&& resp) mutable {
           if (resp.ctx.ec()) {
@@ -701,6 +722,7 @@ public:
       durability_level::none,
       options.timeout,
       { options.retry_strategy },
+      options.parent_span,
     };
     return core_.execute(
       std::move(request),
@@ -754,6 +776,7 @@ public:
           options.timeout,
           { options.retry_strategy },
           options.preserve_expiry,
+          options.parent_span,
         },
         [handler = std::move(handler)](auto resp) mutable {
           if (resp.ctx.ec()) {
@@ -776,6 +799,7 @@ public:
       options.timeout,
       { options.retry_strategy },
       options.preserve_expiry,
+      options.parent_span,
     };
     return core_.execute(std::move(request),
                          [core = core_, id = std::move(id), options, handler = std::move(handler)](

package/deps/couchbase-cxx-client/core/impl/date_range.cxx

@@ -17,8 +17,8 @@
 
 #include <couchbase/date_range.hxx>
 
-#include <fmt/chrono.h>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/chrono.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <chrono>
 #include <ctime>

package/deps/couchbase-cxx-client/core/impl/date_range_query.cxx

@@ -21,8 +21,8 @@
 
 #include <couchbase/error_codes.hxx>
 
-#include <fmt/chrono.h>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/chrono.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/type.hpp>
 
 #include <chrono>

package/deps/couchbase-cxx-client/core/impl/dns_srv_tracker.cxx

@@ -31,7 +31,7 @@
 #include <asio/bind_executor.hpp>
 #include <asio/io_context.hpp>
 #include <asio/post.hpp>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <functional>
 #include <memory>

package/deps/couchbase-cxx-client/core/impl/error.cxx

@@ -36,14 +36,16 @@
 #include "core/impl/internal_error_context.hxx"
 #include "core/transactions/exceptions.hxx"
 #include "core/transactions/internal/exceptions_internal.hxx"
-#include "core/transactions/internal/exceptions_internal_fmt.hxx"
 
 #include <couchbase/error.hxx>
 #include <couchbase/error_codes.hxx>
 #include <couchbase/error_context.hxx>
 
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 
+#include "core/transactions/internal/exceptions_internal_fmt.hxx"
+
 #include <memory>
 #include <optional>
 #include <string>
@@ -115,59 +117,80 @@ namespace core::impl
 auto
 make_error(const core::error_context::query& core_ctx) -> error
 {
+  if (!core_ctx.ec) {
+    return {};
+  }
   return { core_ctx.ec, {}, internal_error_context::build_error_context(core_ctx) };
 }
 
 auto
 make_error(const query_error_context& core_ctx) -> error
 {
+  if (!core_ctx.ec()) {
+    return {};
+  }
   return { core_ctx.ec(), {}, internal_error_context::build_error_context(core_ctx) };
 }
 
 auto
 make_error(const core::error_context::search& core_ctx) -> error
 {
+  if (!core_ctx.ec) {
+    return {};
+  }
   return { core_ctx.ec, {}, internal_error_context::build_error_context(core_ctx) };
 }
 
 auto
 make_error(const core::error_context::analytics& core_ctx) -> error
 {
+  if (!core_ctx.ec) {
+    return {};
+  }
   return { core_ctx.ec, {}, internal_error_context::build_error_context(core_ctx) };
 }
 
 auto
 make_error(const core::error_context::http& core_ctx) -> error
 {
+  if (!core_ctx.ec) {
+    return {};
+  }
   return { core_ctx.ec, {}, internal_error_context::build_error_context(core_ctx) };
 }
 
 auto
 make_error(const couchbase::core::key_value_error_context& core_ctx) -> error
 {
+  if (!core_ctx.ec()) {
+    return {};
+  }
   return { core_ctx.ec(), {}, internal_error_context::build_error_context(core_ctx) };
 }
 
 auto
 make_error(const couchbase::core::subdocument_error_context& core_ctx) -> error
 {
+  if (!core_ctx.ec()) {
+    return {};
+  }
   return { core_ctx.ec(), {}, internal_error_context::build_error_context(core_ctx) };
 }
 
 auto
 make_error(const couchbase::core::transaction_error_context& ctx) -> error
 {
-  return { ctx.ec(), "", {}, { ctx.cause() } };
+  return { ctx.ec(), {}, {}, { ctx.cause() } };
 }
 
 auto
 make_error(const couchbase::core::transaction_op_error_context& ctx) -> error
 {
   if (std::holds_alternative<key_value_error_context>(ctx.cause())) {
-    return { ctx.ec(), "", {}, make_error(std::get<key_value_error_context>(ctx.cause())) };
+    return { ctx.ec(), {}, {}, make_error(std::get<key_value_error_context>(ctx.cause())) };
   }
   if (std::holds_alternative<query_error_context>(ctx.cause())) {
-    return { ctx.ec(), "", {}, make_error(std::get<query_error_context>(ctx.cause())) };
+    return { ctx.ec(), {}, {}, make_error(std::get<query_error_context>(ctx.cause())) };
   }
   return ctx.ec();
 }

package/deps/couchbase-cxx-client/core/impl/expiry.cxx

@@ -18,8 +18,8 @@
 #include <couchbase/error_codes.hxx>
 #include <couchbase/expiry.hxx>
 
-#include <fmt/chrono.h>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/chrono.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <chrono>
 #include <cstdint>

package/deps/couchbase-cxx-client/core/impl/fail_fast_retry_strategy.cxx

@@ -20,8 +20,7 @@
 #include <couchbase/retry_reason.hxx>
 #include <couchbase/retry_request.hxx>
 
-#include <fmt/core.h>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/format.h>
 
 #include <memory>
 #include <string>