couchbase 4.6.1 → 4.7.0-dev.1

package/dist/collection.js

@@ -31,6 +31,9 @@ const crudoptypes_1 = require("./crudoptypes");
 const datastructures_1 = require("./datastructures");
 const errors_1 = require("./errors");
 const generaltypes_1 = require("./generaltypes");
+const observability_1 = require("./observability");
+const observabilityhandler_1 = require("./observabilityhandler");
+const observabilitytypes_1 = require("./observabilitytypes");
 const queryindexmanager_1 = require("./queryindexmanager");
 const rangeScan_1 = require("./rangeScan");
 const sdspecs_1 = require("./sdspecs");
@@ -85,6 +88,12 @@ class Collection {
     get transcoder() {
         return this._scope.transcoder;
     }
+    /**
+     * @internal
+     */
+    get observabilityInstruments() {
+        return this._scope.bucket.cluster.observabilityInstruments;
+    }
     /**
     @internal
     */
@@ -171,35 +180,41 @@ class Collection {
         if (!options) {
             options = {};
         }
-        if (options.project || options.withExpiry) {
-            return this._projectedGet(key, options, callback);
-        }
-        const transcoder = options.transcoder || this.transcoder;
-        const timeout = options.timeout || this.cluster.kvTimeout;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
-            this._conn.get({
-                id: this._cppDocId(key),
-                timeout,
-                partition: 0,
-                opaque: 0,
-            }, (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.Get, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            const cppDocId = this._cppDocId(key);
+            obsReqHandler.setRequestKeyValueAttributes(cppDocId);
+            if (options.project || options.withExpiry) {
+                options.parentSpan = obsReqHandler.wrappedSpan;
+                return this._projectedGet(key, options, obsReqHandler, callback);
+            }
+            const transcoder = options.transcoder || this.transcoder;
+            const timeout = options.timeout || this.cluster.kvTimeout;
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.get.bind(this._conn), {
+                    id: cppDocId,
+                    timeout,
+                    partition: 0,
+                    opaque: 0,
+                }, obsReqHandler);
                 if (err) {
-                    return wrapCallback(err, null);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
-                this._decodeDoc(transcoder, resp.value, resp.flags, (err, content) => {
-                    if (err) {
-                        return wrapCallback(err, null);
-                    }
-                    wrapCallback(null, new crudoptypes_1.GetResult({
-                        content: content,
-                        cas: resp.cas,
-                    }));
+                const content = transcoder.decode(resp.value, resp.flags);
+                obsReqHandler.end();
+                return new crudoptypes_1.GetResult({
+                    content: content,
+                    cas: resp.cas,
                 });
-            });
-        }, callback);
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
-    _projectedGet(key, options, callback) {
+    _projectedGet(key, options, obsReqHandler, callback) {
         let expiryStart = -1;
         let projStart = -1;
         let paths = [];
@@ -233,9 +248,16 @@ class Collection {
             needReproject = true;
         }
         return utilities_1.PromiseHelper.wrapAsync(async () => {
-            const res = await this.lookupIn(key, spec, {
-                ...options,
-            });
+            let res;
+            try {
+                res = await this.lookupIn(key, spec, {
+                    ...options,
+                });
+            }
+            catch (e) {
+                obsReqHandler.endWithError(e);
+                throw e;
+            }
             let content = null;
             let expiry = undefined;
             if (expiryStart >= 0) {
@@ -262,6 +284,8 @@ class Collection {
                     }
                 }
             }
+            // The parent span is created w/in the get() operation
+            obsReqHandler.end();
             return new crudoptypes_1.GetResult({
                 content: content,
                 cas: res.cas,
@@ -284,101 +308,109 @@ class Collection {
         if (!options) {
             options = {};
         }
-        const timeout = options.timeout || this.cluster.kvTimeout;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
-            this._conn.exists({
-                id: this._cppDocId(key),
-                partition: 0,
-                opaque: 0,
-                timeout,
-            }, (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.Exists, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            const cppDocId = this._cppDocId(key);
+            const timeout = options.timeout || this.cluster.kvTimeout;
+            obsReqHandler.setRequestKeyValueAttributes(cppDocId);
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.exists.bind(this._conn), {
+                    id: cppDocId,
+                    partition: 0,
+                    opaque: 0,
+                    timeout,
+                }, obsReqHandler);
                 if (err) {
-                    return wrapCallback(err, null);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
+                obsReqHandler.end();
                 if (resp.deleted) {
-                    return wrapCallback(null, new crudoptypes_1.ExistsResult({
+                    return new crudoptypes_1.ExistsResult({
                         cas: undefined,
                         exists: false,
-                    }));
+                    });
                 }
-                wrapCallback(null, new crudoptypes_1.ExistsResult({
+                return new crudoptypes_1.ExistsResult({
                     cas: resp.cas,
                     exists: resp.document_exists,
-                }));
-            });
-        }, callback);
+                });
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * @internal
      */
-    _getReplica(key, getAllReplicas, options, callback) {
-        if (options instanceof Function) {
-            callback = arguments[2];
-            options = undefined;
-        }
-        if (!options) {
-            options = {};
-        }
+    _getReplica(key, obsReqHandler, options, callback) {
+        const cppDocId = this._cppDocId(key);
+        obsReqHandler.setRequestKeyValueAttributes(cppDocId);
         const emitter = new streamablepromises_1.StreamableReplicasPromise((replicas) => replicas);
         const transcoder = options.transcoder || this.transcoder;
         const timeout = options.timeout || this.cluster.kvTimeout;
-        if (getAllReplicas) {
-            this._conn.getAllReplicas({
-                id: this._cppDocId(key),
-                timeout: timeout,
-                read_preference: (0, bindingutilities_1.readPreferenceToCpp)(options.readPreference),
-            }, (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+        if (obsReqHandler.opType == observabilitytypes_1.KeyValueOp.GetAllReplicas) {
+            utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.getAllReplicas.bind(this._conn), {
+                    id: cppDocId,
+                    timeout: timeout,
+                    read_preference: (0, bindingutilities_1.readPreferenceToCpp)(options.readPreference),
+                }, obsReqHandler);
                 if (err) {
+                    obsReqHandler.endWithError(err);
                     emitter.emit('error', err);
                     emitter.emit('end');
                     return;
                 }
                 resp.entries.forEach((replica) => {
-                    this._decodeDoc(transcoder, replica.value, replica.flags, (err, content) => {
-                        if (err) {
-                            emitter.emit('error', err);
-                            emitter.emit('end');
-                            return;
-                        }
+                    try {
+                        const content = transcoder.decode(replica.value, replica.flags);
                         emitter.emit('replica', new crudoptypes_1.GetReplicaResult({
                             content: content,
                             cas: replica.cas,
                             isReplica: replica.replica,
                         }));
-                    });
+                    }
+                    catch (err) {
+                        obsReqHandler.endWithError(err);
+                        emitter.emit('error', err);
+                        emitter.emit('end');
+                        return;
+                    }
                 });
+                obsReqHandler.end();
                 emitter.emit('end');
-                return;
             });
         }
         else {
-            this._conn.getAnyReplica({
-                id: this._cppDocId(key),
-                timeout: timeout,
-                read_preference: (0, bindingutilities_1.readPreferenceToCpp)(options.readPreference),
-            }, (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+            utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.getAnyReplica.bind(this._conn), {
+                    id: cppDocId,
+                    timeout: timeout,
+                    read_preference: (0, bindingutilities_1.readPreferenceToCpp)(options.readPreference),
+                }, obsReqHandler);
                 if (err) {
+                    obsReqHandler.endWithError(err);
                     emitter.emit('error', err);
                     emitter.emit('end');
                     return;
                 }
-                this._decodeDoc(transcoder, resp.value, resp.flags, (err, content) => {
-                    if (err) {
-                        emitter.emit('error', err);
-                        emitter.emit('end');
-                        return;
-                    }
+                try {
+                    const content = transcoder.decode(resp.value, resp.flags);
                     emitter.emit('replica', new crudoptypes_1.GetReplicaResult({
                         content: content,
                         cas: resp.cas,
                         isReplica: resp.replica,
                     }));
-                });
+                }
+                catch (err) {
+                    obsReqHandler.endWithError(err);
+                    emitter.emit('error', err);
+                }
+                obsReqHandler.end();
                 emitter.emit('end');
-                return;
             });
         }
         return utilities_1.PromiseHelper.wrapAsync(() => emitter, callback);
@@ -396,10 +428,20 @@ class Collection {
             callback = arguments[1];
             options = undefined;
         }
-        return utilities_1.PromiseHelper.wrapAsync(async () => {
-            const replicas = await this._getReplica(key, false, options);
-            return replicas[0];
-        }, callback);
+        if (!options) {
+            options = {};
+        }
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.GetAnyReplica, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                const replicas = await this._getReplica(key, obsReqHandler, options);
+                return replicas[0];
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * Retrieves the value of the document from all available replicas.  Note that
@@ -410,7 +452,21 @@ class Collection {
      * @param callback A node-style callback to be invoked after execution.
      */
     getAllReplicas(key, options, callback) {
-        return this._getReplica(key, true, options, callback);
+        if (options instanceof Function) {
+            callback = arguments[1];
+            options = undefined;
+        }
+        if (!options) {
+            options = {};
+        }
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.GetAllReplicas, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            return this._getReplica(key, obsReqHandler, options, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * Inserts a new document to the collection, failing if the document already exists.
@@ -428,51 +484,61 @@ class Collection {
         if (!options) {
             options = {};
         }
-        const expiry = (0, utilities_1.parseExpiry)(options.expiry);
-        const transcoder = options.transcoder || this.transcoder;
-        const durabilityLevel = options.durabilityLevel;
-        const persistTo = options.durabilityPersistTo;
-        const replicateTo = options.durabilityReplicateTo;
-        const timeout = options.timeout || this._mutationTimeout(durabilityLevel);
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
-            this._encodeDoc(transcoder, value, (err, bytes, flags) => {
-                if (err) {
-                    return wrapCallback(err, null);
-                }
-                const insertReq = {
-                    id: this._cppDocId(key),
-                    value: bytes,
-                    flags,
-                    expiry: expiry,
-                    timeout,
-                    partition: 0,
-                    opaque: 0,
-                };
-                const insertCallback = (cppErr, resp) => {
-                    const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
-                    if (err) {
-                        return wrapCallback(err, null);
-                    }
-                    wrapCallback(err, new crudoptypes_1.MutationResult({
-                        cas: resp.cas,
-                        token: resp.token,
-                    }));
-                };
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.Insert, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            const cppDocId = this._cppDocId(key);
+            const cppDurability = (0, bindingutilities_1.durabilityToCpp)(options.durabilityLevel);
+            const expiry = (0, utilities_1.parseExpiry)(options.expiry);
+            const transcoder = options.transcoder || this.transcoder;
+            const persistTo = options.durabilityPersistTo;
+            const replicateTo = options.durabilityReplicateTo;
+            const timeout = options.timeout || this._mutationTimeout(options.durabilityLevel);
+            obsReqHandler.setRequestKeyValueAttributes(cppDocId, cppDurability);
+            const [bytesBuf, flags] = obsReqHandler.maybeCreateEncodingSpan(() => {
+                return transcoder.encode(value);
+            });
+            const insertReq = {
+                id: cppDocId,
+                value: bytesBuf,
+                flags: flags,
+                expiry: expiry,
+                timeout,
+                partition: 0,
+                opaque: 0,
+            };
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                let err = null;
+                let resp = null;
                 if (persistTo || replicateTo) {
-                    this._conn.insertWithLegacyDurability({
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.insertWithLegacyDurability.bind(this._conn), {
                         ...insertReq,
                         persist_to: (0, bindingutilities_1.persistToToCpp)(persistTo),
                         replicate_to: (0, bindingutilities_1.replicateToToCpp)(replicateTo),
-                    }, insertCallback);
+                    }, obsReqHandler);
                 }
                 else {
-                    this._conn.insert({
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.insert.bind(this._conn), {
                         ...insertReq,
-                        durability_level: (0, bindingutilities_1.durabilityToCpp)(durabilityLevel),
-                    }, insertCallback);
+                        durability_level: cppDurability,
+                    }, obsReqHandler);
                 }
-            });
-        }, callback);
+                if (err) {
+                    obsReqHandler.endWithError(err);
+                    throw err;
+                }
+                obsReqHandler.end();
+                return new crudoptypes_1.MutationResult({
+                    cas: resp.cas,
+                    token: resp.token,
+                });
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * Upserts a document to the collection.  This operation succeeds whether or not the
@@ -491,53 +557,63 @@ class Collection {
         if (!options) {
             options = {};
         }
-        const expiry = (0, utilities_1.parseExpiry)(options.expiry);
-        const preserve_expiry = options.preserveExpiry;
-        const transcoder = options.transcoder || this.transcoder;
-        const durabilityLevel = options.durabilityLevel;
-        const persistTo = options.durabilityPersistTo;
-        const replicateTo = options.durabilityReplicateTo;
-        const timeout = options.timeout || this._mutationTimeout(durabilityLevel);
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
-            this._encodeDoc(transcoder, value, (err, bytes, flags) => {
-                if (err) {
-                    return wrapCallback(err, null);
-                }
-                const upsertReq = {
-                    id: this._cppDocId(key),
-                    value: bytes,
-                    flags,
-                    expiry: expiry,
-                    preserve_expiry: preserve_expiry || false,
-                    timeout,
-                    partition: 0,
-                    opaque: 0,
-                };
-                const upsertCallback = (cppErr, resp) => {
-                    const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
-                    if (err) {
-                        return wrapCallback(err, null);
-                    }
-                    wrapCallback(err, new crudoptypes_1.MutationResult({
-                        cas: resp.cas,
-                        token: resp.token,
-                    }));
-                };
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.Upsert, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            const cppDocId = this._cppDocId(key);
+            const cppDurability = (0, bindingutilities_1.durabilityToCpp)(options.durabilityLevel);
+            const expiry = (0, utilities_1.parseExpiry)(options.expiry);
+            const preserve_expiry = options.preserveExpiry;
+            const transcoder = options.transcoder || this.transcoder;
+            const persistTo = options.durabilityPersistTo;
+            const replicateTo = options.durabilityReplicateTo;
+            const timeout = options.timeout || this._mutationTimeout(options.durabilityLevel);
+            obsReqHandler.setRequestKeyValueAttributes(cppDocId, cppDurability);
+            const [bytesBuf, flags] = obsReqHandler.maybeCreateEncodingSpan(() => {
+                return transcoder.encode(value);
+            });
+            const upsertReq = {
+                id: cppDocId,
+                value: bytesBuf,
+                flags: flags,
+                expiry: expiry,
+                preserve_expiry: preserve_expiry || false,
+                timeout,
+                partition: 0,
+                opaque: 0,
+            };
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                let err = null;
+                let resp = null;
                 if (persistTo || replicateTo) {
-                    this._conn.upsertWithLegacyDurability({
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.upsertWithLegacyDurability.bind(this._conn), {
                         ...upsertReq,
                         persist_to: (0, bindingutilities_1.persistToToCpp)(persistTo),
                         replicate_to: (0, bindingutilities_1.replicateToToCpp)(replicateTo),
-                    }, upsertCallback);
+                    }, obsReqHandler);
                 }
                 else {
-                    this._conn.upsert({
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.upsert.bind(this._conn), {
                         ...upsertReq,
-                        durability_level: (0, bindingutilities_1.durabilityToCpp)(durabilityLevel),
-                    }, upsertCallback);
+                        durability_level: cppDurability,
+                    }, obsReqHandler);
                 }
-            });
-        }, callback);
+                if (err) {
+                    obsReqHandler.endWithError(err);
+                    throw err;
+                }
+                obsReqHandler.end();
+                return new crudoptypes_1.MutationResult({
+                    cas: resp.cas,
+                    token: resp.token,
+                });
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * Replaces the value of an existing document.  Failing if the document does not exist.
@@ -555,55 +631,65 @@ class Collection {
         if (!options) {
             options = {};
         }
-        const expiry = (0, utilities_1.parseExpiry)(options.expiry);
-        const cas = options.cas;
-        const preserve_expiry = options.preserveExpiry;
-        const transcoder = options.transcoder || this.transcoder;
-        const durabilityLevel = options.durabilityLevel;
-        const persistTo = options.durabilityPersistTo;
-        const replicateTo = options.durabilityReplicateTo;
-        const timeout = options.timeout || this._mutationTimeout(durabilityLevel);
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
-            this._encodeDoc(transcoder, value, (err, bytes, flags) => {
-                if (err) {
-                    return wrapCallback(err, null);
-                }
-                const replaceReq = {
-                    id: this._cppDocId(key),
-                    value: bytes,
-                    flags,
-                    expiry,
-                    cas: cas || binding_1.zeroCas,
-                    preserve_expiry: preserve_expiry || false,
-                    timeout,
-                    partition: 0,
-                    opaque: 0,
-                };
-                const replaceCallback = (cppErr, resp) => {
-                    const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
-                    if (err) {
-                        return wrapCallback(err, null);
-                    }
-                    wrapCallback(err, new crudoptypes_1.MutationResult({
-                        cas: resp.cas,
-                        token: resp.token,
-                    }));
-                };
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.Replace, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            const cppDocId = this._cppDocId(key);
+            const cppDurability = (0, bindingutilities_1.durabilityToCpp)(options.durabilityLevel);
+            const expiry = (0, utilities_1.parseExpiry)(options.expiry);
+            const cas = options.cas;
+            const preserve_expiry = options.preserveExpiry;
+            const transcoder = options.transcoder || this.transcoder;
+            const persistTo = options.durabilityPersistTo;
+            const replicateTo = options.durabilityReplicateTo;
+            const timeout = options.timeout || this._mutationTimeout(options.durabilityLevel);
+            obsReqHandler.setRequestKeyValueAttributes(cppDocId, cppDurability);
+            const [bytesBuf, flags] = obsReqHandler.maybeCreateEncodingSpan(() => {
+                return transcoder.encode(value);
+            });
+            const replaceReq = {
+                id: cppDocId,
+                value: bytesBuf,
+                flags: flags,
+                expiry,
+                cas: cas || binding_1.zeroCas,
+                preserve_expiry: preserve_expiry || false,
+                timeout,
+                partition: 0,
+                opaque: 0,
+            };
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                let err = null;
+                let resp = null;
                 if (persistTo || replicateTo) {
-                    this._conn.replaceWithLegacyDurability({
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.replaceWithLegacyDurability.bind(this._conn), {
                         ...replaceReq,
                         persist_to: (0, bindingutilities_1.persistToToCpp)(persistTo),
                         replicate_to: (0, bindingutilities_1.replicateToToCpp)(replicateTo),
-                    }, replaceCallback);
+                    }, obsReqHandler);
                 }
                 else {
-                    this._conn.replace({
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.replace.bind(this._conn), {
                         ...replaceReq,
-                        durability_level: (0, bindingutilities_1.durabilityToCpp)(durabilityLevel),
-                    }, replaceCallback);
+                        durability_level: cppDurability,
+                    }, obsReqHandler);
                 }
-            });
-        }, callback);
+                if (err) {
+                    obsReqHandler.endWithError(err);
+                    throw err;
+                }
+                obsReqHandler.end();
+                return new crudoptypes_1.MutationResult({
+                    cas: resp.cas,
+                    token: resp.token,
+                });
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * Remove an existing document from the collection.
@@ -620,43 +706,55 @@ class Collection {
         if (!options) {
             options = {};
         }
-        const cas = options.cas;
-        const durabilityLevel = options.durabilityLevel;
-        const persistTo = options.durabilityPersistTo;
-        const replicateTo = options.durabilityReplicateTo;
-        const timeout = options.timeout || this._mutationTimeout(durabilityLevel);
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.Remove, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            const cppDocId = this._cppDocId(key);
+            const cppDurability = (0, bindingutilities_1.durabilityToCpp)(options.durabilityLevel);
+            const cas = options.cas;
+            const persistTo = options.durabilityPersistTo;
+            const replicateTo = options.durabilityReplicateTo;
+            const timeout = options.timeout || this._mutationTimeout(options.durabilityLevel);
+            obsReqHandler.setRequestKeyValueAttributes(cppDocId, cppDurability);
             const removeReq = {
-                id: this._cppDocId(key),
+                id: cppDocId,
                 cas: cas || binding_1.zeroCas,
                 timeout,
                 partition: 0,
                 opaque: 0,
             };
-            const removeCallback = (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                let err = null;
+                let resp = null;
+                if (persistTo || replicateTo) {
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.removeWithLegacyDurability.bind(this._conn), {
+                        ...removeReq,
+                        persist_to: (0, bindingutilities_1.persistToToCpp)(persistTo),
+                        replicate_to: (0, bindingutilities_1.replicateToToCpp)(replicateTo),
+                    }, obsReqHandler);
+                }
+                else {
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.remove.bind(this._conn), {
+                        ...removeReq,
+                        durability_level: cppDurability,
+                    }, obsReqHandler);
+                }
                 if (err) {
-                    return wrapCallback(err, null);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
-                wrapCallback(err, new crudoptypes_1.MutationResult({
+                obsReqHandler.end();
+                return new crudoptypes_1.MutationResult({
                     cas: resp.cas,
                     token: resp.token,
-                }));
-            };
-            if (persistTo || replicateTo) {
-                this._conn.removeWithLegacyDurability({
-                    ...removeReq,
-                    persist_to: (0, bindingutilities_1.persistToToCpp)(persistTo),
-                    replicate_to: (0, bindingutilities_1.replicateToToCpp)(replicateTo),
-                }, removeCallback);
-            }
-            else {
-                this._conn.remove({
-                    ...removeReq,
-                    durability_level: (0, bindingutilities_1.durabilityToCpp)(durabilityLevel),
-                }, removeCallback);
-            }
-        }, callback);
+                });
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * Retrieves the value of the document and simultanously updates the expiry time
@@ -680,31 +778,36 @@ class Collection {
         if (!options) {
             options = {};
         }
-        const transcoder = options.transcoder || this.transcoder;
-        const timeout = options.timeout || this.cluster.kvTimeout;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
-            this._conn.getAndTouch({
-                id: this._cppDocId(key),
-                expiry: (0, utilities_1.parseExpiry)(expiry),
-                timeout,
-                partition: 0,
-                opaque: 0,
-            }, (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.GetAndTouch, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            const cppDocId = this._cppDocId(key);
+            const transcoder = options.transcoder || this.transcoder;
+            const timeout = options.timeout || this.cluster.kvTimeout;
+            obsReqHandler.setRequestKeyValueAttributes(cppDocId);
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.getAndTouch.bind(this._conn), {
+                    id: cppDocId,
+                    expiry: (0, utilities_1.parseExpiry)(expiry),
+                    timeout,
+                    partition: 0,
+                    opaque: 0,
+                }, obsReqHandler);
                 if (err) {
-                    return wrapCallback(err, null);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
-                this._decodeDoc(transcoder, resp.value, resp.flags, (err, content) => {
-                    if (err) {
-                        return wrapCallback(err, null);
-                    }
-                    wrapCallback(err, new crudoptypes_1.GetResult({
-                        content: content,
-                        cas: resp.cas,
-                    }));
+                const content = transcoder.decode(resp.value, resp.flags);
+                obsReqHandler.end();
+                return new crudoptypes_1.GetResult({
+                    content: content,
+                    cas: resp.cas,
                 });
-            });
-        }, callback);
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * Updates the expiry on an existing document.
@@ -727,24 +830,33 @@ class Collection {
         if (!options) {
             options = {};
         }
-        const timeout = options.timeout || this.cluster.kvTimeout;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
-            this._conn.touch({
-                id: this._cppDocId(key),
-                expiry: (0, utilities_1.parseExpiry)(expiry),
-                timeout,
-                partition: 0,
-                opaque: 0,
-            }, (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.Touch, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            const cppDocId = this._cppDocId(key);
+            const timeout = options.timeout || this.cluster.kvTimeout;
+            obsReqHandler.setRequestKeyValueAttributes(cppDocId);
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.touch.bind(this._conn), {
+                    id: cppDocId,
+                    expiry: (0, utilities_1.parseExpiry)(expiry),
+                    timeout,
+                    partition: 0,
+                    opaque: 0,
+                }, obsReqHandler);
                 if (err) {
-                    return wrapCallback(err, null);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
-                wrapCallback(err, new crudoptypes_1.MutationResult({
+                obsReqHandler.end();
+                return new crudoptypes_1.MutationResult({
                     cas: resp.cas,
-                }));
-            });
-        }, callback);
+                });
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * Locks a document and retrieves the value of that document at the time it is locked.
@@ -762,31 +874,36 @@ class Collection {
         if (!options) {
             options = {};
         }
-        const transcoder = options.transcoder || this.transcoder;
-        const timeout = options.timeout || this.cluster.kvTimeout;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
-            this._conn.getAndLock({
-                id: this._cppDocId(key),
-                lock_time: lockTime,
-                timeout,
-                partition: 0,
-                opaque: 0,
-            }, (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.GetAndLock, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            const cppDocId = this._cppDocId(key);
+            const transcoder = options.transcoder || this.transcoder;
+            const timeout = options.timeout || this.cluster.kvTimeout;
+            obsReqHandler.setRequestKeyValueAttributes(cppDocId);
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.getAndLock.bind(this._conn), {
+                    id: cppDocId,
+                    lock_time: lockTime,
+                    timeout,
+                    partition: 0,
+                    opaque: 0,
+                }, obsReqHandler);
                 if (err) {
-                    return wrapCallback(err, null);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
-                this._decodeDoc(transcoder, resp.value, resp.flags, (err, content) => {
-                    if (err) {
-                        return wrapCallback(err, null);
-                    }
-                    wrapCallback(err, new crudoptypes_1.GetResult({
-                        cas: resp.cas,
-                        content: content,
-                    }));
+                const content = transcoder.decode(resp.value, resp.flags);
+                obsReqHandler.end();
+                return new crudoptypes_1.GetResult({
+                    content: content,
+                    cas: resp.cas,
                 });
-            });
-        }, callback);
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * Unlocks a previously locked document.
@@ -804,22 +921,30 @@ class Collection {
         if (!options) {
             options = {};
         }
-        const timeout = options.timeout || this.cluster.kvTimeout;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
-            this._conn.unlock({
-                id: this._cppDocId(key),
-                cas,
-                timeout,
-                partition: 0,
-                opaque: 0,
-            }, (cppErr) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.Unlock, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            const cppDocId = this._cppDocId(key);
+            const timeout = options.timeout || this.cluster.kvTimeout;
+            obsReqHandler.setRequestKeyValueAttributes(cppDocId);
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, _] = await (0, observability_1.wrapObservableBindingCall)(this._conn.unlock.bind(this._conn), {
+                    id: cppDocId,
+                    cas,
+                    timeout,
+                    partition: 0,
+                    opaque: 0,
+                }, obsReqHandler);
                 if (err) {
-                    return wrapCallback(err);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
-                wrapCallback(null);
-            });
-        }, callback);
+                obsReqHandler.end();
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * @internal
@@ -942,71 +1067,74 @@ class Collection {
         if (!options) {
             options = {};
         }
-        if (specs.length === 0) {
-            throw new errors_1.InvalidArgumentError(new Error('At least one lookup spec must be provided.'));
-        }
-        const cppSpecs = [];
-        for (let i = 0; i < specs.length; ++i) {
-            cppSpecs.push({
-                opcode_: specs[i]._op,
-                flags_: specs[i]._flags,
-                path_: specs[i]._path,
-                original_index_: i,
-            });
-        }
-        const timeout = options.timeout || this.cluster.kvTimeout;
-        const accessDeleted = options.accessDeleted || false;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
-            this._conn.lookupIn({
-                id: this._cppDocId(key),
-                specs: cppSpecs,
-                timeout,
-                partition: 0,
-                opaque: 0,
-                access_deleted: accessDeleted,
-            }, (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
-                if (resp && resp.fields) {
-                    const content = [];
-                    for (let i = 0; i < resp.fields.length; ++i) {
-                        const itemRes = resp.fields[i];
-                        const error = (0, bindingutilities_1.errorFromCpp)(itemRes.ec);
-                        let value = undefined;
-                        if (itemRes.value && itemRes.value.length > 0) {
-                            value = this._subdocDecode(itemRes.value);
-                        }
-                        if (itemRes.opcode === binding_1.default.protocol_subdoc_opcode.exists) {
-                            value = itemRes.exists;
-                        }
-                        content.push(new crudoptypes_1.LookupInResultEntry({
-                            error,
-                            value,
-                        }));
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.LookupIn, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            if (specs.length === 0) {
+                throw new errors_1.InvalidArgumentError(new Error('At least one lookup spec must be provided.'));
+            }
+            const cppDocId = this._cppDocId(key);
+            const cppSpecs = [];
+            for (let i = 0; i < specs.length; ++i) {
+                cppSpecs.push({
+                    opcode_: specs[i]._op,
+                    flags_: specs[i]._flags,
+                    path_: specs[i]._path,
+                    original_index_: i,
+                });
+            }
+            const timeout = options.timeout || this.cluster.kvTimeout;
+            const accessDeleted = options.accessDeleted || false;
+            obsReqHandler.setRequestKeyValueAttributes(cppDocId);
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.lookupIn.bind(this._conn), {
+                    id: cppDocId,
+                    specs: cppSpecs,
+                    timeout,
+                    partition: 0,
+                    opaque: 0,
+                    access_deleted: accessDeleted,
+                }, obsReqHandler);
+                if (err) {
+                    obsReqHandler.endWithError(err);
+                    throw err;
+                }
+                const content = [];
+                for (let i = 0; i < resp.fields.length; ++i) {
+                    const itemRes = resp.fields[i];
+                    const error = (0, bindingutilities_1.errorFromCpp)(itemRes.ec);
+                    let value = undefined;
+                    if (itemRes.value && itemRes.value.length > 0) {
+                        value = this._subdocDecode(itemRes.value);
                     }
-                    wrapCallback(err, new crudoptypes_1.LookupInResult({
-                        content: content,
-                        cas: resp.cas,
+                    if (itemRes.opcode === binding_1.default.protocol_subdoc_opcode.exists) {
+                        value = itemRes.exists;
+                    }
+                    content.push(new crudoptypes_1.LookupInResultEntry({
+                        error,
+                        value,
                     }));
-                    return;
                 }
-                wrapCallback(err, null);
-            });
-        }, callback);
+                obsReqHandler.end();
+                return new crudoptypes_1.LookupInResult({
+                    content: content,
+                    cas: resp.cas,
+                });
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * @internal
      */
-    _lookupInReplica(key, lookupInAllReplicas, specs, options, callback) {
-        if (options instanceof Function) {
-            callback = arguments[3];
-            options = undefined;
-        }
-        if (!options) {
-            options = {};
-        }
+    _lookupInReplica(key, obsReqHandler, specs, options, callback) {
         if (specs.length === 0) {
             throw new errors_1.InvalidArgumentError(new Error('At least one lookup spec must be provided.'));
         }
+        const cppDocId = this._cppDocId(key);
+        obsReqHandler.setRequestKeyValueAttributes(cppDocId);
         const emitter = new streamablepromises_1.StreamableReplicasPromise((replicas) => replicas);
         const cppSpecs = [];
         for (let i = 0; i < specs.length; ++i) {
@@ -1018,15 +1146,17 @@ class Collection {
             });
         }
         const timeout = options.timeout || this.cluster.kvTimeout;
-        if (lookupInAllReplicas) {
-            this._conn.lookupInAllReplicas({
-                id: this._cppDocId(key),
-                specs: cppSpecs,
-                timeout: timeout,
-                read_preference: (0, bindingutilities_1.readPreferenceToCpp)(options.readPreference),
-            }, (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+        if (obsReqHandler.opType == observabilitytypes_1.KeyValueOp.LookupInAllReplicas) {
+            utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.lookupInAllReplicas.bind(this._conn), {
+                    id: cppDocId,
+                    specs: cppSpecs,
+                    timeout: timeout,
+                    read_preference: (0, bindingutilities_1.readPreferenceToCpp)(options.readPreference),
+                    access_deleted: false, // only used in core transactions; false otherwise
+                }, obsReqHandler);
                 if (err) {
+                    obsReqHandler.endWithError(err);
                     emitter.emit('error', err);
                     emitter.emit('end');
                     return;
@@ -1054,19 +1184,21 @@ class Collection {
                         isReplica: replica.is_replica,
                     }));
                 });
+                obsReqHandler.end();
                 emitter.emit('end');
-                return;
             });
         }
         else {
-            this._conn.lookupInAnyReplica({
-                id: this._cppDocId(key),
-                specs: cppSpecs,
-                timeout: timeout,
-                read_preference: (0, bindingutilities_1.readPreferenceToCpp)(options.readPreference),
-            }, (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+            utilities_1.PromiseHelper.wrapAsync(async () => {
+                const [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.lookupInAnyReplica.bind(this._conn), {
+                    id: cppDocId,
+                    specs: cppSpecs,
+                    timeout: timeout,
+                    read_preference: (0, bindingutilities_1.readPreferenceToCpp)(options.readPreference),
+                    access_deleted: false, // only used in core transactions; false otherwise
+                }, obsReqHandler);
                 if (err) {
+                    obsReqHandler.endWithError(err);
                     emitter.emit('error', err);
                     emitter.emit('end');
                     return;
@@ -1092,8 +1224,8 @@ class Collection {
                     cas: resp.cas,
                     isReplica: resp.is_replica,
                 }));
+                obsReqHandler.end();
                 emitter.emit('end');
-                return;
             });
         }
         return utilities_1.PromiseHelper.wrapAsync(() => emitter, callback);
@@ -1113,10 +1245,20 @@ class Collection {
             callback = arguments[2];
             options = undefined;
         }
-        return utilities_1.PromiseHelper.wrapAsync(async () => {
-            const replicas = await this._lookupInReplica(key, false, specs, options);
-            return replicas[0];
-        }, callback);
+        if (!options) {
+            options = {};
+        }
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.LookupInAnyReplica, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                const replicas = await this._lookupInReplica(key, obsReqHandler, specs, options);
+                return replicas[0];
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * Performs a lookup-in operation against a document, fetching individual fields or
@@ -1129,7 +1271,21 @@ class Collection {
      * @param callback A node-style callback to be invoked after execution.
      */
     lookupInAllReplicas(key, specs, options, callback) {
-        return this._lookupInReplica(key, true, specs, options, callback);
+        if (options instanceof Function) {
+            callback = arguments[2];
+            options = undefined;
+        }
+        if (!options) {
+            options = {};
+        }
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.LookupInAllReplicas, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            return this._lookupInReplica(key, obsReqHandler, specs, options, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * Performs a mutate-in operation against a document.  Allowing atomic modification of
@@ -1148,34 +1304,43 @@ class Collection {
         if (!options) {
             options = {};
         }
-        if (specs.length === 0) {
-            throw new errors_1.InvalidArgumentError(new Error('At least one lookup spec must be provided.'));
-        }
-        const cppSpecs = [];
-        for (let i = 0; i < specs.length; ++i) {
-            cppSpecs.push({
-                opcode_: specs[i]._op,
-                flags_: specs[i]._flags,
-                path_: specs[i]._path,
-                value_: specs[i]._data
-                    ? this._subdocEncode(specs[i]._data)
-                    : specs[i]._data,
-                original_index_: 0,
-            });
-        }
-        const storeSemantics = options.upsertDocument
-            ? generaltypes_1.StoreSemantics.Upsert
-            : options.storeSemantics;
-        const expiry = (0, utilities_1.parseExpiry)(options.expiry);
-        const preserveExpiry = options.preserveExpiry;
-        const cas = options.cas;
-        const durabilityLevel = options.durabilityLevel;
-        const persistTo = options.durabilityPersistTo;
-        const replicateTo = options.durabilityReplicateTo;
-        const timeout = options.timeout || this._mutationTimeout(durabilityLevel);
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.MutateIn, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            if (specs.length === 0) {
+                throw new errors_1.InvalidArgumentError(new Error('At least one lookup spec must be provided.'));
+            }
+            const cppDocId = this._cppDocId(key);
+            const cppDurability = (0, bindingutilities_1.durabilityToCpp)(options.durabilityLevel);
+            const cppSpecs = [];
+            for (let i = 0; i < specs.length; ++i) {
+                let value = undefined;
+                if (specs[i]._data) {
+                    const [bytesValue, _] = obsReqHandler.maybeAddEncodingSpan(() => {
+                        const encoded = this._subdocEncode(specs[i]._data);
+                        return [encoded, 0]; // Flags are not needed for subdoc mutations
+                    });
+                    value = bytesValue;
+                }
+                cppSpecs.push({
+                    opcode_: specs[i]._op,
+                    flags_: specs[i]._flags,
+                    path_: specs[i]._path,
+                    value_: value,
+                    original_index_: 0,
+                });
+            }
+            const storeSemantics = options.upsertDocument
+                ? generaltypes_1.StoreSemantics.Upsert
+                : options.storeSemantics;
+            const expiry = (0, utilities_1.parseExpiry)(options.expiry);
+            const preserveExpiry = options.preserveExpiry;
+            const cas = options.cas;
+            const persistTo = options.durabilityPersistTo;
+            const replicateTo = options.durabilityReplicateTo;
+            const timeout = options.timeout || this._mutationTimeout(options.durabilityLevel);
+            obsReqHandler.setRequestKeyValueAttributes(cppDocId, cppDurability);
             const mutateInReq = {
-                id: this._cppDocId(key),
+                id: cppDocId,
                 store_semantics: (0, bindingutilities_1.storeSemanticToCpp)(storeSemantics),
                 specs: cppSpecs,
                 expiry,
@@ -1187,43 +1352,51 @@ class Collection {
                 access_deleted: false,
                 create_as_deleted: false,
             };
-            const mutateInCallback = (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
-                if (resp && resp.fields) {
-                    const content = [];
-                    for (let i = 0; i < resp.fields.length; ++i) {
-                        const itemRes = resp.fields[i];
-                        let value = undefined;
-                        if (itemRes.value && itemRes.value.length > 0) {
-                            value = this._subdocDecode(itemRes.value);
-                        }
-                        content.push(new crudoptypes_1.MutateInResultEntry({
-                            value,
-                        }));
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                let err = null;
+                let resp = null;
+                if (persistTo || replicateTo) {
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.mutateInWithLegacyDurability.bind(this._conn), {
+                        ...mutateInReq,
+                        persist_to: (0, bindingutilities_1.persistToToCpp)(persistTo),
+                        replicate_to: (0, bindingutilities_1.replicateToToCpp)(replicateTo),
+                    }, obsReqHandler);
+                }
+                else {
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.mutateIn.bind(this._conn), {
+                        ...mutateInReq,
+                        durability_level: cppDurability,
+                    }, obsReqHandler);
+                }
+                if (err) {
+                    obsReqHandler.endWithError(err);
+                    throw err;
+                }
+                const content = [];
+                for (let i = 0; i < resp.fields.length; ++i) {
+                    const itemRes = resp.fields[i];
+                    let value = undefined;
+                    if (itemRes.value && itemRes.value.length > 0) {
+                        value = this._subdocDecode(itemRes.value);
                     }
-                    wrapCallback(err, new crudoptypes_1.MutateInResult({
-                        content: content,
-                        cas: resp.cas,
-                        token: resp.token,
+                    content.push(new crudoptypes_1.MutateInResultEntry({
+                        value,
                     }));
-                    return;
                 }
-                wrapCallback(err, null);
-            };
-            if (persistTo || replicateTo) {
-                this._conn.mutateInWithLegacyDurability({
-                    ...mutateInReq,
-                    persist_to: (0, bindingutilities_1.persistToToCpp)(persistTo),
-                    replicate_to: (0, bindingutilities_1.replicateToToCpp)(replicateTo),
-                }, mutateInCallback);
-            }
-            else {
-                this._conn.mutateIn({
-                    ...mutateInReq,
-                    durability_level: (0, bindingutilities_1.durabilityToCpp)(durabilityLevel),
-                }, mutateInCallback);
-            }
-        }, callback);
+                obsReqHandler.end();
+                return new crudoptypes_1.MutateInResult({
+                    content: content,
+                    cas: resp.cas,
+                    token: resp.token,
+                });
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * Returns a CouchbaseList permitting simple list storage in a document.
@@ -1275,15 +1448,18 @@ class Collection {
         if (!options) {
             options = {};
         }
-        const initial_value = options.initial;
-        const expiry = (0, utilities_1.parseExpiry)(options.expiry);
-        const durabilityLevel = options.durabilityLevel;
-        const persistTo = options.durabilityPersistTo;
-        const replicateTo = options.durabilityReplicateTo;
-        const timeout = options.timeout || this.cluster.kvTimeout;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.Increment, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            const cppDocId = this._cppDocId(key);
+            const cppDurability = (0, bindingutilities_1.durabilityToCpp)(options.durabilityLevel);
+            const initial_value = options.initial;
+            const expiry = (0, utilities_1.parseExpiry)(options.expiry);
+            const persistTo = options.durabilityPersistTo;
+            const replicateTo = options.durabilityReplicateTo;
+            const timeout = options.timeout || this.cluster.kvTimeout;
+            obsReqHandler.setRequestKeyValueAttributes(cppDocId, cppDurability);
             const incrementReq = {
-                id: this._cppDocId(key),
+                id: cppDocId,
                 delta,
                 initial_value,
                 expiry: expiry,
@@ -1291,31 +1467,40 @@ class Collection {
                 partition: 0,
                 opaque: 0,
             };
-            const incrementCallback = (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                let err = null;
+                let resp = null;
+                if (persistTo || replicateTo) {
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.incrementWithLegacyDurability.bind(this._conn), {
+                        ...incrementReq,
+                        persist_to: (0, bindingutilities_1.persistToToCpp)(persistTo),
+                        replicate_to: (0, bindingutilities_1.replicateToToCpp)(replicateTo),
+                    }, obsReqHandler);
+                }
+                else {
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.increment.bind(this._conn), {
+                        ...incrementReq,
+                        durability_level: cppDurability,
+                    }, obsReqHandler);
+                }
                 if (err) {
-                    return wrapCallback(err, null);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
-                wrapCallback(err, new crudoptypes_1.CounterResult({
+                obsReqHandler.end();
+                return new crudoptypes_1.CounterResult({
                     cas: resp.cas,
                     token: resp.token,
                     value: resp.content,
-                }));
-            };
-            if (persistTo || replicateTo) {
-                this._conn.incrementWithLegacyDurability({
-                    ...incrementReq,
-                    persist_to: (0, bindingutilities_1.persistToToCpp)(persistTo),
-                    replicate_to: (0, bindingutilities_1.replicateToToCpp)(replicateTo),
-                }, incrementCallback);
-            }
-            else {
-                this._conn.increment({
-                    ...incrementReq,
-                    durability_level: (0, bindingutilities_1.durabilityToCpp)(durabilityLevel),
-                }, incrementCallback);
-            }
-        }, callback);
+                });
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * @internal
@@ -1328,15 +1513,18 @@ class Collection {
         if (!options) {
             options = {};
         }
-        const initial_value = options.initial;
-        const expiry = (0, utilities_1.parseExpiry)(options.expiry);
-        const durabilityLevel = options.durabilityLevel;
-        const persistTo = options.durabilityPersistTo;
-        const replicateTo = options.durabilityReplicateTo;
-        const timeout = options.timeout || this.cluster.kvTimeout;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.Decrement, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            const cppDocId = this._cppDocId(key);
+            const cppDurability = (0, bindingutilities_1.durabilityToCpp)(options.durabilityLevel);
+            const initial_value = options.initial;
+            const expiry = (0, utilities_1.parseExpiry)(options.expiry);
+            const persistTo = options.durabilityPersistTo;
+            const replicateTo = options.durabilityReplicateTo;
+            const timeout = options.timeout || this.cluster.kvTimeout;
+            obsReqHandler.setRequestKeyValueAttributes(cppDocId, cppDurability);
             const decrementReq = {
-                id: this._cppDocId(key),
+                id: cppDocId,
                 delta,
                 initial_value,
                 expiry: expiry,
@@ -1344,31 +1532,40 @@ class Collection {
                 partition: 0,
                 opaque: 0,
             };
-            const decrementCallback = (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                let err = null;
+                let resp = null;
+                if (persistTo || replicateTo) {
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.decrementWithLegacyDurability.bind(this._conn), {
+                        ...decrementReq,
+                        persist_to: (0, bindingutilities_1.persistToToCpp)(persistTo),
+                        replicate_to: (0, bindingutilities_1.replicateToToCpp)(replicateTo),
+                    }, obsReqHandler);
+                }
+                else {
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.decrement.bind(this._conn), {
+                        ...decrementReq,
+                        durability_level: cppDurability,
+                    }, obsReqHandler);
+                }
                 if (err) {
-                    return wrapCallback(err, null);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
-                wrapCallback(err, new crudoptypes_1.CounterResult({
+                obsReqHandler.end();
+                return new crudoptypes_1.CounterResult({
                     cas: resp.cas,
                     token: resp.token,
                     value: resp.content,
-                }));
-            };
-            if (persistTo || replicateTo) {
-                this._conn.decrementWithLegacyDurability({
-                    ...decrementReq,
-                    persist_to: (0, bindingutilities_1.persistToToCpp)(persistTo),
-                    replicate_to: (0, bindingutilities_1.replicateToToCpp)(replicateTo),
-                }, decrementCallback);
-            }
-            else {
-                this._conn.decrement({
-                    ...decrementReq,
-                    durability_level: (0, bindingutilities_1.durabilityToCpp)(durabilityLevel),
-                }, decrementCallback);
-            }
-        }, callback);
+                });
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * @internal
@@ -1381,47 +1578,59 @@ class Collection {
         if (!options) {
             options = {};
         }
-        const durabilityLevel = options.durabilityLevel;
-        const persistTo = options.durabilityPersistTo;
-        const replicateTo = options.durabilityReplicateTo;
-        const cas = options.cas;
-        const timeout = options.timeout || this.cluster.kvTimeout;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.Append, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            const cppDocId = this._cppDocId(key);
+            const cppDurability = (0, bindingutilities_1.durabilityToCpp)(options.durabilityLevel);
+            const persistTo = options.durabilityPersistTo;
+            const replicateTo = options.durabilityReplicateTo;
+            const cas = options.cas;
+            const timeout = options.timeout || this.cluster.kvTimeout;
+            obsReqHandler.setRequestKeyValueAttributes(cppDocId, cppDurability);
             if (!Buffer.isBuffer(value)) {
                 value = Buffer.from(value);
             }
             const appendReq = {
-                id: this._cppDocId(key),
+                id: cppDocId,
                 value,
                 cas: cas || binding_1.zeroCas,
                 timeout,
                 partition: 0,
                 opaque: 0,
             };
-            const appendCallback = (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                let err = null;
+                let resp = null;
+                if (persistTo || replicateTo) {
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.appendWithLegacyDurability.bind(this._conn), {
+                        ...appendReq,
+                        persist_to: (0, bindingutilities_1.persistToToCpp)(persistTo),
+                        replicate_to: (0, bindingutilities_1.replicateToToCpp)(replicateTo),
+                    }, obsReqHandler);
+                }
+                else {
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.append.bind(this._conn), {
+                        ...appendReq,
+                        durability_level: cppDurability,
+                    }, obsReqHandler);
+                }
                 if (err) {
-                    return wrapCallback(err, null);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
-                wrapCallback(err, new crudoptypes_1.MutationResult({
+                obsReqHandler.end();
+                return new crudoptypes_1.MutationResult({
                     cas: resp.cas,
                     token: resp.token,
-                }));
-            };
-            if (persistTo || replicateTo) {
-                this._conn.appendWithLegacyDurability({
-                    ...appendReq,
-                    persist_to: (0, bindingutilities_1.persistToToCpp)(persistTo),
-                    replicate_to: (0, bindingutilities_1.replicateToToCpp)(replicateTo),
-                }, appendCallback);
-            }
-            else {
-                this._conn.append({
-                    ...appendReq,
-                    durability_level: (0, bindingutilities_1.durabilityToCpp)(durabilityLevel),
-                }, appendCallback);
-            }
-        }, callback);
+                });
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * @internal
@@ -1434,47 +1643,59 @@ class Collection {
         if (!options) {
             options = {};
         }
-        const durabilityLevel = options.durabilityLevel;
-        const persistTo = options.durabilityPersistTo;
-        const replicateTo = options.durabilityReplicateTo;
-        const cas = options.cas;
-        const timeout = options.timeout || this.cluster.kvTimeout;
-        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+        const obsReqHandler = new observabilityhandler_1.ObservableRequestHandler(observabilitytypes_1.KeyValueOp.Prepend, this.observabilityInstruments, options === null || options === void 0 ? void 0 : options.parentSpan);
+        try {
+            const cppDocId = this._cppDocId(key);
+            const cppDurability = (0, bindingutilities_1.durabilityToCpp)(options.durabilityLevel);
+            const persistTo = options.durabilityPersistTo;
+            const replicateTo = options.durabilityReplicateTo;
+            const cas = options.cas;
+            const timeout = options.timeout || this.cluster.kvTimeout;
+            obsReqHandler.setRequestKeyValueAttributes(cppDocId, cppDurability);
             if (!Buffer.isBuffer(value)) {
                 value = Buffer.from(value);
             }
             const prependReq = {
-                id: this._cppDocId(key),
+                id: cppDocId,
                 value,
                 cas: cas || binding_1.zeroCas,
                 timeout,
                 partition: 0,
                 opaque: 0,
             };
-            const prependCallback = (cppErr, resp) => {
-                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+            return utilities_1.PromiseHelper.wrapAsync(async () => {
+                let err = null;
+                let resp = null;
+                if (persistTo || replicateTo) {
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.prependWithLegacyDurability.bind(this._conn), {
+                        ...prependReq,
+                        persist_to: (0, bindingutilities_1.persistToToCpp)(persistTo),
+                        replicate_to: (0, bindingutilities_1.replicateToToCpp)(replicateTo),
+                    }, obsReqHandler);
+                }
+                else {
+                    ;
+                    [err, resp] = await (0, observability_1.wrapObservableBindingCall)(this._conn.prepend.bind(this._conn), {
+                        ...prependReq,
+                        durability_level: cppDurability,
+                    }, obsReqHandler);
+                }
                 if (err) {
-                    return wrapCallback(err, null);
+                    obsReqHandler.endWithError(err);
+                    throw err;
                 }
-                wrapCallback(err, new crudoptypes_1.MutationResult({
+                obsReqHandler.end();
+                return new crudoptypes_1.MutationResult({
                     cas: resp.cas,
                     token: resp.token,
-                }));
-            };
-            if (persistTo || replicateTo) {
-                this._conn.prependWithLegacyDurability({
-                    ...prependReq,
-                    persist_to: (0, bindingutilities_1.persistToToCpp)(persistTo),
-                    replicate_to: (0, bindingutilities_1.replicateToToCpp)(replicateTo),
-                }, prependCallback);
-            }
-            else {
-                this._conn.prepend({
-                    ...prependReq,
-                    durability_level: (0, bindingutilities_1.durabilityToCpp)(durabilityLevel),
-                }, prependCallback);
-            }
-        }, callback);
+                });
+            }, callback);
+        }
+        catch (e) {
+            obsReqHandler.endWithError(e);
+            throw e;
+        }
     }
     /**
      * Returns a CollectionQueryIndexManager which can be used to manage the query indexes