RubyGems - couchbase - Versions diffs - 3.5.4 → 3.5.5 - Mend

couchbase 3.5.4 → 3.5.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (441) hide show

data/ext/couchbase/core/cluster.cxx CHANGED Viewed

@@ -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>

data/ext/couchbase/core/cluster_agent_config.cxx CHANGED Viewed

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

data/ext/couchbase/core/collections_component.cxx CHANGED Viewed

@@ -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>

data/ext/couchbase/core/columnar/agent_config.cxx CHANGED Viewed

@@ -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>

data/ext/couchbase/core/columnar/error.hxx CHANGED Viewed

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

data/ext/couchbase/core/columnar/query_component.cxx CHANGED Viewed

@@ -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>

data/ext/couchbase/core/config_profiles.cxx CHANGED Viewed

@@ -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>

data/ext/couchbase/core/core_sdk_shim.cxx CHANGED Viewed

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

data/ext/couchbase/core/crud_component.cxx CHANGED Viewed

@@ -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>

data/ext/couchbase/core/design_document_namespace_fmt.hxx CHANGED Viewed

@@ -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> {

data/ext/couchbase/core/diagnostics_fmt.hxx CHANGED Viewed

@@ -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> {

data/ext/couchbase/core/document_id.cxx CHANGED Viewed

@@ -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>

data/ext/couchbase/core/document_id_fmt.hxx CHANGED Viewed

@@ -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> {

data/ext/couchbase/core/error_context/analytics_json.hxx CHANGED Viewed

@@ -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<>

data/ext/couchbase/core/error_context/key_value_json.hxx CHANGED Viewed

@@ -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

data/ext/couchbase/core/error_context/query_public_json.hxx CHANGED Viewed

@@ -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

data/ext/couchbase/core/error_context/subdocument_json.hxx CHANGED Viewed

@@ -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"

data/ext/couchbase/core/fmt/key_value_error_map_attribute.hxx CHANGED Viewed

@@ -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> {

data/ext/couchbase/core/fmt/key_value_extended_error_info.hxx CHANGED Viewed

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

data/ext/couchbase/core/fmt/key_value_status_code.hxx CHANGED Viewed

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

data/ext/couchbase/core/http_component.cxx CHANGED Viewed

@@ -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)

data/ext/couchbase/core/impl/analytics.cxx CHANGED Viewed

@@ -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);

data/ext/couchbase/core/impl/best_effort_retry_strategy.cxx CHANGED Viewed

@@ -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>

data/ext/couchbase/core/impl/collection.cxx CHANGED Viewed

@@ -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)](

data/ext/couchbase/core/impl/date_range.cxx CHANGED Viewed

@@ -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>

data/ext/couchbase/core/impl/date_range_query.cxx CHANGED Viewed

@@ -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>

data/ext/couchbase/core/impl/dns_srv_tracker.cxx CHANGED Viewed

@@ -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>

data/ext/couchbase/core/impl/error.cxx CHANGED Viewed

@@ -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();
 }

data/ext/couchbase/core/impl/expiry.cxx CHANGED Viewed

@@ -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>

data/ext/couchbase/core/impl/fail_fast_retry_strategy.cxx CHANGED Viewed

@@ -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>

data/ext/couchbase/core/impl/get_replica.hxx CHANGED Viewed

@@ -41,6 +41,8 @@ struct get_replica_request {
   using encoded_response_type =
     core::protocol::client_response<core::protocol::get_replica_response_body>;
+  static const inline std::string observability_identifier = "get_replica";
   core::document_id id;
   std::optional<std::chrono::milliseconds> timeout{};
   std::uint16_t partition{};

data/ext/couchbase/core/impl/key_value_error_context.cxx CHANGED Viewed

@@ -15,14 +15,16 @@
  *   limitations under the License.
  */
-#include <couchbase/fmt/cas.hxx>
-#include <couchbase/fmt/retry_reason.hxx>
 #include "core/error_context/key_value_error_context.hxx"
+#include <spdlog/fmt/bundled/core.h>
+#include <tao/json/to_string.hpp>
 #include "core/fmt/key_value_error_map_attribute.hxx"
 #include "core/fmt/key_value_status_code.hxx"
-#include <tao/json/to_string.hpp>
+#include <couchbase/fmt/cas.hxx>
+#include <couchbase/fmt/retry_reason.hxx>
 namespace couchbase::core
 {

data/ext/couchbase/core/impl/lookup_in_replica.hxx CHANGED Viewed

@@ -53,6 +53,8 @@ struct lookup_in_replica_request {
   using encoded_response_type =
     protocol::client_response<protocol::lookup_in_replica_response_body>;
+  static const inline std::string observability_identifier = "lookup_in_replica";
   document_id id;
   std::vector<couchbase::core::impl::subdoc::command> specs{};
   std::optional<std::chrono::milliseconds> timeout{};

data/ext/couchbase/core/impl/numeric_range.cxx CHANGED Viewed

@@ -17,7 +17,7 @@
 #include <couchbase/numeric_range.hxx>
-#include <fmt/chrono.h>
+#include <spdlog/fmt/bundled/chrono.h>
 namespace couchbase
 {

data/ext/couchbase/core/impl/observe_seqno.hxx CHANGED Viewed

@@ -50,6 +50,8 @@ struct observe_seqno_request {
   using encoded_response_type =
     core::protocol::client_response<core::protocol::observe_seqno_response_body>;
+  static const inline std::string observability_identifier = "observe_seqno";
   core::document_id id;
   bool active{};
   std::uint64_t partition_uuid{};

data/ext/couchbase/core/impl/query.cxx CHANGED Viewed

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