@azure/storage-blob 12.13.0-alpha.20230120.2 → 12.13.0-alpha.20230124.2

package/dist-esm/storage-blob/src/Clients.js

@@ -2,7 +2,6 @@ import { __asyncDelegator, __asyncGenerator, __asyncValues, __await } from "tsli
 import { getDefaultProxySettings, } from "@azure/core-rest-pipeline";
 import { isTokenCredential } from "@azure/core-auth";
 import { isNode } from "@azure/core-util";
-import { SpanStatusCode } from "@azure/core-tracing";
 import { v4 as generateUuid } from "uuid";
 import { BlobDownloadResponse } from "./BlobDownloadResponse";
 import { BlobQueryResponse } from "./BlobQueryResponse";
@@ -17,7 +16,7 @@ import { StorageClient } from "./StorageClient";
 import { Batch } from "./utils/Batch";
 import { BufferScheduler } from "../../storage-common/src";
 import { BlobDoesNotUseCustomerSpecifiedEncryption, BlobUsesCustomerSpecifiedEncryptionMsg, BLOCK_BLOB_MAX_BLOCKS, BLOCK_BLOB_MAX_STAGE_BLOCK_BYTES, BLOCK_BLOB_MAX_UPLOAD_BLOB_BYTES, DEFAULT_BLOB_DOWNLOAD_BLOCK_BYTES, DEFAULT_BLOCK_BUFFER_SIZE_BYTES, DEFAULT_MAX_DOWNLOAD_RETRY_REQUESTS, ETagAny, URLConstants, } from "./utils/constants";
-import { createSpan } from "./utils/tracing";
+import { tracingClient } from "./utils/tracing";
 import { appendToURLPath, appendToURLQuery, assertResponse, extractConnectionStringParts, ExtractPageRangeInfoItems, generateBlockID, getURLParameter, httpAuthorizationToString, isIpEndpointStyle, parseObjectReplicationRecord, setURLParameter, toBlobTags, toBlobTagsString, toQuerySerialization, toTags, } from "./utils/utils.common";
 import { fsCreateReadStream, fsStat, readStreamToLocalFile, streamToBuffer, } from "./utils/utils.node";
 import { generateBlobSASQueryParameters } from "./sas/BlobSASSignatureValues";
@@ -209,12 +208,11 @@ export class BlobClient extends StorageClient {
      * ```
      */
     async download(offset = 0, count, options = {}) {
-        var _a;
         options.conditions = options.conditions || {};
         options.conditions = options.conditions || {};
         ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-        const { span, updatedOptions } = createSpan("BlobClient-download", options);
-        try {
+        return tracingClient.withSpan("BlobClient-download", options, async (updatedOptions) => {
+            var _a;
             const res = assertResponse(await this.blobContext.download({
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -280,17 +278,7 @@ export class BlobClient extends StorageClient {
                 maxRetryRequests: options.maxRetryRequests,
                 onProgress: options.onProgress,
             });
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Returns true if the Azure blob resource represented by this client exists; false otherwise.
@@ -302,37 +290,31 @@ export class BlobClient extends StorageClient {
      * @param options - options to Exists operation.
      */
     async exists(options = {}) {
-        const { span, updatedOptions } = createSpan("BlobClient-exists", options);
-        try {
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            await this.getProperties({
-                abortSignal: options.abortSignal,
-                customerProvidedKey: options.customerProvidedKey,
-                conditions: options.conditions,
-                tracingOptions: updatedOptions.tracingOptions,
-            });
-            return true;
-        }
-        catch (e) {
-            if (e.statusCode === 404) {
-                // Expected exception when checking blob existence
-                return false;
-            }
-            else if (e.statusCode === 409 &&
-                (e.details.errorCode === BlobUsesCustomerSpecifiedEncryptionMsg ||
-                    e.details.errorCode === BlobDoesNotUseCustomerSpecifiedEncryption)) {
-                // Expected exception when checking blob existence
+        return tracingClient.withSpan("BlobClient-exists", options, async (updatedOptions) => {
+            try {
+                ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+                await this.getProperties({
+                    abortSignal: options.abortSignal,
+                    customerProvidedKey: options.customerProvidedKey,
+                    conditions: options.conditions,
+                    tracingOptions: updatedOptions.tracingOptions,
+                });
                 return true;
             }
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (e.statusCode === 404) {
+                    // Expected exception when checking blob existence
+                    return false;
+                }
+                else if (e.statusCode === 409 &&
+                    (e.details.errorCode === BlobUsesCustomerSpecifiedEncryptionMsg ||
+                        e.details.errorCode === BlobDoesNotUseCustomerSpecifiedEncryption)) {
+                    // Expected exception when checking blob existence
+                    return true;
+                }
+                throw e;
+            }
+        });
     }
     /**
      * Returns all user-defined metadata, standard HTTP properties, and system properties
@@ -347,11 +329,10 @@ export class BlobClient extends StorageClient {
      * @param options - Optional options to Get Properties operation.
      */
     async getProperties(options = {}) {
-        var _a;
-        const { span, updatedOptions } = createSpan("BlobClient-getProperties", options);
-        try {
-            options.conditions = options.conditions || {};
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        options.conditions = options.conditions || {};
+        ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        return tracingClient.withSpan("BlobClient-getProperties", options, async (updatedOptions) => {
+            var _a;
             const res = assertResponse(await this.blobContext.getProperties({
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -360,17 +341,7 @@ export class BlobClient extends StorageClient {
                 tracingOptions: updatedOptions.tracingOptions,
             }));
             return Object.assign(Object.assign({}, res), { _response: res._response, objectReplicationDestinationPolicyId: res.objectReplicationPolicyId, objectReplicationSourceProperties: parseObjectReplicationRecord(res.objectReplicationRules) });
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Marks the specified blob or snapshot for deletion. The blob is later deleted
@@ -382,10 +353,9 @@ export class BlobClient extends StorageClient {
      * @param options - Optional options to Blob Delete operation.
      */
     async delete(options = {}) {
-        var _a;
-        const { span, updatedOptions } = createSpan("BlobClient-delete", options);
         options.conditions = options.conditions || {};
-        try {
+        return tracingClient.withSpan("BlobClient-delete", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this.blobContext.delete({
                 abortSignal: options.abortSignal,
                 deleteSnapshots: options.deleteSnapshots,
@@ -393,17 +363,7 @@ export class BlobClient extends StorageClient {
                 modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Marks the specified blob or snapshot for deletion if it exists. The blob is later deleted
@@ -415,29 +375,19 @@ export class BlobClient extends StorageClient {
      * @param options - Optional options to Blob Delete operation.
      */
     async deleteIfExists(options = {}) {
-        var _a, _b;
-        const { span, updatedOptions } = createSpan("BlobClient-deleteIfExists", options);
-        try {
-            const res = assertResponse(await this.delete(updatedOptions));
-            return Object.assign(Object.assign({ succeeded: true }, res), { _response: res._response });
-        }
-        catch (e) {
-            if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "BlobNotFound") {
-                span.setStatus({
-                    code: SpanStatusCode.ERROR,
-                    message: "Expected exception when deleting a blob or snapshot only if it exists.",
-                });
-                return Object.assign(Object.assign({ succeeded: false }, (_b = e.response) === null || _b === void 0 ? void 0 : _b.parsedHeaders), { _response: e.response });
+        return tracingClient.withSpan("BlobClient-deleteIfExists", options, async (updatedOptions) => {
+            var _a, _b;
+            try {
+                const res = assertResponse(await this.delete(updatedOptions));
+                return Object.assign(Object.assign({ succeeded: true }, res), { _response: res._response });
             }
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "BlobNotFound") {
+                    return Object.assign(Object.assign({ succeeded: false }, (_b = e.response) === null || _b === void 0 ? void 0 : _b.parsedHeaders), { _response: e.response });
+                }
+                throw e;
+            }
+        });
     }
     /**
      * Restores the contents and metadata of soft deleted blob and any associated
@@ -448,23 +398,12 @@ export class BlobClient extends StorageClient {
      * @param options - Optional options to Blob Undelete operation.
      */
     async undelete(options = {}) {
-        const { span, updatedOptions } = createSpan("BlobClient-undelete", options);
-        try {
+        return tracingClient.withSpan("BlobClient-undelete", options, async (updatedOptions) => {
             return assertResponse(await this.blobContext.undelete({
                 abortSignal: options.abortSignal,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Sets system properties on the blob.
@@ -482,11 +421,10 @@ export class BlobClient extends StorageClient {
      * @param options - Optional options to Blob Set HTTP Headers operation.
      */
     async setHTTPHeaders(blobHTTPHeaders, options = {}) {
-        var _a;
-        const { span, updatedOptions } = createSpan("BlobClient-setHTTPHeaders", options);
         options.conditions = options.conditions || {};
-        try {
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        return tracingClient.withSpan("BlobClient-setHTTPHeaders", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this.blobContext.setHttpHeaders({
                 abortSignal: options.abortSignal,
                 blobHttpHeaders: blobHTTPHeaders,
@@ -495,17 +433,7 @@ export class BlobClient extends StorageClient {
                 // cpkInfo: options.customerProvidedKey, // CPK is not included in Swagger, should change this back when this issue is fixed in Swagger.
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Sets user-defined metadata for the specified blob as one or more name-value pairs.
@@ -519,11 +447,10 @@ export class BlobClient extends StorageClient {
      * @param options - Optional options to Set Metadata operation.
      */
     async setMetadata(metadata, options = {}) {
-        var _a;
-        const { span, updatedOptions } = createSpan("BlobClient-setMetadata", options);
         options.conditions = options.conditions || {};
-        try {
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        return tracingClient.withSpan("BlobClient-setMetadata", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this.blobContext.setMetadata({
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -533,17 +460,7 @@ export class BlobClient extends StorageClient {
                 encryptionScope: options.encryptionScope,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Sets tags on the underlying blob.
@@ -555,9 +472,8 @@ export class BlobClient extends StorageClient {
      * @param options -
      */
     async setTags(tags, options = {}) {
-        var _a;
-        const { span, updatedOptions } = createSpan("BlobClient-setTags", options);
-        try {
+        return tracingClient.withSpan("BlobClient-setTags", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this.blobContext.setTags({
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -565,17 +481,7 @@ export class BlobClient extends StorageClient {
                 tracingOptions: updatedOptions.tracingOptions,
                 tags: toBlobTags(tags),
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Gets the tags associated with the underlying blob.
@@ -583,9 +489,8 @@ export class BlobClient extends StorageClient {
      * @param options -
      */
     async getTags(options = {}) {
-        var _a;
-        const { span, updatedOptions } = createSpan("BlobClient-getTags", options);
-        try {
+        return tracingClient.withSpan("BlobClient-getTags", options, async (updatedOptions) => {
+            var _a;
             const response = assertResponse(await this.blobContext.getTags({
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -594,17 +499,7 @@ export class BlobClient extends StorageClient {
             }));
             const wrappedResponse = Object.assign(Object.assign({}, response), { _response: response._response, tags: toTags({ blobTagSet: response.blobTagSet }) || {} });
             return wrappedResponse;
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Get a {@link BlobLeaseClient} that manages leases on the blob.
@@ -622,11 +517,10 @@ export class BlobClient extends StorageClient {
      * @param options - Optional options to the Blob Create Snapshot operation.
      */
     async createSnapshot(options = {}) {
-        var _a;
-        const { span, updatedOptions } = createSpan("BlobClient-createSnapshot", options);
         options.conditions = options.conditions || {};
-        try {
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        return tracingClient.withSpan("BlobClient-createSnapshot", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this.blobContext.createSnapshot({
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -636,17 +530,7 @@ export class BlobClient extends StorageClient {
                 encryptionScope: options.encryptionScope,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Asynchronously copies a blob to a destination within the storage account.
@@ -748,24 +632,13 @@ export class BlobClient extends StorageClient {
      * @param options - Optional options to the Blob Abort Copy From URL operation.
      */
     async abortCopyFromURL(copyId, options = {}) {
-        const { span, updatedOptions } = createSpan("BlobClient-abortCopyFromURL", options);
-        try {
+        return tracingClient.withSpan("BlobClient-abortCopyFromURL", options, async (updatedOptions) => {
             return assertResponse(await this.blobContext.abortCopyFromURL(copyId, {
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * The synchronous Copy From URL operation copies a blob or an internet resource to a new blob. It will not
@@ -776,44 +649,33 @@ export class BlobClient extends StorageClient {
      * @param options -
      */
     async syncCopyFromURL(copySource, options = {}) {
-        var _a, _b, _c;
-        const { span, updatedOptions } = createSpan("BlobClient-syncCopyFromURL", options);
         options.conditions = options.conditions || {};
         options.sourceConditions = options.sourceConditions || {};
-        try {
+        return tracingClient.withSpan("BlobClient-syncCopyFromURL", options, async (updatedOptions) => {
+            var _a, _b, _c, _d, _e, _f, _g;
             return assertResponse(await this.blobContext.copyFromURL(copySource, {
                 abortSignal: options.abortSignal,
                 metadata: options.metadata,
                 leaseAccessConditions: options.conditions,
                 modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
                 sourceModifiedAccessConditions: {
-                    sourceIfMatch: options.sourceConditions.ifMatch,
-                    sourceIfModifiedSince: options.sourceConditions.ifModifiedSince,
-                    sourceIfNoneMatch: options.sourceConditions.ifNoneMatch,
-                    sourceIfUnmodifiedSince: options.sourceConditions.ifUnmodifiedSince,
+                    sourceIfMatch: (_b = options.sourceConditions) === null || _b === void 0 ? void 0 : _b.ifMatch,
+                    sourceIfModifiedSince: (_c = options.sourceConditions) === null || _c === void 0 ? void 0 : _c.ifModifiedSince,
+                    sourceIfNoneMatch: (_d = options.sourceConditions) === null || _d === void 0 ? void 0 : _d.ifNoneMatch,
+                    sourceIfUnmodifiedSince: (_e = options.sourceConditions) === null || _e === void 0 ? void 0 : _e.ifUnmodifiedSince,
                 },
                 sourceContentMD5: options.sourceContentMD5,
                 copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization),
                 tier: toAccessTier(options.tier),
                 blobTagsString: toBlobTagsString(options.tags),
-                immutabilityPolicyExpiry: (_b = options.immutabilityPolicy) === null || _b === void 0 ? void 0 : _b.expiriesOn,
-                immutabilityPolicyMode: (_c = options.immutabilityPolicy) === null || _c === void 0 ? void 0 : _c.policyMode,
+                immutabilityPolicyExpiry: (_f = options.immutabilityPolicy) === null || _f === void 0 ? void 0 : _f.expiriesOn,
+                immutabilityPolicyMode: (_g = options.immutabilityPolicy) === null || _g === void 0 ? void 0 : _g.policyMode,
                 legalHold: options.legalHold,
                 encryptionScope: options.encryptionScope,
                 copySourceTags: options.copySourceTags,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Sets the tier on a blob. The operation is allowed on a page blob in a premium
@@ -827,9 +689,8 @@ export class BlobClient extends StorageClient {
      * @param options - Optional options to the Blob Set Tier operation.
      */
     async setAccessTier(tier, options = {}) {
-        var _a;
-        const { span, updatedOptions } = createSpan("BlobClient-setAccessTier", options);
-        try {
+        return tracingClient.withSpan("BlobClient-setAccessTier", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this.blobContext.setTier(toAccessTier(tier), {
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -837,19 +698,10 @@ export class BlobClient extends StorageClient {
                 rehydratePriority: options.rehydratePriority,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     async downloadToBuffer(param1, param2, param3, param4 = {}) {
+        var _a;
         let buffer;
         let offset = 0;
         let count = 0;
@@ -864,26 +716,23 @@ export class BlobClient extends StorageClient {
             count = typeof param2 === "number" ? param2 : 0;
             options = param3 || {};
         }
-        const { span, updatedOptions } = createSpan("BlobClient-downloadToBuffer", options);
-        try {
-            if (!options.blockSize) {
-                options.blockSize = 0;
-            }
-            if (options.blockSize < 0) {
-                throw new RangeError("blockSize option must be >= 0");
-            }
-            if (options.blockSize === 0) {
-                options.blockSize = DEFAULT_BLOB_DOWNLOAD_BLOCK_BYTES;
-            }
-            if (offset < 0) {
-                throw new RangeError("offset option must be >= 0");
-            }
-            if (count && count <= 0) {
-                throw new RangeError("count option must be greater than 0");
-            }
-            if (!options.conditions) {
-                options.conditions = {};
-            }
+        let blockSize = (_a = options.blockSize) !== null && _a !== void 0 ? _a : 0;
+        if (blockSize < 0) {
+            throw new RangeError("blockSize option must be >= 0");
+        }
+        if (blockSize === 0) {
+            blockSize = DEFAULT_BLOB_DOWNLOAD_BLOCK_BYTES;
+        }
+        if (offset < 0) {
+            throw new RangeError("offset option must be >= 0");
+        }
+        if (count && count <= 0) {
+            throw new RangeError("count option must be greater than 0");
+        }
+        if (!options.conditions) {
+            options.conditions = {};
+        }
+        return tracingClient.withSpan("BlobClient-downloadToBuffer", options, async (updatedOptions) => {
             // Customer doesn't specify length, get it
             if (!count) {
                 const response = await this.getProperties(Object.assign(Object.assign({}, options), { tracingOptions: updatedOptions.tracingOptions }));
@@ -906,12 +755,12 @@ export class BlobClient extends StorageClient {
             }
             let transferProgress = 0;
             const batch = new Batch(options.concurrency);
-            for (let off = offset; off < offset + count; off = off + options.blockSize) {
+            for (let off = offset; off < offset + count; off = off + blockSize) {
                 batch.addOperation(async () => {
                     // Exclusive chunk end position
                     let chunkEnd = offset + count;
-                    if (off + options.blockSize < chunkEnd) {
-                        chunkEnd = off + options.blockSize;
+                    if (off + blockSize < chunkEnd) {
+                        chunkEnd = off + blockSize;
                     }
                     const response = await this.download(off, chunkEnd - off, {
                         abortSignal: options.abortSignal,
@@ -933,17 +782,7 @@ export class BlobClient extends StorageClient {
             }
             await batch.do();
             return buffer;
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * ONLY AVAILABLE IN NODE.JS RUNTIME.
@@ -962,8 +801,7 @@ export class BlobClient extends StorageClient {
      *                                                 at the specified path.
      */
     async downloadToFile(filePath, offset = 0, count, options = {}) {
-        const { span, updatedOptions } = createSpan("BlobClient-downloadToFile", options);
-        try {
+        return tracingClient.withSpan("BlobClient-downloadToFile", options, async (updatedOptions) => {
             const response = await this.download(offset, count, Object.assign(Object.assign({}, options), { tracingOptions: updatedOptions.tracingOptions }));
             if (response.readableStreamBody) {
                 await readStreamToLocalFile(response.readableStreamBody, filePath);
@@ -971,17 +809,7 @@ export class BlobClient extends StorageClient {
             // The stream is no longer accessible so setting it to undefined.
             response.blobDownloadStream = undefined;
             return response;
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     getBlobAndContainerNamesFromUrl() {
         let containerName;
@@ -1046,11 +874,10 @@ export class BlobClient extends StorageClient {
      * @param options - Optional options to the Blob Start Copy From URL operation.
      */
     async startCopyFromURL(copySource, options = {}) {
-        var _a, _b, _c;
-        const { span, updatedOptions } = createSpan("BlobClient-startCopyFromURL", options);
-        options.conditions = options.conditions || {};
-        options.sourceConditions = options.sourceConditions || {};
-        try {
+        return tracingClient.withSpan("BlobClient-startCopyFromURL", options, async (updatedOptions) => {
+            var _a, _b, _c;
+            options.conditions = options.conditions || {};
+            options.sourceConditions = options.sourceConditions || {};
             return assertResponse(await this.blobContext.startCopyFromURL(copySource, {
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -1072,17 +899,7 @@ export class BlobClient extends StorageClient {
                 sealBlob: options.sealBlob,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Only available for BlobClient constructed with a shared key credential.
@@ -1109,71 +926,38 @@ export class BlobClient extends StorageClient {
      *
      * @param options - Optional options to delete immutability policy on the blob.
      */
-    async deleteImmutabilityPolicy(options) {
-        const { span, updatedOptions } = createSpan("BlobClient-deleteImmutabilityPolicy", options);
-        try {
+    async deleteImmutabilityPolicy(options = {}) {
+        return tracingClient.withSpan("BlobClient-deleteImmutabilityPolicy", options, async (updatedOptions) => {
             return assertResponse(await this.blobContext.deleteImmutabilityPolicy({
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
-     * Set immutablility policy on the blob.
+     * Set immutability policy on the blob.
      *
      * @param options - Optional options to set immutability policy on the blob.
      */
-    async setImmutabilityPolicy(immutabilityPolicy, options) {
-        const { span, updatedOptions } = createSpan("BlobClient-setImmutabilityPolicy", options);
-        try {
+    async setImmutabilityPolicy(immutabilityPolicy, options = {}) {
+        return tracingClient.withSpan("BlobClient-setImmutabilityPolicy", options, async (updatedOptions) => {
             return assertResponse(await this.blobContext.setImmutabilityPolicy({
                 immutabilityPolicyExpiry: immutabilityPolicy.expiriesOn,
                 immutabilityPolicyMode: immutabilityPolicy.policyMode,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Set legal hold on the blob.
      *
      * @param options - Optional options to set legal hold on the blob.
      */
-    async setLegalHold(legalHoldEnabled, options) {
-        const { span, updatedOptions } = createSpan("BlobClient-setLegalHold", options);
-        try {
+    async setLegalHold(legalHoldEnabled, options = {}) {
+        return tracingClient.withSpan("BlobClient-setLegalHold", options, async (updatedOptions) => {
             return assertResponse(await this.blobContext.setLegalHold(legalHoldEnabled, {
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
 }
 /**
@@ -1273,11 +1057,10 @@ export class AppendBlobClient extends BlobClient {
      * ```
      */
     async create(options = {}) {
-        var _a, _b, _c;
-        const { span, updatedOptions } = createSpan("AppendBlobClient-create", options);
         options.conditions = options.conditions || {};
-        try {
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        return tracingClient.withSpan("AppendBlobClient-create", options, async (updatedOptions) => {
+            var _a, _b, _c;
             return assertResponse(await this.appendBlobContext.create(0, {
                 abortSignal: options.abortSignal,
                 blobHttpHeaders: options.blobHTTPHeaders,
@@ -1292,17 +1075,7 @@ export class AppendBlobClient extends BlobClient {
                 blobTagsString: toBlobTagsString(options.tags),
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Creates a 0-length append blob. Call AppendBlock to append data to an append blob.
@@ -1312,30 +1085,20 @@ export class AppendBlobClient extends BlobClient {
      * @param options -
      */
     async createIfNotExists(options = {}) {
-        var _a, _b;
-        const { span, updatedOptions } = createSpan("AppendBlobClient-createIfNotExists", options);
         const conditions = { ifNoneMatch: ETagAny };
-        try {
-            const res = assertResponse(await this.create(Object.assign(Object.assign({}, updatedOptions), { conditions })));
-            return Object.assign(Object.assign({ succeeded: true }, res), { _response: res._response });
-        }
-        catch (e) {
-            if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "BlobAlreadyExists") {
-                span.setStatus({
-                    code: SpanStatusCode.ERROR,
-                    message: "Expected exception when creating a blob only if it does not already exist.",
-                });
-                return Object.assign(Object.assign({ succeeded: false }, (_b = e.response) === null || _b === void 0 ? void 0 : _b.parsedHeaders), { _response: e.response });
+        return tracingClient.withSpan("AppendBlobClient-createIfNotExists", options, async (updatedOptions) => {
+            var _a, _b;
+            try {
+                const res = assertResponse(await this.create(Object.assign(Object.assign({}, updatedOptions), { conditions })));
+                return Object.assign(Object.assign({ succeeded: true }, res), { _response: res._response });
             }
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "BlobAlreadyExists") {
+                    return Object.assign(Object.assign({ succeeded: false }, (_b = e.response) === null || _b === void 0 ? void 0 : _b.parsedHeaders), { _response: e.response });
+                }
+                throw e;
+            }
+        });
     }
     /**
      * Seals the append blob, making it read only.
@@ -1343,10 +1106,9 @@ export class AppendBlobClient extends BlobClient {
      * @param options -
      */
     async seal(options = {}) {
-        var _a;
-        const { span, updatedOptions } = createSpan("AppendBlobClient-seal", options);
         options.conditions = options.conditions || {};
-        try {
+        return tracingClient.withSpan("AppendBlobClient-seal", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this.appendBlobContext.seal({
                 abortSignal: options.abortSignal,
                 appendPositionAccessConditions: options.conditions,
@@ -1354,17 +1116,7 @@ export class AppendBlobClient extends BlobClient {
                 modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Commits a new block of data to the end of the existing append blob.
@@ -1391,11 +1143,10 @@ export class AppendBlobClient extends BlobClient {
      * ```
      */
     async appendBlock(body, contentLength, options = {}) {
-        var _a;
-        const { span, updatedOptions } = createSpan("AppendBlobClient-appendBlock", options);
         options.conditions = options.conditions || {};
-        try {
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        return tracingClient.withSpan("AppendBlobClient-appendBlock", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this.appendBlobContext.appendBlock(contentLength, body, {
                 abortSignal: options.abortSignal,
                 appendPositionAccessConditions: options.conditions,
@@ -1410,17 +1161,7 @@ export class AppendBlobClient extends BlobClient {
                 encryptionScope: options.encryptionScope,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * The Append Block operation commits a new block of data to the end of an existing append blob
@@ -1437,12 +1178,11 @@ export class AppendBlobClient extends BlobClient {
      * @param options -
      */
     async appendBlockFromURL(sourceURL, sourceOffset, count, options = {}) {
-        var _a;
-        const { span, updatedOptions } = createSpan("AppendBlobClient-appendBlockFromURL", options);
         options.conditions = options.conditions || {};
         options.sourceConditions = options.sourceConditions || {};
-        try {
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        return tracingClient.withSpan("AppendBlobClient-appendBlockFromURL", options, async (updatedOptions) => {
+            var _a, _b, _c, _d, _e;
             return assertResponse(await this.appendBlobContext.appendBlockFromUrl(sourceURL, 0, {
                 abortSignal: options.abortSignal,
                 sourceRange: rangeToString({ offset: sourceOffset, count }),
@@ -1452,27 +1192,17 @@ export class AppendBlobClient extends BlobClient {
                 appendPositionAccessConditions: options.conditions,
                 modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
                 sourceModifiedAccessConditions: {
-                    sourceIfMatch: options.sourceConditions.ifMatch,
-                    sourceIfModifiedSince: options.sourceConditions.ifModifiedSince,
-                    sourceIfNoneMatch: options.sourceConditions.ifNoneMatch,
-                    sourceIfUnmodifiedSince: options.sourceConditions.ifUnmodifiedSince,
+                    sourceIfMatch: (_b = options.sourceConditions) === null || _b === void 0 ? void 0 : _b.ifMatch,
+                    sourceIfModifiedSince: (_c = options.sourceConditions) === null || _c === void 0 ? void 0 : _c.ifModifiedSince,
+                    sourceIfNoneMatch: (_d = options.sourceConditions) === null || _d === void 0 ? void 0 : _d.ifNoneMatch,
+                    sourceIfUnmodifiedSince: (_e = options.sourceConditions) === null || _e === void 0 ? void 0 : _e.ifUnmodifiedSince,
                 },
                 copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization),
                 cpkInfo: options.customerProvidedKey,
                 encryptionScope: options.encryptionScope,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
 }
 /**
@@ -1589,14 +1319,12 @@ export class BlockBlobClient extends BlobClient {
      * @param options -
      */
     async query(query, options = {}) {
-        var _a;
         ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-        const { span, updatedOptions } = createSpan("BlockBlobClient-query", options);
-        try {
-            if (!isNode) {
-                throw new Error("This operation currently is only supported in Node.js.");
-            }
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        if (!isNode) {
+            throw new Error("This operation currently is only supported in Node.js.");
+        }
+        return tracingClient.withSpan("BlockBlobClient-query", options, async (updatedOptions) => {
+            var _a;
             const response = assertResponse(await this._blobContext.query({
                 abortSignal: options.abortSignal,
                 queryRequest: {
@@ -1615,17 +1343,7 @@ export class BlockBlobClient extends BlobClient {
                 onProgress: options.onProgress,
                 onError: options.onError,
             });
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Creates a new block blob, or updates the content of an existing block blob.
@@ -1655,11 +1373,10 @@ export class BlockBlobClient extends BlobClient {
      * ```
      */
     async upload(body, contentLength, options = {}) {
-        var _a, _b, _c;
         options.conditions = options.conditions || {};
-        const { span, updatedOptions } = createSpan("BlockBlobClient-upload", options);
-        try {
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        return tracingClient.withSpan("BlockBlobClient-upload", options, async (updatedOptions) => {
+            var _a, _b, _c;
             return assertResponse(await this.blockBlobContext.upload(contentLength, body, {
                 abortSignal: options.abortSignal,
                 blobHttpHeaders: options.blobHTTPHeaders,
@@ -1678,17 +1395,7 @@ export class BlockBlobClient extends BlobClient {
                 blobTagsString: toBlobTagsString(options.tags),
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Creates a new Block Blob where the contents of the blob are read from a given URL.
@@ -1709,29 +1416,18 @@ export class BlockBlobClient extends BlobClient {
      * @param options - Optional parameters.
      */
     async syncUploadFromURL(sourceURL, options = {}) {
-        var _a, _b, _c, _d, _e;
         options.conditions = options.conditions || {};
-        const { span, updatedOptions } = createSpan("BlockBlobClient-syncUploadFromURL", options);
-        try {
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            return assertResponse(await this.blockBlobContext.putBlobFromUrl(0, sourceURL, Object.assign(Object.assign({}, options), { blobHttpHeaders: options.blobHTTPHeaders, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: options.conditions.tagConditions }), sourceModifiedAccessConditions: {
-                    sourceIfMatch: (_a = options.sourceConditions) === null || _a === void 0 ? void 0 : _a.ifMatch,
-                    sourceIfModifiedSince: (_b = options.sourceConditions) === null || _b === void 0 ? void 0 : _b.ifModifiedSince,
-                    sourceIfNoneMatch: (_c = options.sourceConditions) === null || _c === void 0 ? void 0 : _c.ifNoneMatch,
-                    sourceIfUnmodifiedSince: (_d = options.sourceConditions) === null || _d === void 0 ? void 0 : _d.ifUnmodifiedSince,
-                    sourceIfTags: (_e = options.sourceConditions) === null || _e === void 0 ? void 0 : _e.tagConditions,
+        ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        return tracingClient.withSpan("BlockBlobClient-syncUploadFromURL", options, async (updatedOptions) => {
+            var _a, _b, _c, _d, _e, _f;
+            return assertResponse(await this.blockBlobContext.putBlobFromUrl(0, sourceURL, Object.assign(Object.assign({}, options), { blobHttpHeaders: options.blobHTTPHeaders, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), sourceModifiedAccessConditions: {
+                    sourceIfMatch: (_b = options.sourceConditions) === null || _b === void 0 ? void 0 : _b.ifMatch,
+                    sourceIfModifiedSince: (_c = options.sourceConditions) === null || _c === void 0 ? void 0 : _c.ifModifiedSince,
+                    sourceIfNoneMatch: (_d = options.sourceConditions) === null || _d === void 0 ? void 0 : _d.ifNoneMatch,
+                    sourceIfUnmodifiedSince: (_e = options.sourceConditions) === null || _e === void 0 ? void 0 : _e.ifUnmodifiedSince,
+                    sourceIfTags: (_f = options.sourceConditions) === null || _f === void 0 ? void 0 : _f.tagConditions,
                 }, cpkInfo: options.customerProvidedKey, copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization), tier: toAccessTier(options.tier), blobTagsString: toBlobTagsString(options.tags), copySourceTags: options.copySourceTags, tracingOptions: updatedOptions.tracingOptions })));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Uploads the specified block to the block blob's "staging area" to be later
@@ -1745,9 +1441,8 @@ export class BlockBlobClient extends BlobClient {
      * @returns Response data for the Block Blob Stage Block operation.
      */
     async stageBlock(blockId, body, contentLength, options = {}) {
-        const { span, updatedOptions } = createSpan("BlockBlobClient-stageBlock", options);
-        try {
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        return tracingClient.withSpan("BlockBlobClient-stageBlock", options, async (updatedOptions) => {
             return assertResponse(await this.blockBlobContext.stageBlock(blockId, contentLength, body, {
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -1760,17 +1455,7 @@ export class BlockBlobClient extends BlobClient {
                 encryptionScope: options.encryptionScope,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * The Stage Block From URL operation creates a new block to be committed as part
@@ -1794,9 +1479,8 @@ export class BlockBlobClient extends BlobClient {
      * @returns Response data for the Block Blob Stage Block From URL operation.
      */
     async stageBlockFromURL(blockId, sourceURL, offset = 0, count, options = {}) {
-        const { span, updatedOptions } = createSpan("BlockBlobClient-stageBlockFromURL", options);
-        try {
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        return tracingClient.withSpan("BlockBlobClient-stageBlockFromURL", options, async (updatedOptions) => {
             return assertResponse(await this.blockBlobContext.stageBlockFromURL(blockId, 0, sourceURL, {
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -1808,17 +1492,7 @@ export class BlockBlobClient extends BlobClient {
                 copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization),
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Writes a blob by specifying the list of block IDs that make up the blob.
@@ -1833,11 +1507,10 @@ export class BlockBlobClient extends BlobClient {
      * @returns Response data for the Block Blob Commit Block List operation.
      */
     async commitBlockList(blocks, options = {}) {
-        var _a, _b, _c;
         options.conditions = options.conditions || {};
-        const { span, updatedOptions } = createSpan("BlockBlobClient-commitBlockList", options);
-        try {
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        return tracingClient.withSpan("BlockBlobClient-commitBlockList", options, async (updatedOptions) => {
+            var _a, _b, _c;
             return assertResponse(await this.blockBlobContext.commitBlockList({ latest: blocks }, {
                 abortSignal: options.abortSignal,
                 blobHttpHeaders: options.blobHTTPHeaders,
@@ -1853,17 +1526,7 @@ export class BlockBlobClient extends BlobClient {
                 blobTagsString: toBlobTagsString(options.tags),
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Returns the list of blocks that have been uploaded as part of a block blob
@@ -1876,9 +1539,8 @@ export class BlockBlobClient extends BlobClient {
      * @returns Response data for the Block Blob Get Block List operation.
      */
     async getBlockList(listType, options = {}) {
-        var _a;
-        const { span, updatedOptions } = createSpan("BlockBlobClient-getBlockList", options);
-        try {
+        return tracingClient.withSpan("BlockBlobClient-getBlockList", options, async (updatedOptions) => {
+            var _a;
             const res = assertResponse(await this.blockBlobContext.getBlockList(listType, {
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -1892,17 +1554,7 @@ export class BlockBlobClient extends BlobClient {
                 res.uncommittedBlocks = [];
             }
             return res;
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     // High level functions
     /**
@@ -1921,8 +1573,7 @@ export class BlockBlobClient extends BlobClient {
      * @param options -
      */
     async uploadData(data, options = {}) {
-        const { span, updatedOptions } = createSpan("BlockBlobClient-uploadData", options);
-        try {
+        return tracingClient.withSpan("BlockBlobClient-uploadData", options, async (updatedOptions) => {
             if (isNode) {
                 let buffer;
                 if (data instanceof Buffer) {
@@ -1941,17 +1592,7 @@ export class BlockBlobClient extends BlobClient {
                 const browserBlob = new Blob([data]);
                 return this.uploadSeekableInternal((offset, size) => browserBlob.slice(offset, offset + size), browserBlob.size, updatedOptions);
             }
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * ONLY AVAILABLE IN BROWSERS.
@@ -1973,21 +1614,10 @@ export class BlockBlobClient extends BlobClient {
      * @returns Response data for the Blob Upload operation.
      */
     async uploadBrowserData(browserData, options = {}) {
-        const { span, updatedOptions } = createSpan("BlockBlobClient-uploadBrowserData", options);
-        try {
+        return tracingClient.withSpan("BlockBlobClient-uploadBrowserData", options, async (updatedOptions) => {
             const browserBlob = new Blob([browserData]);
-            return await this.uploadSeekableInternal((offset, size) => browserBlob.slice(offset, offset + size), browserBlob.size, updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return this.uploadSeekableInternal((offset, size) => browserBlob.slice(offset, offset + size), browserBlob.size, updatedOptions);
+        });
     }
     /**
      *
@@ -2005,27 +1635,23 @@ export class BlockBlobClient extends BlobClient {
      * @returns Response data for the Blob Upload operation.
      */
     async uploadSeekableInternal(bodyFactory, size, options = {}) {
-        if (!options.blockSize) {
-            options.blockSize = 0;
-        }
-        if (options.blockSize < 0 || options.blockSize > BLOCK_BLOB_MAX_STAGE_BLOCK_BYTES) {
+        var _a, _b;
+        let blockSize = (_a = options.blockSize) !== null && _a !== void 0 ? _a : 0;
+        if (blockSize < 0 || blockSize > BLOCK_BLOB_MAX_STAGE_BLOCK_BYTES) {
             throw new RangeError(`blockSize option must be >= 0 and <= ${BLOCK_BLOB_MAX_STAGE_BLOCK_BYTES}`);
         }
-        if (options.maxSingleShotSize !== 0 && !options.maxSingleShotSize) {
-            options.maxSingleShotSize = BLOCK_BLOB_MAX_UPLOAD_BLOB_BYTES;
-        }
-        if (options.maxSingleShotSize < 0 ||
-            options.maxSingleShotSize > BLOCK_BLOB_MAX_UPLOAD_BLOB_BYTES) {
+        const maxSingleShotSize = (_b = options.maxSingleShotSize) !== null && _b !== void 0 ? _b : BLOCK_BLOB_MAX_UPLOAD_BLOB_BYTES;
+        if (maxSingleShotSize < 0 || maxSingleShotSize > BLOCK_BLOB_MAX_UPLOAD_BLOB_BYTES) {
             throw new RangeError(`maxSingleShotSize option must be >= 0 and <= ${BLOCK_BLOB_MAX_UPLOAD_BLOB_BYTES}`);
         }
-        if (options.blockSize === 0) {
+        if (blockSize === 0) {
             if (size > BLOCK_BLOB_MAX_STAGE_BLOCK_BYTES * BLOCK_BLOB_MAX_BLOCKS) {
                 throw new RangeError(`${size} is too larger to upload to a block blob.`);
             }
-            if (size > options.maxSingleShotSize) {
-                options.blockSize = Math.ceil(size / BLOCK_BLOB_MAX_BLOCKS);
-                if (options.blockSize < DEFAULT_BLOB_DOWNLOAD_BLOCK_BYTES) {
-                    options.blockSize = DEFAULT_BLOB_DOWNLOAD_BLOCK_BYTES;
+            if (size > maxSingleShotSize) {
+                blockSize = Math.ceil(size / BLOCK_BLOB_MAX_BLOCKS);
+                if (blockSize < DEFAULT_BLOB_DOWNLOAD_BLOCK_BYTES) {
+                    blockSize = DEFAULT_BLOB_DOWNLOAD_BLOCK_BYTES;
                 }
             }
         }
@@ -2035,12 +1661,11 @@ export class BlockBlobClient extends BlobClient {
         if (!options.conditions) {
             options.conditions = {};
         }
-        const { span, updatedOptions } = createSpan("BlockBlobClient-uploadSeekableInternal", options);
-        try {
-            if (size <= options.maxSingleShotSize) {
+        return tracingClient.withSpan("BlockBlobClient-uploadSeekableInternal", options, async (updatedOptions) => {
+            if (size <= maxSingleShotSize) {
                 return assertResponse(await this.upload(bodyFactory(0, size), size, updatedOptions));
             }
-            const numBlocks = Math.floor((size - 1) / options.blockSize) + 1;
+            const numBlocks = Math.floor((size - 1) / blockSize) + 1;
             if (numBlocks > BLOCK_BLOB_MAX_BLOCKS) {
                 throw new RangeError(`The buffer's size is too big or the BlockSize is too small;` +
                     `the number of blocks must be <= ${BLOCK_BLOB_MAX_BLOCKS}`);
@@ -2052,8 +1677,8 @@ export class BlockBlobClient extends BlobClient {
             for (let i = 0; i < numBlocks; i++) {
                 batch.addOperation(async () => {
                     const blockID = generateBlockID(blockIDPrefix, i);
-                    const start = options.blockSize * i;
-                    const end = i === numBlocks - 1 ? size : start + options.blockSize;
+                    const start = blockSize * i;
+                    const end = i === numBlocks - 1 ? size : start + blockSize;
                     const contentLength = end - start;
                     blockList.push(blockID);
                     await this.stageBlock(blockID, bodyFactory(start, contentLength), contentLength, {
@@ -2074,17 +1699,7 @@ export class BlockBlobClient extends BlobClient {
             }
             await batch.do();
             return this.commitBlockList(blockList, updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * ONLY AVAILABLE IN NODE.JS RUNTIME.
@@ -2100,27 +1715,16 @@ export class BlockBlobClient extends BlobClient {
      * @returns Response data for the Blob Upload operation.
      */
     async uploadFile(filePath, options = {}) {
-        const { span, updatedOptions } = createSpan("BlockBlobClient-uploadFile", options);
-        try {
+        return tracingClient.withSpan("BlockBlobClient-uploadFile", options, async (updatedOptions) => {
             const size = (await fsStat(filePath)).size;
-            return await this.uploadSeekableInternal((offset, count) => {
+            return this.uploadSeekableInternal((offset, count) => {
                 return () => fsCreateReadStream(filePath, {
                     autoClose: true,
                     end: count ? offset + count - 1 : Infinity,
                     start: offset,
                 });
             }, size, Object.assign(Object.assign({}, options), { tracingOptions: updatedOptions.tracingOptions }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * ONLY AVAILABLE IN NODE.JS RUNTIME.
@@ -2145,8 +1749,7 @@ export class BlockBlobClient extends BlobClient {
         if (!options.conditions) {
             options.conditions = {};
         }
-        const { span, updatedOptions } = createSpan("BlockBlobClient-uploadStream", options);
-        try {
+        return tracingClient.withSpan("BlockBlobClient-uploadStream", options, async (updatedOptions) => {
             let blockNum = 0;
             const blockIDPrefix = generateUuid();
             let transferProgress = 0;
@@ -2173,17 +1776,7 @@ export class BlockBlobClient extends BlobClient {
             Math.ceil((maxConcurrency / 4) * 3));
             await scheduler.do();
             return assertResponse(await this.commitBlockList(blockList, Object.assign(Object.assign({}, options), { tracingOptions: updatedOptions.tracingOptions })));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
 }
 /**
@@ -2278,11 +1871,10 @@ export class PageBlobClient extends BlobClient {
      * @returns Response data for the Page Blob Create operation.
      */
     async create(size, options = {}) {
-        var _a, _b, _c;
         options.conditions = options.conditions || {};
-        const { span, updatedOptions } = createSpan("PageBlobClient-create", options);
-        try {
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        return tracingClient.withSpan("PageBlobClient-create", options, async (updatedOptions) => {
+            var _a, _b, _c;
             return assertResponse(await this.pageBlobContext.create(0, size, {
                 abortSignal: options.abortSignal,
                 blobHttpHeaders: options.blobHTTPHeaders,
@@ -2299,17 +1891,7 @@ export class PageBlobClient extends BlobClient {
                 blobTagsString: toBlobTagsString(options.tags),
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Creates a page blob of the specified length. Call uploadPages to upload data
@@ -2321,30 +1903,20 @@ export class PageBlobClient extends BlobClient {
      * @param options -
      */
     async createIfNotExists(size, options = {}) {
-        var _a, _b;
-        const { span, updatedOptions } = createSpan("PageBlobClient-createIfNotExists", options);
-        try {
-            const conditions = { ifNoneMatch: ETagAny };
-            const res = assertResponse(await this.create(size, Object.assign(Object.assign({}, options), { conditions, tracingOptions: updatedOptions.tracingOptions })));
-            return Object.assign(Object.assign({ succeeded: true }, res), { _response: res._response });
-        }
-        catch (e) {
-            if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "BlobAlreadyExists") {
-                span.setStatus({
-                    code: SpanStatusCode.ERROR,
-                    message: "Expected exception when creating a blob only if it does not already exist.",
-                });
-                return Object.assign(Object.assign({ succeeded: false }, (_b = e.response) === null || _b === void 0 ? void 0 : _b.parsedHeaders), { _response: e.response });
+        return tracingClient.withSpan("PageBlobClient-createIfNotExists", options, async (updatedOptions) => {
+            var _a, _b;
+            try {
+                const conditions = { ifNoneMatch: ETagAny };
+                const res = assertResponse(await this.create(size, Object.assign(Object.assign({}, options), { conditions, tracingOptions: updatedOptions.tracingOptions })));
+                return Object.assign(Object.assign({ succeeded: true }, res), { _response: res._response });
             }
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "BlobAlreadyExists") {
+                    return Object.assign(Object.assign({ succeeded: false }, (_b = e.response) === null || _b === void 0 ? void 0 : _b.parsedHeaders), { _response: e.response });
+                }
+                throw e;
+            }
+        });
     }
     /**
      * Writes 1 or more pages to the page blob. The start and end offsets must be a multiple of 512.
@@ -2357,11 +1929,10 @@ export class PageBlobClient extends BlobClient {
      * @returns Response data for the Page Blob Upload Pages operation.
      */
     async uploadPages(body, offset, count, options = {}) {
-        var _a;
         options.conditions = options.conditions || {};
-        const { span, updatedOptions } = createSpan("PageBlobClient-uploadPages", options);
-        try {
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        return tracingClient.withSpan("PageBlobClient-uploadPages", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this.pageBlobContext.uploadPages(count, body, {
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -2377,17 +1948,7 @@ export class PageBlobClient extends BlobClient {
                 encryptionScope: options.encryptionScope,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * The Upload Pages operation writes a range of pages to a page blob where the
@@ -2401,12 +1962,11 @@ export class PageBlobClient extends BlobClient {
      * @param options -
      */
     async uploadPagesFromURL(sourceURL, sourceOffset, destOffset, count, options = {}) {
-        var _a;
         options.conditions = options.conditions || {};
         options.sourceConditions = options.sourceConditions || {};
-        const { span, updatedOptions } = createSpan("PageBlobClient-uploadPagesFromURL", options);
-        try {
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        return tracingClient.withSpan("PageBlobClient-uploadPagesFromURL", options, async (updatedOptions) => {
+            var _a, _b, _c, _d, _e;
             return assertResponse(await this.pageBlobContext.uploadPagesFromURL(sourceURL, rangeToString({ offset: sourceOffset, count }), 0, rangeToString({ offset: destOffset, count }), {
                 abortSignal: options.abortSignal,
                 sourceContentMD5: options.sourceContentMD5,
@@ -2415,27 +1975,17 @@ export class PageBlobClient extends BlobClient {
                 sequenceNumberAccessConditions: options.conditions,
                 modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
                 sourceModifiedAccessConditions: {
-                    sourceIfMatch: options.sourceConditions.ifMatch,
-                    sourceIfModifiedSince: options.sourceConditions.ifModifiedSince,
-                    sourceIfNoneMatch: options.sourceConditions.ifNoneMatch,
-                    sourceIfUnmodifiedSince: options.sourceConditions.ifUnmodifiedSince,
+                    sourceIfMatch: (_b = options.sourceConditions) === null || _b === void 0 ? void 0 : _b.ifMatch,
+                    sourceIfModifiedSince: (_c = options.sourceConditions) === null || _c === void 0 ? void 0 : _c.ifModifiedSince,
+                    sourceIfNoneMatch: (_d = options.sourceConditions) === null || _d === void 0 ? void 0 : _d.ifNoneMatch,
+                    sourceIfUnmodifiedSince: (_e = options.sourceConditions) === null || _e === void 0 ? void 0 : _e.ifUnmodifiedSince,
                 },
                 cpkInfo: options.customerProvidedKey,
                 encryptionScope: options.encryptionScope,
                 copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization),
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Frees the specified pages from the page blob.
@@ -2447,10 +1997,9 @@ export class PageBlobClient extends BlobClient {
      * @returns Response data for the Page Blob Clear Pages operation.
      */
     async clearPages(offset = 0, count, options = {}) {
-        var _a;
         options.conditions = options.conditions || {};
-        const { span, updatedOptions } = createSpan("PageBlobClient-clearPages", options);
-        try {
+        return tracingClient.withSpan("PageBlobClient-clearPages", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this.pageBlobContext.clearPages(0, {
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -2461,17 +2010,7 @@ export class PageBlobClient extends BlobClient {
                 encryptionScope: options.encryptionScope,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Returns the list of valid page ranges for a page blob or snapshot of a page blob.
@@ -2483,10 +2022,9 @@ export class PageBlobClient extends BlobClient {
      * @returns Response data for the Page Blob Get Ranges operation.
      */
     async getPageRanges(offset = 0, count, options = {}) {
-        var _a;
         options.conditions = options.conditions || {};
-        const { span, updatedOptions } = createSpan("PageBlobClient-getPageRanges", options);
-        try {
+        return tracingClient.withSpan("PageBlobClient-getPageRanges", options, async (updatedOptions) => {
+            var _a;
             const response = assertResponse(await this.pageBlobContext.getPageRanges({
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -2495,17 +2033,7 @@ export class PageBlobClient extends BlobClient {
                 tracingOptions: updatedOptions.tracingOptions,
             }));
             return rangeResponseFromModel(response);
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * getPageRangesSegment returns a single segment of page ranges starting from the
@@ -2520,9 +2048,8 @@ export class PageBlobClient extends BlobClient {
      * @param options - Options to PageBlob Get Page Ranges Segment operation.
      */
     async listPageRangesSegment(offset = 0, count, marker, options = {}) {
-        var _a;
-        const { span, updatedOptions } = createSpan("PageBlobClient-getPageRangesSegment", options);
-        try {
+        return tracingClient.withSpan("PageBlobClient-getPageRangesSegment", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this.pageBlobContext.getPageRanges({
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -2532,17 +2059,7 @@ export class PageBlobClient extends BlobClient {
                 maxPageSize: options.maxPageSize,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Returns an AsyncIterableIterator for {@link PageBlobGetPageRangesResponseModel}
@@ -2703,10 +2220,9 @@ export class PageBlobClient extends BlobClient {
      * @returns Response data for the Page Blob Get Page Range Diff operation.
      */
     async getPageRangesDiff(offset, count, prevSnapshot, options = {}) {
-        var _a;
         options.conditions = options.conditions || {};
-        const { span, updatedOptions } = createSpan("PageBlobClient-getPageRangesDiff", options);
-        try {
+        return tracingClient.withSpan("PageBlobClient-getPageRangesDiff", options, async (updatedOptions) => {
+            var _a;
             const result = assertResponse(await this.pageBlobContext.getPageRangesDiff({
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -2716,17 +2232,7 @@ export class PageBlobClient extends BlobClient {
                 tracingOptions: updatedOptions.tracingOptions,
             }));
             return rangeResponseFromModel(result);
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * getPageRangesDiffSegment returns a single segment of page ranges starting from the
@@ -2742,10 +2248,9 @@ export class PageBlobClient extends BlobClient {
      * @param marker - A string value that identifies the portion of the get to be returned with the next get operation.
      * @param options - Options to the Page Blob Get Page Ranges Diff operation.
      */
-    async listPageRangesDiffSegment(offset, count, prevSnapshotOrUrl, marker, options) {
-        var _a;
-        const { span, updatedOptions } = createSpan("PageBlobClient-getPageRangesDiffSegment", options);
-        try {
+    async listPageRangesDiffSegment(offset, count, prevSnapshotOrUrl, marker, options = {}) {
+        return tracingClient.withSpan("PageBlobClient-getPageRangesDiffSegment", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this.pageBlobContext.getPageRangesDiff({
                 abortSignal: options === null || options === void 0 ? void 0 : options.abortSignal,
                 leaseAccessConditions: options === null || options === void 0 ? void 0 : options.conditions,
@@ -2759,17 +2264,7 @@ export class PageBlobClient extends BlobClient {
                 maxPageSize: options === null || options === void 0 ? void 0 : options.maxPageSize,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Returns an AsyncIterableIterator for {@link PageBlobGetPageRangesDiffResponseModel}
@@ -2934,10 +2429,9 @@ export class PageBlobClient extends BlobClient {
      * @returns Response data for the Page Blob Get Page Range Diff operation.
      */
     async getPageRangesDiffForManagedDisks(offset, count, prevSnapshotUrl, options = {}) {
-        var _a;
         options.conditions = options.conditions || {};
-        const { span, updatedOptions } = createSpan("PageBlobClient-GetPageRangesDiffForManagedDisks", options);
-        try {
+        return tracingClient.withSpan("PageBlobClient-GetPageRangesDiffForManagedDisks", options, async (updatedOptions) => {
+            var _a;
             const response = assertResponse(await this.pageBlobContext.getPageRangesDiff({
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -2947,17 +2441,7 @@ export class PageBlobClient extends BlobClient {
                 tracingOptions: updatedOptions.tracingOptions,
             }));
             return rangeResponseFromModel(response);
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Resizes the page blob to the specified size (which must be a multiple of 512).
@@ -2968,10 +2452,9 @@ export class PageBlobClient extends BlobClient {
      * @returns Response data for the Page Blob Resize operation.
      */
     async resize(size, options = {}) {
-        var _a;
         options.conditions = options.conditions || {};
-        const { span, updatedOptions } = createSpan("PageBlobClient-resize", options);
-        try {
+        return tracingClient.withSpan("PageBlobClient-resize", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this.pageBlobContext.resize(size, {
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -2979,17 +2462,7 @@ export class PageBlobClient extends BlobClient {
                 encryptionScope: options.encryptionScope,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Sets a page blob's sequence number.
@@ -3001,10 +2474,9 @@ export class PageBlobClient extends BlobClient {
      * @returns Response data for the Page Blob Update Sequence Number operation.
      */
     async updateSequenceNumber(sequenceNumberAction, sequenceNumber, options = {}) {
-        var _a;
         options.conditions = options.conditions || {};
-        const { span, updatedOptions } = createSpan("PageBlobClient-updateSequenceNumber", options);
-        try {
+        return tracingClient.withSpan("PageBlobClient-updateSequenceNumber", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this.pageBlobContext.updateSequenceNumber(sequenceNumberAction, {
                 abortSignal: options.abortSignal,
                 blobSequenceNumber: sequenceNumber,
@@ -3012,17 +2484,7 @@ export class PageBlobClient extends BlobClient {
                 modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Begins an operation to start an incremental copy from one page blob's snapshot to this page blob.
@@ -3038,25 +2500,14 @@ export class PageBlobClient extends BlobClient {
      * @returns Response data for the Page Blob Copy Incremental operation.
      */
     async startCopyIncremental(copySource, options = {}) {
-        var _a;
-        const { span, updatedOptions } = createSpan("PageBlobClient-startCopyIncremental", options);
-        try {
+        return tracingClient.withSpan("PageBlobClient-startCopyIncremental", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this.pageBlobContext.copyIncremental(copySource, {
                 abortSignal: options.abortSignal,
                 modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
 }
 //# sourceMappingURL=Clients.js.map