couchbase 4.4.3 → 4.4.5

package/deps/couchbase-cxx-client/couchbase/fmt/tls_verify_mode.hxx

@@ -19,8 +19,6 @@
 
 #include <couchbase/tls_verify_mode.hxx>
 
-#include <fmt/core.h>
-
 /**
  * Helper for fmtlib to format @ref couchbase::tls_verify_mode objects.
  *

package/deps/couchbase-cxx-client/couchbase/fmt/transaction_keyspace.hxx

@@ -18,8 +18,6 @@
 
 #include <couchbase/transactions/transaction_keyspace.hxx>
 
-#include <fmt/core.h>
-
 template<>
 struct fmt::formatter<couchbase::transactions::transaction_keyspace> {
 public:

package/deps/couchbase-cxx-client/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

package/deps/couchbase-cxx-client/couchbase-sdk-cxx-black-duck-manifest.yaml

@@ -3,12 +3,9 @@ components:
   boringssl:
     bd-id: 1e303b15-b82b-4a4d-8cd6-a2048fb2c73d
     versions: [ 20200921 ]
-  fmt:
-    bd-id: eae20828-18b8-478f-83b3-4a058748a28b
-    versions: [ 11.0.1 ]
   spdlog:
     bd-id: 7785114c-5b78-4aad-8771-72a739a1f06e
-    versions: [ v1.14.1 ]
+    versions: [ v1.15.0 ]
   gsl:
     bd-id: 9e753ffd-aa29-46e6-a7fc-d4b972710c0b
     versions: [ 4.0.0 ]

package/dist/analyticsindexmanager.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import { Cluster } from './cluster';
+import { CppManagementAnalyticsCouchbaseRemoteLink, CppManagementAnalyticsS3ExternalLink, CppManagementAnalyticsAzureBlobExternalLink } from './binding';
 import { NodeCallback } from './utilities';
 /**
  * Represents the type of an analytics link.
@@ -155,6 +156,14 @@ export interface IAnalyticsLink {
      * Specifies what type of analytics link this represents.
      */
     linkType: AnalyticsLinkType;
+    /**
+     * The dataverse that this link belongs to.
+     */
+    dataverse: string;
+    /**
+     * The name of this link.
+     */
+    name: string;
 }
 /**
  * This is a base class for specific link configurations for the analytics service.
@@ -168,6 +177,18 @@ export declare abstract class AnalyticsLink implements IAnalyticsLink {
      * Specifies what type of analytics link this represents.
      */
     linkType: AnalyticsLinkType;
+    /**
+     * The dataverse that this link belongs to.
+     */
+    dataverse: string;
+    /**
+     * The name of this link.
+     */
+    name: string;
+    /**
+     * Validates the link.
+     */
+    abstract validate(): void;
     /**
      * @internal
      */
@@ -250,18 +271,22 @@ export declare class CouchbaseRemoteAnalyticsLink extends AnalyticsLink implemen
      * (@see ICouchbaseAnalyticsEncryptionSettings.clientCertificate) is being used.
      */
     password?: string;
+    /**
+     * Validates the CouchbaseRemoteAnalyticsLink.
+     */
+    validate(): void;
     /**
      * @internal
      */
-    constructor(data: CouchbaseRemoteAnalyticsLink);
+    constructor(data: ICouchbaseRemoteAnalyticsLink);
     /**
      * @internal
      */
-    static _toHttpData(data: ICouchbaseRemoteAnalyticsLink): any;
+    static _toCppData(data: CouchbaseRemoteAnalyticsLink): CppManagementAnalyticsCouchbaseRemoteLink;
     /**
      * @internal
      */
-    static _fromHttpData(data: any): CouchbaseRemoteAnalyticsLink;
+    static _fromCppData(data: CppManagementAnalyticsCouchbaseRemoteLink): CouchbaseRemoteAnalyticsLink;
 }
 /**
  * Provides options for configuring an analytics remote S3 link.
@@ -341,15 +366,19 @@ export declare class S3ExternalAnalyticsLink extends AnalyticsLink implements IS
     /**
      * @internal
      */
-    constructor(data: S3ExternalAnalyticsLink);
+    constructor(data: IS3ExternalAnalyticsLink);
+    /**
+     * Validates the S3ExternalAnalyticsLink.
+     */
+    validate(): void;
     /**
      * @internal
      */
-    static _toHttpData(data: IS3ExternalAnalyticsLink): any;
+    static _toCppData(data: S3ExternalAnalyticsLink): CppManagementAnalyticsS3ExternalLink;
     /**
      * @internal
      */
-    static _fromHttpData(data: any): S3ExternalAnalyticsLink;
+    static _fromCppData(data: CppManagementAnalyticsS3ExternalLink): S3ExternalAnalyticsLink;
 }
 /**
  * Provides options for configuring an analytics remote Azure link.
@@ -435,15 +464,19 @@ export declare class AzureExternalAnalyticsLink extends AnalyticsLink implements
     /**
      * @internal
      */
-    constructor(data: AzureExternalAnalyticsLink);
+    constructor(data: IAzureExternalAnalyticsLink);
+    /**
+     * Validates the AzureExternalAnalyticsLink.
+     */
+    validate(): void;
     /**
      * @internal
      */
-    static _toHttpData(data: IAzureExternalAnalyticsLink): any;
+    static _toCppData(data: AzureExternalAnalyticsLink): CppManagementAnalyticsAzureBlobExternalLink;
     /**
      * @internal
      */
-    static _fromHttpData(data: any): AzureExternalAnalyticsLink;
+    static _fromCppData(data: CppManagementAnalyticsAzureBlobExternalLink): AzureExternalAnalyticsLink;
 }
 /**
  * @category Management
@@ -571,6 +604,18 @@ export interface GetAllAnalyticsIndexesOptions {
  * @category Management
  */
 export interface ConnectAnalyticsLinkOptions {
+    /**
+     * Whether or not the call should attempt to force the link connection.
+     */
+    force?: boolean;
+    /**
+     * The name of the dataverse the link belongs to.
+     */
+    dataverseName?: string;
+    /**
+     * The name of the link to connect.
+     */
+    linkName?: string;
     /**
      * The timeout for this operation, represented in milliseconds.
      */
@@ -580,6 +625,14 @@ export interface ConnectAnalyticsLinkOptions {
  * @category Management
  */
 export interface DisconnectAnalyticsLinkOptions {
+    /**
+     * The name of the dataverse the link belongs to.
+     */
+    dataverseName?: string;
+    /**
+     * The name of the link to connect.
+     */
+    linkName?: string;
     /**
      * The timeout for this operation, represented in milliseconds.
      */
@@ -654,7 +707,6 @@ export declare class AnalyticsIndexManager {
      * @internal
      */
     constructor(cluster: Cluster);
-    private get _http();
     /**
      * Creates a new dataverse.
      *
@@ -726,19 +778,51 @@ export declare class AnalyticsIndexManager {
     /**
      * Connects a not yet connected link.
      *
-     * @param linkName The name of the link to connect.
+     * @param linkStr The name of the link to connect.
+     * @param options Optional parameters for this operation.
+     * @param callback A node-style callback to be invoked after execution.
+     * @deprecated Use the other overload instead.
+     */
+    connectLink(linkStr: string, options?: ConnectAnalyticsLinkOptions, callback?: NodeCallback<void>): Promise<void>;
+    /**
+     * Connects a not yet connected link.
+     *
+     * @param options Optional parameters for this operation.
+     * @param callback A node-style callback to be invoked after execution.
+     */
+    connectLink(options?: ConnectAnalyticsLinkOptions, callback?: NodeCallback<void>): Promise<void>;
+    /**
+     * @internal
+     */
+    _connectLinkDeprecated(linkStr: string, options?: ConnectAnalyticsLinkOptions, callback?: NodeCallback<void>): Promise<void>;
+    /**
+     * @internal
+     */
+    _connectLink(options?: ConnectAnalyticsLinkOptions, callback?: NodeCallback<void>): Promise<void>;
+    /**
+     * Disconnects a previously connected link.
+     *
+     * @param linkStr The name of the link to disconnect.
      * @param options Optional parameters for this operation.
      * @param callback A node-style callback to be invoked after execution.
+     * @deprecated Use the other overload instead.
      */
-    connectLink(linkName: string, options?: ConnectAnalyticsLinkOptions, callback?: NodeCallback<void>): Promise<void>;
+    disconnectLink(linkStr: string, options?: DisconnectAnalyticsLinkOptions, callback?: NodeCallback<void>): Promise<void>;
     /**
      * Disconnects a previously connected link.
      *
-     * @param linkName The name of the link to disconnect.
      * @param options Optional parameters for this operation.
      * @param callback A node-style callback to be invoked after execution.
      */
-    disconnectLink(linkName: string, options?: DisconnectAnalyticsLinkOptions, callback?: NodeCallback<void>): Promise<void>;
+    disconnectLink(options?: DisconnectAnalyticsLinkOptions, callback?: NodeCallback<void>): Promise<void>;
+    /**
+     * @internal
+     */
+    _disconnectLinkDeprecated(linkStr: string, options?: DisconnectAnalyticsLinkOptions, callback?: NodeCallback<void>): Promise<void>;
+    /**
+     * @internal
+     */
+    _disconnectLink(options?: DisconnectAnalyticsLinkOptions, callback?: NodeCallback<void>): Promise<void>;
     /**
      * Returns a list of all pending mutations.
      *