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

package/dist/index.js

@@ -6,13 +6,13 @@ var coreRestPipeline = require('@azure/core-rest-pipeline');
 var tslib = require('tslib');
 var coreAuth = require('@azure/core-auth');
 var coreUtil = require('@azure/core-util');
-var coreTracing = require('@azure/core-tracing');
 var coreHttpCompat = require('@azure/core-http-compat');
 var coreClient = require('@azure/core-client');
 var coreXml = require('@azure/core-xml');
 var logger$1 = require('@azure/logger');
 var abortController = require('@azure/abort-controller');
 var crypto = require('crypto');
+var coreTracing = require('@azure/core-tracing');
 var uuid = require('uuid');
 var stream = require('stream');
 require('@azure/core-paging');
@@ -15251,8 +15251,9 @@ class StorageClient {
  * Creates a span using the global tracer.
  * @internal
  */
-const createSpan = coreTracing.createSpanFunction({
-    packagePrefix: "Azure.Storage.Blob",
+const tracingClient = coreTracing.createTracingClient({
+    packageName: "@azure/storage-blob",
+    packageVersion: SDK_VERSION,
     namespace: "Microsoft.Storage",
 });
 
@@ -16546,33 +16547,23 @@ class BlobLeaseClient {
      * @returns Response data for acquire lease operation.
      */
     async acquireLease(duration, options = {}) {
-        var _a, _b, _c, _d, _e, _f;
-        const { span, updatedOptions } = createSpan("BlobLeaseClient-acquireLease", options);
+        var _a, _b, _c, _d, _e;
         if (this._isContainer &&
             ((((_a = options.conditions) === null || _a === void 0 ? void 0 : _a.ifMatch) && ((_b = options.conditions) === null || _b === void 0 ? void 0 : _b.ifMatch) !== ETagNone) ||
                 (((_c = options.conditions) === null || _c === void 0 ? void 0 : _c.ifNoneMatch) && ((_d = options.conditions) === null || _d === void 0 ? void 0 : _d.ifNoneMatch) !== ETagNone) ||
                 ((_e = options.conditions) === null || _e === void 0 ? void 0 : _e.tagConditions))) {
             throw new RangeError("The IfMatch, IfNoneMatch and tags access conditions are ignored by the service. Values other than undefined or their default values are not acceptable.");
         }
-        try {
+        return tracingClient.withSpan("BlobLeaseClient-acquireLease", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this._containerOrBlobOperation.acquireLease({
                 abortSignal: options.abortSignal,
                 duration,
-                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_f = options.conditions) === null || _f === void 0 ? void 0 : _f.tagConditions }),
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
                 proposedLeaseId: this._leaseId,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * To change the ID of the lease.
@@ -16585,33 +16576,23 @@ class BlobLeaseClient {
      * @returns Response data for change lease operation.
      */
     async changeLease(proposedLeaseId, options = {}) {
-        var _a, _b, _c, _d, _e, _f;
-        const { span, updatedOptions } = createSpan("BlobLeaseClient-changeLease", options);
+        var _a, _b, _c, _d, _e;
         if (this._isContainer &&
             ((((_a = options.conditions) === null || _a === void 0 ? void 0 : _a.ifMatch) && ((_b = options.conditions) === null || _b === void 0 ? void 0 : _b.ifMatch) !== ETagNone) ||
                 (((_c = options.conditions) === null || _c === void 0 ? void 0 : _c.ifNoneMatch) && ((_d = options.conditions) === null || _d === void 0 ? void 0 : _d.ifNoneMatch) !== ETagNone) ||
                 ((_e = options.conditions) === null || _e === void 0 ? void 0 : _e.tagConditions))) {
             throw new RangeError("The IfMatch, IfNoneMatch and tags access conditions are ignored by the service. Values other than undefined or their default values are not acceptable.");
         }
-        try {
+        return tracingClient.withSpan("BlobLeaseClient-changeLease", options, async (updatedOptions) => {
+            var _a;
             const response = assertResponse(await this._containerOrBlobOperation.changeLease(this._leaseId, proposedLeaseId, {
                 abortSignal: options.abortSignal,
-                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_f = options.conditions) === null || _f === void 0 ? void 0 : _f.tagConditions }),
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
                 tracingOptions: updatedOptions.tracingOptions,
             }));
             this._leaseId = proposedLeaseId;
             return response;
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * To free the lease if it is no longer needed so that another client may
@@ -16624,31 +16605,21 @@ class BlobLeaseClient {
      * @returns Response data for release lease operation.
      */
     async releaseLease(options = {}) {
-        var _a, _b, _c, _d, _e, _f;
-        const { span, updatedOptions } = createSpan("BlobLeaseClient-releaseLease", options);
+        var _a, _b, _c, _d, _e;
         if (this._isContainer &&
             ((((_a = options.conditions) === null || _a === void 0 ? void 0 : _a.ifMatch) && ((_b = options.conditions) === null || _b === void 0 ? void 0 : _b.ifMatch) !== ETagNone) ||
                 (((_c = options.conditions) === null || _c === void 0 ? void 0 : _c.ifNoneMatch) && ((_d = options.conditions) === null || _d === void 0 ? void 0 : _d.ifNoneMatch) !== ETagNone) ||
                 ((_e = options.conditions) === null || _e === void 0 ? void 0 : _e.tagConditions))) {
             throw new RangeError("The IfMatch, IfNoneMatch and tags access conditions are ignored by the service. Values other than undefined or their default values are not acceptable.");
         }
-        try {
+        return tracingClient.withSpan("BlobLeaseClient-releaseLease", options, async (updatedOptions) => {
+            var _a;
             return assertResponse(await this._containerOrBlobOperation.releaseLease(this._leaseId, {
                 abortSignal: options.abortSignal,
-                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_f = options.conditions) === null || _f === void 0 ? void 0 : _f.tagConditions }),
+                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: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * To renew the lease.
@@ -16660,31 +16631,21 @@ class BlobLeaseClient {
      * @returns Response data for renew lease operation.
      */
     async renewLease(options = {}) {
-        var _a, _b, _c, _d, _e, _f;
-        const { span, updatedOptions } = createSpan("BlobLeaseClient-renewLease", options);
+        var _a, _b, _c, _d, _e;
         if (this._isContainer &&
             ((((_a = options.conditions) === null || _a === void 0 ? void 0 : _a.ifMatch) && ((_b = options.conditions) === null || _b === void 0 ? void 0 : _b.ifMatch) !== ETagNone) ||
                 (((_c = options.conditions) === null || _c === void 0 ? void 0 : _c.ifNoneMatch) && ((_d = options.conditions) === null || _d === void 0 ? void 0 : _d.ifNoneMatch) !== ETagNone) ||
                 ((_e = options.conditions) === null || _e === void 0 ? void 0 : _e.tagConditions))) {
             throw new RangeError("The IfMatch, IfNoneMatch and tags access conditions are ignored by the service. Values other than undefined or their default values are not acceptable.");
         }
-        try {
-            return await this._containerOrBlobOperation.renewLease(this._leaseId, {
+        return tracingClient.withSpan("BlobLeaseClient-renewLease", options, async (updatedOptions) => {
+            var _a;
+            return this._containerOrBlobOperation.renewLease(this._leaseId, {
                 abortSignal: options.abortSignal,
-                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_f = options.conditions) === null || _f === void 0 ? void 0 : _f.tagConditions }),
+                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: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * To end the lease but ensure that another client cannot acquire a new lease
@@ -16698,33 +16659,23 @@ class BlobLeaseClient {
      * @returns Response data for break lease operation.
      */
     async breakLease(breakPeriod, options = {}) {
-        var _a, _b, _c, _d, _e, _f;
-        const { span, updatedOptions } = createSpan("BlobLeaseClient-breakLease", options);
+        var _a, _b, _c, _d, _e;
         if (this._isContainer &&
             ((((_a = options.conditions) === null || _a === void 0 ? void 0 : _a.ifMatch) && ((_b = options.conditions) === null || _b === void 0 ? void 0 : _b.ifMatch) !== ETagNone) ||
                 (((_c = options.conditions) === null || _c === void 0 ? void 0 : _c.ifNoneMatch) && ((_d = options.conditions) === null || _d === void 0 ? void 0 : _d.ifNoneMatch) !== ETagNone) ||
                 ((_e = options.conditions) === null || _e === void 0 ? void 0 : _e.tagConditions))) {
             throw new RangeError("The IfMatch, IfNoneMatch and tags access conditions are ignored by the service. Values other than undefined or their default values are not acceptable.");
         }
-        try {
+        return tracingClient.withSpan("BlobLeaseClient-breakLease", options, async (updatedOptions) => {
+            var _a;
             const operationOptions = {
                 abortSignal: options.abortSignal,
                 breakPeriod,
-                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_f = options.conditions) === null || _f === void 0 ? void 0 : _f.tagConditions }),
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
                 tracingOptions: updatedOptions.tracingOptions,
             };
             return assertResponse(await this._containerOrBlobOperation.breakLease(operationOptions));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
 }
 
@@ -19396,12 +19347,11 @@ 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,
@@ -19467,17 +19417,7 @@ class BlobClient extends StorageClient {
                 maxRetryRequests: options.maxRetryRequests,
                 onProgress: options.onProgress,
             });
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Returns true if the Azure blob resource represented by this client exists; false otherwise.
@@ -19489,37 +19429,31 @@ 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: coreTracing.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
@@ -19534,11 +19468,10 @@ 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,
@@ -19547,17 +19480,7 @@ 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: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Marks the specified blob or snapshot for deletion. The blob is later deleted
@@ -19569,10 +19492,9 @@ 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,
@@ -19580,17 +19502,7 @@ 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: coreTracing.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
@@ -19602,29 +19514,19 @@ 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: coreTracing.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: coreTracing.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
@@ -19635,23 +19537,12 @@ 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: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Sets system properties on the blob.
@@ -19669,11 +19560,10 @@ 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,
@@ -19682,17 +19572,7 @@ 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: coreTracing.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.
@@ -19706,11 +19586,10 @@ 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,
@@ -19720,17 +19599,7 @@ class BlobClient extends StorageClient {
                 encryptionScope: options.encryptionScope,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Sets tags on the underlying blob.
@@ -19742,9 +19611,8 @@ 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,
@@ -19752,17 +19620,7 @@ class BlobClient extends StorageClient {
                 tracingOptions: updatedOptions.tracingOptions,
                 tags: toBlobTags(tags),
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Gets the tags associated with the underlying blob.
@@ -19770,9 +19628,8 @@ 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,
@@ -19781,17 +19638,7 @@ 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: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Get a {@link BlobLeaseClient} that manages leases on the blob.
@@ -19809,11 +19656,10 @@ 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,
@@ -19823,17 +19669,7 @@ class BlobClient extends StorageClient {
                 encryptionScope: options.encryptionScope,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Asynchronously copies a blob to a destination within the storage account.
@@ -19935,24 +19771,13 @@ 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: coreTracing.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
@@ -19963,44 +19788,33 @@ 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: coreTracing.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
@@ -20014,9 +19828,8 @@ 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,
@@ -20024,19 +19837,10 @@ class BlobClient extends StorageClient {
                 rehydratePriority: options.rehydratePriority,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.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;
@@ -20051,26 +19855,23 @@ 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 }));
@@ -20093,12 +19894,12 @@ 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,
@@ -20120,17 +19921,7 @@ class BlobClient extends StorageClient {
             }
             await batch.do();
             return buffer;
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * ONLY AVAILABLE IN NODE.JS RUNTIME.
@@ -20149,8 +19940,7 @@ 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);
@@ -20158,17 +19948,7 @@ 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: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     getBlobAndContainerNamesFromUrl() {
         let containerName;
@@ -20233,11 +20013,10 @@ 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,
@@ -20259,17 +20038,7 @@ class BlobClient extends StorageClient {
                 sealBlob: options.sealBlob,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Only available for BlobClient constructed with a shared key credential.
@@ -20296,71 +20065,38 @@ 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: coreTracing.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: coreTracing.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: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
 }
 /**
@@ -20460,11 +20196,10 @@ 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,
@@ -20479,17 +20214,7 @@ class AppendBlobClient extends BlobClient {
                 blobTagsString: toBlobTagsString(options.tags),
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.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.
@@ -20499,30 +20224,20 @@ 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: coreTracing.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: coreTracing.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.
@@ -20530,10 +20245,9 @@ 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,
@@ -20541,17 +20255,7 @@ 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: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Commits a new block of data to the end of the existing append blob.
@@ -20578,11 +20282,10 @@ 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,
@@ -20597,17 +20300,7 @@ class AppendBlobClient extends BlobClient {
                 encryptionScope: options.encryptionScope,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.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
@@ -20624,12 +20317,11 @@ 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 }),
@@ -20639,27 +20331,17 @@ 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: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
 }
 /**
@@ -20776,14 +20458,12 @@ 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 (!coreUtil.isNode) {
-                throw new Error("This operation currently is only supported in Node.js.");
-            }
-            ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
+        if (!coreUtil.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: {
@@ -20802,17 +20482,7 @@ class BlockBlobClient extends BlobClient {
                 onProgress: options.onProgress,
                 onError: options.onError,
             });
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Creates a new block blob, or updates the content of an existing block blob.
@@ -20842,11 +20512,10 @@ 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,
@@ -20865,17 +20534,7 @@ class BlockBlobClient extends BlobClient {
                 blobTagsString: toBlobTagsString(options.tags),
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.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.
@@ -20896,29 +20555,18 @@ 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: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Uploads the specified block to the block blob's "staging area" to be later
@@ -20932,9 +20580,8 @@ 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,
@@ -20947,17 +20594,7 @@ class BlockBlobClient extends BlobClient {
                 encryptionScope: options.encryptionScope,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.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
@@ -20981,9 +20618,8 @@ 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,
@@ -20995,17 +20631,7 @@ class BlockBlobClient extends BlobClient {
                 copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization),
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.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.
@@ -21020,11 +20646,10 @@ 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,
@@ -21040,17 +20665,7 @@ class BlockBlobClient extends BlobClient {
                 blobTagsString: toBlobTagsString(options.tags),
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.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
@@ -21063,9 +20678,8 @@ 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,
@@ -21079,17 +20693,7 @@ class BlockBlobClient extends BlobClient {
                 res.uncommittedBlocks = [];
             }
             return res;
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     // High level functions
     /**
@@ -21108,8 +20712,7 @@ 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 (coreUtil.isNode) {
                 let buffer;
                 if (data instanceof Buffer) {
@@ -21128,17 +20731,7 @@ 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: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * ONLY AVAILABLE IN BROWSERS.
@@ -21160,21 +20753,10 @@ 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: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return this.uploadSeekableInternal((offset, size) => browserBlob.slice(offset, offset + size), browserBlob.size, updatedOptions);
+        });
     }
     /**
      *
@@ -21192,27 +20774,23 @@ 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;
                 }
             }
         }
@@ -21222,12 +20800,11 @@ 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}`);
@@ -21239,8 +20816,8 @@ 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, {
@@ -21261,17 +20838,7 @@ class BlockBlobClient extends BlobClient {
             }
             await batch.do();
             return this.commitBlockList(blockList, updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * ONLY AVAILABLE IN NODE.JS RUNTIME.
@@ -21287,27 +20854,16 @@ 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: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * ONLY AVAILABLE IN NODE.JS RUNTIME.
@@ -21332,8 +20888,7 @@ 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 = uuid.v4();
             let transferProgress = 0;
@@ -21360,17 +20915,7 @@ 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: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
 }
 /**
@@ -21465,11 +21010,10 @@ 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,
@@ -21486,17 +21030,7 @@ class PageBlobClient extends BlobClient {
                 blobTagsString: toBlobTagsString(options.tags),
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Creates a page blob of the specified length. Call uploadPages to upload data
@@ -21508,30 +21042,20 @@ 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: coreTracing.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: coreTracing.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.
@@ -21544,11 +21068,10 @@ 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,
@@ -21564,17 +21087,7 @@ class PageBlobClient extends BlobClient {
                 encryptionScope: options.encryptionScope,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.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
@@ -21588,12 +21101,11 @@ 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,
@@ -21602,27 +21114,17 @@ 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: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Frees the specified pages from the page blob.
@@ -21634,10 +21136,9 @@ 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,
@@ -21648,17 +21149,7 @@ class PageBlobClient extends BlobClient {
                 encryptionScope: options.encryptionScope,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.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.
@@ -21670,10 +21161,9 @@ 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,
@@ -21682,17 +21172,7 @@ class PageBlobClient extends BlobClient {
                 tracingOptions: updatedOptions.tracingOptions,
             }));
             return rangeResponseFromModel(response);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * getPageRangesSegment returns a single segment of page ranges starting from the
@@ -21707,9 +21187,8 @@ 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,
@@ -21719,17 +21198,7 @@ class PageBlobClient extends BlobClient {
                 maxPageSize: options.maxPageSize,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Returns an AsyncIterableIterator for {@link PageBlobGetPageRangesResponseModel}
@@ -21890,10 +21359,9 @@ 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,
@@ -21903,17 +21371,7 @@ class PageBlobClient extends BlobClient {
                 tracingOptions: updatedOptions.tracingOptions,
             }));
             return rangeResponseFromModel(result);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * getPageRangesDiffSegment returns a single segment of page ranges starting from the
@@ -21929,10 +21387,9 @@ 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,
@@ -21946,17 +21403,7 @@ class PageBlobClient extends BlobClient {
                 maxPageSize: options === null || options === void 0 ? void 0 : options.maxPageSize,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Returns an AsyncIterableIterator for {@link PageBlobGetPageRangesDiffResponseModel}
@@ -22121,10 +21568,9 @@ 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,
@@ -22134,17 +21580,7 @@ class PageBlobClient extends BlobClient {
                 tracingOptions: updatedOptions.tracingOptions,
             }));
             return rangeResponseFromModel(response);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.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).
@@ -22155,10 +21591,9 @@ 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,
@@ -22166,17 +21601,7 @@ class PageBlobClient extends BlobClient {
                 encryptionScope: options.encryptionScope,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Sets a page blob's sequence number.
@@ -22188,10 +21613,9 @@ 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,
@@ -22199,17 +21623,7 @@ 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: coreTracing.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.
@@ -22225,25 +21639,14 @@ 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: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
 }
 
@@ -22527,8 +21930,7 @@ class BlobBatch {
         if (!options) {
             options = {};
         }
-        const { span, updatedOptions } = createSpan("BatchDeleteRequest-addSubRequest", options);
-        try {
+        tracingClient.withSpan("BatchDeleteRequest-addSubRequest", options, async (updatedOptions) => {
             this.setBatchType("delete");
             await this.addSubRequestInternal({
                 url: url,
@@ -22536,17 +21938,7 @@ class BlobBatch {
             }, async () => {
                 await new BlobClient(url, this.batchRequest.createPipeline(credential)).delete(updatedOptions);
             });
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     async setBlobAccessTier(urlOrBlobClient, credentialOrTier, tierOrOptions, options) {
         let url;
@@ -22574,8 +21966,7 @@ class BlobBatch {
         if (!options) {
             options = {};
         }
-        const { span, updatedOptions } = createSpan("BatchSetTierRequest-addSubRequest", options);
-        try {
+        return tracingClient.withSpan("BatchSetTierRequest-addSubRequest", options, async (updatedOptions) => {
             this.setBatchType("setAccessTier");
             await this.addSubRequestInternal({
                 url: url,
@@ -22583,17 +21974,7 @@ class BlobBatch {
             }, async () => {
                 await new BlobClient(url, this.batchRequest.createPipeline(credential)).setAccessTier(tier, updatedOptions);
             });
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
 }
 /**
@@ -22837,8 +22218,7 @@ class BlobBatchClient {
         if (!batchRequest || batchRequest.getSubRequests().size === 0) {
             throw new RangeError("Batch request should contain one or more sub requests.");
         }
-        const { span, updatedOptions } = createSpan("BlobBatchClient-submitBatch", options);
-        try {
+        return tracingClient.withSpan("BlobBatchClient-submitBatch", options, async (updatedOptions) => {
             const batchRequestBody = batchRequest.getHttpRequestBody();
             // ServiceSubmitBatchResponseModel and ContainerSubmitBatchResponse are compatible for now.
             const rawBatchResponse = assertResponse(await this.serviceOrContainerContext.submitBatch(utf8ByteLength(batchRequestBody), batchRequest.getMultiPartContentType(), batchRequestBody, Object.assign({}, updatedOptions)));
@@ -22857,17 +22237,7 @@ class BlobBatchClient {
                 subResponsesFailedCount: responseSummary.subResponsesFailedCount,
             };
             return res;
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
 }
 
@@ -22961,22 +22331,9 @@ class ContainerClient extends StorageClient {
      * ```
      */
     async create(options = {}) {
-        const { span, updatedOptions } = createSpan("ContainerClient-create", options);
-        try {
-            // Spread operator in destructuring assignments,
-            // this will filter out unwanted properties from the response object into result object
-            return assertResponse(await this.containerContext.create(Object.assign({}, updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ContainerClient-create", options, async (updatedOptions) => {
+            return assertResponse(await this.containerContext.create(updatedOptions));
+        });
     }
     /**
      * Creates a new container under the specified account. If the container with
@@ -22987,29 +22344,21 @@ class ContainerClient extends StorageClient {
      * @param options -
      */
     async createIfNotExists(options = {}) {
-        var _a, _b;
-        const { span, updatedOptions } = createSpan("ContainerClient-createIfNotExists", options);
-        try {
-            const res = assertResponse(await this.create(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) === "ContainerAlreadyExists") {
-                span.setStatus({
-                    code: coreTracing.SpanStatusCode.ERROR,
-                    message: "Expected exception when creating a container 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("ContainerClient-createIfNotExists", options, async (updatedOptions) => {
+            var _a, _b;
+            try {
+                const res = await this.create(updatedOptions);
+                return Object.assign(Object.assign({ succeeded: true }, res), { _response: res._response });
             }
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "ContainerAlreadyExists") {
+                    return Object.assign(Object.assign({ succeeded: false }, (_b = e.response) === null || _b === void 0 ? void 0 : _b.parsedHeaders), { _response: e.response });
+                }
+                else {
+                    throw e;
+                }
+            }
+        });
     }
     /**
      * Returns true if the Azure container resource represented by this client exists; false otherwise.
@@ -23021,31 +22370,21 @@ class ContainerClient extends StorageClient {
      * @param options -
      */
     async exists(options = {}) {
-        const { span, updatedOptions } = createSpan("ContainerClient-exists", options);
-        try {
-            await this.getProperties({
-                abortSignal: options.abortSignal,
-                tracingOptions: updatedOptions.tracingOptions,
-            });
-            return true;
-        }
-        catch (e) {
-            if (e.statusCode === 404) {
-                span.setStatus({
-                    code: coreTracing.SpanStatusCode.ERROR,
-                    message: "Expected exception when checking container existence",
+        return tracingClient.withSpan("ContainerClient-exists", options, async (updatedOptions) => {
+            try {
+                await this.getProperties({
+                    abortSignal: options.abortSignal,
+                    tracingOptions: updatedOptions.tracingOptions,
                 });
-                return false;
+                return true;
             }
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (e.statusCode === 404) {
+                    return false;
+                }
+                throw e;
+            }
+        });
     }
     /**
      * Creates a {@link BlobClient}
@@ -23106,20 +22445,9 @@ class ContainerClient extends StorageClient {
         if (!options.conditions) {
             options.conditions = {};
         }
-        const { span, updatedOptions } = createSpan("ContainerClient-getProperties", options);
-        try {
+        return tracingClient.withSpan("ContainerClient-getProperties", options, async (updatedOptions) => {
             return assertResponse(await this.containerContext.getProperties(Object.assign(Object.assign({ abortSignal: options.abortSignal }, options.conditions), { tracingOptions: updatedOptions.tracingOptions })));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Marks the specified container for deletion. The container and any blobs
@@ -23132,25 +22460,14 @@ class ContainerClient extends StorageClient {
         if (!options.conditions) {
             options.conditions = {};
         }
-        const { span, updatedOptions } = createSpan("ContainerClient-delete", options);
-        try {
+        return tracingClient.withSpan("ContainerClient-delete", options, async (updatedOptions) => {
             return assertResponse(await this.containerContext.delete({
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
                 modifiedAccessConditions: options.conditions,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Marks the specified container for deletion if it exists. The container and any blobs
@@ -23160,29 +22477,19 @@ class ContainerClient extends StorageClient {
      * @param options - Options to Container Delete operation.
      */
     async deleteIfExists(options = {}) {
-        var _a, _b;
-        const { span, updatedOptions } = createSpan("ContainerClient-deleteIfExists", options);
-        try {
-            const res = 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) === "ContainerNotFound") {
-                span.setStatus({
-                    code: coreTracing.SpanStatusCode.ERROR,
-                    message: "Expected exception when deleting a container 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("ContainerClient-deleteIfExists", options, async (updatedOptions) => {
+            var _a, _b;
+            try {
+                const res = await this.delete(updatedOptions);
+                return Object.assign(Object.assign({ succeeded: true }, res), { _response: res._response });
             }
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "ContainerNotFound") {
+                    return Object.assign(Object.assign({ succeeded: false }, (_b = e.response) === null || _b === void 0 ? void 0 : _b.parsedHeaders), { _response: e.response });
+                }
+                throw e;
+            }
+        });
     }
     /**
      * Sets one or more user-defined name-value pairs for the specified container.
@@ -23203,8 +22510,7 @@ class ContainerClient extends StorageClient {
         if (options.conditions.ifUnmodifiedSince) {
             throw new RangeError("the IfUnmodifiedSince must have their default values because they are ignored by the blob service");
         }
-        const { span, updatedOptions } = createSpan("ContainerClient-setMetadata", options);
-        try {
+        return tracingClient.withSpan("ContainerClient-setMetadata", options, async (updatedOptions) => {
             return assertResponse(await this.containerContext.setMetadata({
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -23212,17 +22518,7 @@ class ContainerClient extends StorageClient {
                 modifiedAccessConditions: options.conditions,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Gets the permissions for the specified container. The permissions indicate
@@ -23239,8 +22535,7 @@ class ContainerClient extends StorageClient {
         if (!options.conditions) {
             options.conditions = {};
         }
-        const { span, updatedOptions } = createSpan("ContainerClient-getAccessPolicy", options);
-        try {
+        return tracingClient.withSpan("ContainerClient-getAccessPolicy", options, async (updatedOptions) => {
             const response = assertResponse(await this.containerContext.getAccessPolicy({
                 abortSignal: options.abortSignal,
                 leaseAccessConditions: options.conditions,
@@ -23277,17 +22572,7 @@ class ContainerClient extends StorageClient {
                 });
             }
             return res;
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Sets the permissions for the specified container. The permissions indicate
@@ -23308,8 +22593,7 @@ class ContainerClient extends StorageClient {
      */
     async setAccessPolicy(access, containerAcl, options = {}) {
         options.conditions = options.conditions || {};
-        const { span, updatedOptions } = createSpan("ContainerClient-setAccessPolicy", options);
-        try {
+        return tracingClient.withSpan("ContainerClient-setAccessPolicy", options, async (updatedOptions) => {
             const acl = [];
             for (const identifier of containerAcl || []) {
                 acl.push({
@@ -23333,17 +22617,7 @@ class ContainerClient extends StorageClient {
                 modifiedAccessConditions: options.conditions,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Get a {@link BlobLeaseClient} that manages leases on the container.
@@ -23377,25 +22651,14 @@ class ContainerClient extends StorageClient {
      * @returns Block Blob upload response data and the corresponding BlockBlobClient instance.
      */
     async uploadBlockBlob(blobName, body, contentLength, options = {}) {
-        const { span, updatedOptions } = createSpan("ContainerClient-uploadBlockBlob", options);
-        try {
+        return tracingClient.withSpan("ContainerClient-uploadBlockBlob", options, async (updatedOptions) => {
             const blockBlobClient = this.getBlockBlobClient(blobName);
             const response = await blockBlobClient.upload(body, contentLength, updatedOptions);
             return {
                 blockBlobClient,
                 response,
             };
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Marks the specified blob or snapshot for deletion. The blob is later deleted
@@ -23409,24 +22672,13 @@ class ContainerClient extends StorageClient {
      * @returns Block blob deletion response data.
      */
     async deleteBlob(blobName, options = {}) {
-        const { span, updatedOptions } = createSpan("ContainerClient-deleteBlob", options);
-        try {
+        return tracingClient.withSpan("ContainerClient-deleteBlob", options, async (updatedOptions) => {
             let blobClient = this.getBlobClient(blobName);
             if (options.versionId) {
                 blobClient = blobClient.withVersion(options.versionId);
             }
-            return await blobClient.delete(updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return blobClient.delete(updatedOptions);
+        });
     }
     /**
      * listBlobFlatSegment returns a single segment of blobs starting from the
@@ -23439,25 +22691,14 @@ class ContainerClient extends StorageClient {
      * @param options - Options to Container List Blob Flat Segment operation.
      */
     async listBlobFlatSegment(marker, options = {}) {
-        const { span, updatedOptions } = createSpan("ContainerClient-listBlobFlatSegment", options);
-        try {
+        return tracingClient.withSpan("ContainerClient-listBlobFlatSegment", options, async (updatedOptions) => {
             const response = assertResponse(await this.containerContext.listBlobFlatSegment(Object.assign(Object.assign({ marker }, options), { tracingOptions: updatedOptions.tracingOptions })));
             const wrappedResponse = Object.assign(Object.assign({}, response), { _response: Object.assign(Object.assign({}, response._response), { parsedBody: ConvertInternalResponseOfListBlobFlat(response._response.parsedBody) }), segment: Object.assign(Object.assign({}, response.segment), { blobItems: response.segment.blobItems.map((blobItemInternal) => {
                         const blobItem = Object.assign(Object.assign({}, blobItemInternal), { name: BlobNameToString(blobItemInternal.name), tags: toTags(blobItemInternal.blobTags), objectReplicationSourceProperties: parseObjectReplicationRecord(blobItemInternal.objectReplicationMetadata) });
                         return blobItem;
                     }) }) });
             return wrappedResponse;
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * listBlobHierarchySegment returns a single segment of blobs starting from
@@ -23471,9 +22712,8 @@ class ContainerClient extends StorageClient {
      * @param options - Options to Container List Blob Hierarchy Segment operation.
      */
     async listBlobHierarchySegment(delimiter, marker, options = {}) {
-        var _a;
-        const { span, updatedOptions } = createSpan("ContainerClient-listBlobHierarchySegment", options);
-        try {
+        return tracingClient.withSpan("ContainerClient-listBlobHierarchySegment", options, async (updatedOptions) => {
+            var _a;
             const response = assertResponse(await this.containerContext.listBlobHierarchySegment(delimiter, Object.assign(Object.assign({ marker }, options), { tracingOptions: updatedOptions.tracingOptions })));
             const wrappedResponse = Object.assign(Object.assign({}, response), { _response: Object.assign(Object.assign({}, response._response), { parsedBody: ConvertInternalResponseOfListBlobHierarchy(response._response.parsedBody) }), segment: Object.assign(Object.assign({}, response.segment), { blobItems: response.segment.blobItems.map((blobItemInternal) => {
                         const blobItem = Object.assign(Object.assign({}, blobItemInternal), { name: BlobNameToString(blobItemInternal.name), tags: toTags(blobItemInternal.blobTags), objectReplicationSourceProperties: parseObjectReplicationRecord(blobItemInternal.objectReplicationMetadata) });
@@ -23485,17 +22725,7 @@ class ContainerClient extends StorageClient {
                         return blobPrefix;
                     }) }) });
             return wrappedResponse;
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Returns an AsyncIterableIterator for ContainerListBlobFlatSegmentResponse
@@ -23890,8 +23120,7 @@ class ContainerClient extends StorageClient {
      * @param options - Options to find blobs by tags.
      */
     async findBlobsByTagsSegment(tagFilterSqlExpression, marker, options = {}) {
-        const { span, updatedOptions } = createSpan("ContainerClient-findBlobsByTagsSegment", options);
-        try {
+        return tracingClient.withSpan("ContainerClient-findBlobsByTagsSegment", options, async (updatedOptions) => {
             const response = assertResponse(await this.containerContext.filterBlobs({
                 abortSignal: options.abortSignal,
                 where: tagFilterSqlExpression,
@@ -23908,17 +23137,7 @@ class ContainerClient extends StorageClient {
                     return Object.assign(Object.assign({}, blob), { tags: toTags(blob.tags), tagValue });
                 }) });
             return wrappedResponse;
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Returns an AsyncIterableIterator for ContainerFindBlobsByTagsSegmentResponse.
@@ -24699,25 +23918,14 @@ class BlobServiceClient extends StorageClient {
      * @returns Container creation response and the corresponding container client.
      */
     async createContainer(containerName, options = {}) {
-        const { span, updatedOptions } = createSpan("BlobServiceClient-createContainer", options);
-        try {
+        return tracingClient.withSpan("BlobServiceClient-createContainer", options, async (updatedOptions) => {
             const containerClient = this.getContainerClient(containerName);
             const containerCreateResponse = await containerClient.create(updatedOptions);
             return {
                 containerClient,
                 containerCreateResponse,
             };
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Deletes a Blob container.
@@ -24727,21 +23935,10 @@ class BlobServiceClient extends StorageClient {
      * @returns Container deletion response.
      */
     async deleteContainer(containerName, options = {}) {
-        const { span, updatedOptions } = createSpan("BlobServiceClient-deleteContainer", options);
-        try {
+        return tracingClient.withSpan("BlobServiceClient-deleteContainer", options, async (updatedOptions) => {
             const containerClient = this.getContainerClient(containerName);
-            return await containerClient.delete(updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return containerClient.delete(updatedOptions);
+        });
     }
     /**
      * Restore a previously deleted Blob container.
@@ -24753,8 +23950,7 @@ class BlobServiceClient extends StorageClient {
      * @returns Container deletion response.
      */
     async undeleteContainer(deletedContainerName, deletedContainerVersion, options = {}) {
-        const { span, updatedOptions } = createSpan("BlobServiceClient-undeleteContainer", options);
-        try {
+        return tracingClient.withSpan("BlobServiceClient-undeleteContainer", options, async (updatedOptions) => {
             const containerClient = this.getContainerClient(options.destinationContainerName || deletedContainerName);
             // Hack to access a protected member.
             const containerContext = containerClient["storageClientContext"].container;
@@ -24764,17 +23960,7 @@ class BlobServiceClient extends StorageClient {
                 tracingOptions: updatedOptions.tracingOptions,
             }));
             return { containerClient, containerUndeleteResponse };
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Rename an existing Blob Container.
@@ -24786,25 +23972,14 @@ class BlobServiceClient extends StorageClient {
     /* eslint-disable-next-line @typescript-eslint/ban-ts-comment */
     // @ts-ignore Need to hide this interface for now. Make it public and turn on the live tests for it when the service is ready.
     async renameContainer(sourceContainerName, destinationContainerName, options = {}) {
-        var _a;
-        const { span, updatedOptions } = createSpan("BlobServiceClient-renameContainer", options);
-        try {
+        return tracingClient.withSpan("BlobServiceClient-renameContainer", options, async (updatedOptions) => {
+            var _a;
             const containerClient = this.getContainerClient(destinationContainerName);
             // Hack to access a protected member.
             const containerContext = containerClient["storageClientContext"].container;
             const containerRenameResponse = assertResponse(await containerContext.rename(sourceContainerName, Object.assign(Object.assign({}, updatedOptions), { sourceLeaseId: (_a = options.sourceCondition) === null || _a === void 0 ? void 0 : _a.leaseId })));
             return { containerClient, containerRenameResponse };
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Gets the properties of a storage account’s Blob service, including properties
@@ -24815,23 +23990,12 @@ class BlobServiceClient extends StorageClient {
      * @returns Response data for the Service Get Properties operation.
      */
     async getProperties(options = {}) {
-        const { span, updatedOptions } = createSpan("BlobServiceClient-getProperties", options);
-        try {
+        return tracingClient.withSpan("BlobServiceClient-getProperties", options, async (updatedOptions) => {
             return assertResponse(await this.serviceContext.getProperties({
                 abortSignal: options.abortSignal,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Sets properties for a storage account’s Blob service endpoint, including properties
@@ -24843,23 +24007,12 @@ class BlobServiceClient extends StorageClient {
      * @returns Response data for the Service Set Properties operation.
      */
     async setProperties(properties, options = {}) {
-        const { span, updatedOptions } = createSpan("BlobServiceClient-setProperties", options);
-        try {
+        return tracingClient.withSpan("BlobServiceClient-setProperties", options, async (updatedOptions) => {
             return assertResponse(await this.serviceContext.setProperties(properties, {
                 abortSignal: options.abortSignal,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Retrieves statistics related to replication for the Blob service. It is only
@@ -24871,23 +24024,12 @@ class BlobServiceClient extends StorageClient {
      * @returns Response data for the Service Get Statistics operation.
      */
     async getStatistics(options = {}) {
-        const { span, updatedOptions } = createSpan("BlobServiceClient-getStatistics", options);
-        try {
+        return tracingClient.withSpan("BlobServiceClient-getStatistics", options, async (updatedOptions) => {
             return assertResponse(await this.serviceContext.getStatistics({
                 abortSignal: options.abortSignal,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * The Get Account Information operation returns the sku name and account kind
@@ -24900,23 +24042,12 @@ class BlobServiceClient extends StorageClient {
      * @returns Response data for the Service Get Account Info operation.
      */
     async getAccountInfo(options = {}) {
-        const { span, updatedOptions } = createSpan("BlobServiceClient-getAccountInfo", options);
-        try {
+        return tracingClient.withSpan("BlobServiceClient-getAccountInfo", options, async (updatedOptions) => {
             return assertResponse(await this.serviceContext.getAccountInfo({
                 abortSignal: options.abortSignal,
                 tracingOptions: updatedOptions.tracingOptions,
             }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Returns a list of the containers under the specified account.
@@ -24933,20 +24064,9 @@ class BlobServiceClient extends StorageClient {
      * @returns Response data for the Service List Container Segment operation.
      */
     async listContainersSegment(marker, options = {}) {
-        const { span, updatedOptions } = createSpan("BlobServiceClient-listContainersSegment", options);
-        try {
+        return tracingClient.withSpan("BlobServiceClient-listContainersSegment", options, async (updatedOptions) => {
             return assertResponse(await this.serviceContext.listContainersSegment(Object.assign(Object.assign({ abortSignal: options.abortSignal, marker }, options), { include: typeof options.include === "string" ? [options.include] : options.include, tracingOptions: updatedOptions.tracingOptions })));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * The Filter Blobs operation enables callers to list blobs across all containers whose tags
@@ -24967,8 +24087,7 @@ class BlobServiceClient extends StorageClient {
      * @param options - Options to find blobs by tags.
      */
     async findBlobsByTagsSegment(tagFilterSqlExpression, marker, options = {}) {
-        const { span, updatedOptions } = createSpan("BlobServiceClient-findBlobsByTagsSegment", options);
-        try {
+        return tracingClient.withSpan("BlobServiceClient-findBlobsByTagsSegment", options, async (updatedOptions) => {
             const response = assertResponse(await this.serviceContext.filterBlobs({
                 abortSignal: options.abortSignal,
                 where: tagFilterSqlExpression,
@@ -24985,17 +24104,7 @@ class BlobServiceClient extends StorageClient {
                     return Object.assign(Object.assign({}, blob), { tags: toTags(blob.tags), tagValue });
                 }) });
             return wrappedResponse;
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Returns an AsyncIterableIterator for ServiceFindBlobsByTagsSegmentResponse.
@@ -25332,8 +24441,7 @@ class BlobServiceClient extends StorageClient {
      * @param expiresOn -     The end time for the user delegation SAS. Must be within 7 days of the current time
      */
     async getUserDelegationKey(startsOn, expiresOn, options = {}) {
-        const { span, updatedOptions } = createSpan("BlobServiceClient-getUserDelegationKey", options);
-        try {
+        return tracingClient.withSpan("BlobServiceClient-getUserDelegationKey", options, async (updatedOptions) => {
             const response = assertResponse(await this.serviceContext.getUserDelegationKey({
                 startsOn: truncatedISO8061Date(startsOn, false),
                 expiresOn: truncatedISO8061Date(expiresOn, false),
@@ -25352,17 +24460,7 @@ class BlobServiceClient extends StorageClient {
             };
             const res = Object.assign({ _response: response._response, requestId: response.requestId, clientRequestId: response.clientRequestId, version: response.version, date: response.date, errorCode: response.errorCode }, userDelegationKey);
             return res;
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Creates a BlobBatchClient object to conduct batch operations.