couchbase 4.6.1 → 4.7.0-dev.1

package/dist/collectionmanager.d.ts

@@ -1,5 +1,7 @@
 import { CppTopologyCollectionsManifestCollection, CppTopologyCollectionsManifestScope } from './binding';
 import { Bucket } from './bucket';
+import { ObservabilityInstruments } from './observabilitytypes';
+import { RequestSpan } from './tracing';
 import { NodeCallback } from './utilities';
 /**
  * Provides options for configuring a collection.
@@ -136,6 +138,10 @@ export interface CreateCollectionOptions {
      * The timeout for this operation, represented in milliseconds.
      */
     timeout?: number;
+    /**
+     * Specifies the parent span for this specific operation.
+     */
+    parentSpan?: RequestSpan;
 }
 /**
  * @category Management
@@ -145,6 +151,10 @@ export interface GetAllScopesOptions {
      * The timeout for this operation, represented in milliseconds.
      */
     timeout?: number;
+    /**
+     * Specifies the parent span for this specific operation.
+     */
+    parentSpan?: RequestSpan;
 }
 /**
  * @category Management
@@ -154,6 +164,10 @@ export interface DropCollectionOptions {
      * The timeout for this operation, represented in milliseconds.
      */
     timeout?: number;
+    /**
+     * Specifies the parent span for this specific operation.
+     */
+    parentSpan?: RequestSpan;
 }
 /**
  * @category Management
@@ -163,6 +177,10 @@ export interface CreateScopeOptions {
      * The timeout for this operation, represented in milliseconds.
      */
     timeout?: number;
+    /**
+     * Specifies the parent span for this specific operation.
+     */
+    parentSpan?: RequestSpan;
 }
 /**
  * @category Management
@@ -172,6 +190,10 @@ export interface DropScopeOptions {
      * The timeout for this operation, represented in milliseconds.
      */
     timeout?: number;
+    /**
+     * Specifies the parent span for this specific operation.
+     */
+    parentSpan?: RequestSpan;
 }
 /**
  * @category Management
@@ -181,7 +203,15 @@ export interface UpdateCollectionOptions {
      * The timeout for this operation, represented in milliseconds.
      */
     timeout?: number;
+    /**
+     * Specifies the parent span for this specific operation.
+     */
+    parentSpan?: RequestSpan;
 }
+/**
+ * @internal
+ */
+export declare function isOptions<T>(obj: any, expectedKeys: string[]): obj is T;
 /**
  * CollectionManager allows the management of collections within a Bucket.
  *
@@ -194,6 +224,10 @@ export declare class CollectionManager {
      */
     constructor(bucket: Bucket);
     private get _cluster();
+    /**
+     * @internal
+     */
+    get observabilityInstruments(): ObservabilityInstruments;
     /**
      * Returns all configured scopes along with their collections.
      *

package/dist/collectionmanager.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CollectionManager = exports.ScopeSpec = exports.CollectionSpec = void 0;
-const bindingutilities_1 = require("./bindingutilities");
+exports.CollectionManager = exports.isOptions = exports.ScopeSpec = exports.CollectionSpec = void 0;
+const observability_1 = require("./observability");
+const observabilityhandler_1 = require("./observabilityhandler");
+const observabilitytypes_1 = require("./observabilitytypes");
 const utilities_1 = require("./utilities");
 /**
  * Contains information about a collection.
@@ -63,6 +65,17 @@ class ScopeSpec {
     }
 }
 exports.ScopeSpec = ScopeSpec;
+const OPTIONS_KEYS = ['timeout', 'parentSpan'];
+/**
+ * @internal
+ */
+function isOptions(obj, expectedKeys) {
+    if (!obj || typeof obj !== 'object')
+        return false;
+    // Check if at least one key in the object exists in our expected list
+    return Object.keys(obj).some((key) => expectedKeys.includes(key));
+}
+exports.isOptions = isOptions;
 /**
  * CollectionManager allows the management of collections within a Bucket.
  *
@@ -78,6 +91,12 @@ class CollectionManager {
     get _cluster() {
         return this._bucket.cluster;
     }
+    /**
+     * @internal
+     */
+    get observabilityInstruments() {
+        return this._bucket.cluster.observabilityInstruments;
+    }
     /**
      * Returns all configured scopes along with their collections.
      *
@@ -92,21 +111,28 @@ class CollectionManager {
         if (!options) {
             options = {};
         }
-        const bucketName = this._bucket.name;
-        const timeout = options.timeout || this._cluster.managementTimeout;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
-            this._cluster.conn.managementScopeGetAll({
-                bucket_name: bucketName,
-                timeout: timeout,
-            }, (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.CollectionMgmtOp.ScopeGetAll, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        obsReqHandler.setRequestHttpAttributes({ bucketName: this._bucket.name });
+        try {
+            const bucketName = this._bucket.name;
+            const timeout = options.timeout || this._cluster.managementTimeout;
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._cluster.conn.managementScopeGetAll.bind(this._cluster.conn), {
+                    bucket_name: bucketName,
+                    timeout: timeout,
+                }, obsReqHandler);
                 if (err) {
-                    return wrapCallback(err, null);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
-                const scopes = resp.manifest.scopes.map((scopeData) => ScopeSpec._fromCppData(scopeData));
-                wrapCallback(null, scopes);
-            });
-        }, callback);
+                obsReqHandler.end();
+                return resp.manifest.scopes.map((scopeData) => ScopeSpec._fromCppData(scopeData));
+            }, callback);
+        }
+        catch (err) {
+            obsReqHandler.endWithError(err);
+            throw err;
+        }
     }
     /**
      * @internal
@@ -142,32 +168,47 @@ class CollectionManager {
             callback = arguments[3];
             options = undefined;
         }
+        if (isOptions(settings, OPTIONS_KEYS)) {
+            options = settings;
+            settings = undefined;
+        }
         if (!options) {
             options = {};
         }
         if (!settings) {
             settings = {};
         }
-        const bucketName = this._bucket.name;
-        const timeout = options.timeout || this._cluster.managementTimeout;
-        const maxExpiry = settings === null || settings === void 0 ? void 0 : settings.maxExpiry;
-        const history = settings === null || settings === void 0 ? void 0 : settings.history;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
-            this._cluster.conn.managementCollectionCreate({
-                bucket_name: bucketName,
-                scope_name: scopeName,
-                collection_name: collectionName,
-                max_expiry: maxExpiry,
-                history: history,
-                timeout: timeout,
-            }, (cppErr) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.CollectionMgmtOp.CollectionCreate, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        obsReqHandler.setRequestHttpAttributes({
+            bucketName: this._bucket.name,
+            scopeName: scopeName,
+            collectionName: collectionName,
+        });
+        try {
+            const bucketName = this._bucket.name;
+            const timeout = options.timeout || this._cluster.managementTimeout;
+            const maxExpiry = settings === null || settings === void 0 ? void 0 : settings.maxExpiry;
+            const history = settings === null || settings === void 0 ? void 0 : settings.history;
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, _] = await (0, observability_1.wrapObservableBindingCall)(this._cluster.conn.managementCollectionCreate.bind(this._cluster.conn), {
+                    bucket_name: bucketName,
+                    scope_name: scopeName,
+                    collection_name: collectionName,
+                    max_expiry: maxExpiry,
+                    history: history,
+                    timeout: timeout,
+                }, obsReqHandler);
                 if (err) {
-                    return wrapCallback(err, null);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
-                wrapCallback(err);
-            });
-        }, callback);
+                obsReqHandler.end();
+            }, callback);
+        }
+        catch (err) {
+            obsReqHandler.endWithError(err);
+            throw err;
+        }
     }
     /**
      * Drops a collection from a scope.
@@ -185,22 +226,33 @@ class CollectionManager {
         if (!options) {
             options = {};
         }
-        const bucketName = this._bucket.name;
-        const timeout = options.timeout || this._cluster.managementTimeout;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
-            this._cluster.conn.managementCollectionDrop({
-                bucket_name: bucketName,
-                scope_name: scopeName,
-                collection_name: collectionName,
-                timeout: timeout,
-            }, (cppErr) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.CollectionMgmtOp.CollectionDrop, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        obsReqHandler.setRequestHttpAttributes({
+            bucketName: this._bucket.name,
+            scopeName: scopeName,
+            collectionName: collectionName,
+        });
+        try {
+            const bucketName = this._bucket.name;
+            const timeout = options.timeout || this._cluster.managementTimeout;
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, _] = await (0, observability_1.wrapObservableBindingCall)(this._cluster.conn.managementCollectionDrop.bind(this._cluster.conn), {
+                    bucket_name: bucketName,
+                    scope_name: scopeName,
+                    collection_name: collectionName,
+                    timeout: timeout,
+                }, obsReqHandler);
                 if (err) {
-                    return wrapCallback(err, null);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
-                wrapCallback(err);
-            });
-        }, callback);
+                obsReqHandler.end();
+            }, callback);
+        }
+        catch (err) {
+            obsReqHandler.endWithError(err);
+            throw err;
+        }
     }
     /**
      * Updates a collection in a scope.
@@ -219,24 +271,35 @@ class CollectionManager {
         if (!options) {
             options = {};
         }
-        const bucketName = this._bucket.name;
-        const timeout = options.timeout || this._cluster.managementTimeout;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
-            this._cluster.conn.managementCollectionUpdate({
-                bucket_name: bucketName,
-                scope_name: scopeName,
-                collection_name: collectionName,
-                max_expiry: settings.maxExpiry,
-                history: settings.history,
-                timeout: timeout,
-            }, (cppErr) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.CollectionMgmtOp.CollectionUpdate, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        obsReqHandler.setRequestHttpAttributes({
+            bucketName: this._bucket.name,
+            scopeName: scopeName,
+            collectionName: collectionName,
+        });
+        try {
+            const bucketName = this._bucket.name;
+            const timeout = options.timeout || this._cluster.managementTimeout;
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, _] = await (0, observability_1.wrapObservableBindingCall)(this._cluster.conn.managementCollectionUpdate.bind(this._cluster.conn), {
+                    bucket_name: bucketName,
+                    scope_name: scopeName,
+                    collection_name: collectionName,
+                    max_expiry: settings.maxExpiry,
+                    history: settings.history,
+                    timeout: timeout,
+                }, obsReqHandler);
                 if (err) {
-                    return wrapCallback(err, null);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
-                wrapCallback(err);
-            });
-        }, callback);
+                obsReqHandler.end();
+            }, callback);
+        }
+        catch (err) {
+            obsReqHandler.endWithError(err);
+            throw err;
+        }
     }
     /**
      * Creates a new scope.
@@ -253,21 +316,31 @@ class CollectionManager {
         if (!options) {
             options = {};
         }
-        const bucketName = this._bucket.name;
-        const timeout = options.timeout || this._cluster.managementTimeout;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
-            this._cluster.conn.managementScopeCreate({
-                bucket_name: bucketName,
-                scope_name: scopeName,
-                timeout: timeout,
-            }, (cppErr) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.CollectionMgmtOp.ScopeCreate, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        obsReqHandler.setRequestHttpAttributes({
+            bucketName: this._bucket.name,
+            scopeName: scopeName,
+        });
+        try {
+            const bucketName = this._bucket.name;
+            const timeout = options.timeout || this._cluster.managementTimeout;
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, _] = await (0, observability_1.wrapObservableBindingCall)(this._cluster.conn.managementScopeCreate.bind(this._cluster.conn), {
+                    bucket_name: bucketName,
+                    scope_name: scopeName,
+                    timeout: timeout,
+                }, obsReqHandler);
                 if (err) {
-                    return wrapCallback(err, null);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
-                wrapCallback(err);
-            });
-        }, callback);
+                obsReqHandler.end();
+            }, callback);
+        }
+        catch (err) {
+            obsReqHandler.endWithError(err);
+            throw err;
+        }
     }
     /**
      * Drops a scope.
@@ -284,21 +357,31 @@ class CollectionManager {
         if (!options) {
             options = {};
         }
-        const bucketName = this._bucket.name;
-        const timeout = options.timeout || this._cluster.managementTimeout;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
-            this._cluster.conn.managementScopeDrop({
-                bucket_name: bucketName,
-                scope_name: scopeName,
-                timeout: timeout,
-            }, (cppErr) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.CollectionMgmtOp.ScopeDrop, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        obsReqHandler.setRequestHttpAttributes({
+            bucketName: this._bucket.name,
+            scopeName: scopeName,
+        });
+        try {
+            const bucketName = this._bucket.name;
+            const timeout = options.timeout || this._cluster.managementTimeout;
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, _] = await (0, observability_1.wrapObservableBindingCall)(this._cluster.conn.managementScopeDrop.bind(this._cluster.conn), {
+                    bucket_name: bucketName,
+                    scope_name: scopeName,
+                    timeout: timeout,
+                }, obsReqHandler);
                 if (err) {
-                    return wrapCallback(err, null);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
-                wrapCallback(err);
-            });
-        }, callback);
+                obsReqHandler.end();
+            }, callback);
+        }
+        catch (err) {
+            obsReqHandler.endWithError(err);
+            throw err;
+        }
     }
 }
 exports.CollectionManager = CollectionManager;

package/dist/couchbase.d.ts

@@ -56,7 +56,11 @@ export * from './errorcontexts';
 export * from './errors';
 export * from './eventingfunctionmanager';
 export * from './generaltypes';
+export * from './logger';
+export * from './metrics';
 export * from './mutationstate';
+export * from './oteltracer';
+export * from './otelmeter';
 export * from './queryindexmanager';
 export * from './querytypes';
 export * from './rangeScan';
@@ -70,6 +74,7 @@ export * from './searchquery';
 export * from './searchsort';
 export * from './searchtypes';
 export * from './streamablepromises';
+export * from './tracing';
 export * from './transactions';
 export * from './transcoders';
 export * from './usermanager';

package/dist/couchbase.js

@@ -85,7 +85,11 @@ __exportStar(require("./errorcontexts"), exports);
 __exportStar(require("./errors"), exports);
 __exportStar(require("./eventingfunctionmanager"), exports);
 __exportStar(require("./generaltypes"), exports);
+__exportStar(require("./logger"), exports);
+__exportStar(require("./metrics"), exports);
 __exportStar(require("./mutationstate"), exports);
+__exportStar(require("./oteltracer"), exports);
+__exportStar(require("./otelmeter"), exports);
 __exportStar(require("./queryindexmanager"), exports);
 __exportStar(require("./querytypes"), exports);
 __exportStar(require("./rangeScan"), exports);
@@ -99,6 +103,7 @@ __exportStar(require("./searchquery"), exports);
 __exportStar(require("./searchsort"), exports);
 __exportStar(require("./searchtypes"), exports);
 __exportStar(require("./streamablepromises"), exports);
+__exportStar(require("./tracing"), exports);
 __exportStar(require("./transactions"), exports);
 __exportStar(require("./transcoders"), exports);
 __exportStar(require("./usermanager"), exports);