@azure/storage-file-share 12.14.0 → 12.20.0-alpha.20230607.3

package/dist-esm/{src → storage-file-share/src}/Clients.js

@@ -1,16 +1,14 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 import { __asyncGenerator, __asyncValues, __await } from "tslib";
-import { isNode, isTokenCredential, } from "@azure/core-http";
-import { SpanStatusCode } from "@azure/core-tracing";
-import { Share, Directory, File } from "./generated/src/operations";
-import { newPipeline, Pipeline } from "./Pipeline";
+import { isNode } from "@azure/core-util";
+import { newPipeline, Pipeline, } from "../../storage-blob/src/Pipeline";
 import { DEFAULT_MAX_DOWNLOAD_RETRY_REQUESTS, DEFAULT_HIGH_LEVEL_CONCURRENCY, FILE_MAX_SIZE_BYTES, FILE_RANGE_MAX_SIZE_BYTES, URLConstants, FileAttributesPreserve, FileAttributesNone, } from "./utils/constants";
-import { appendToURLPath, setURLParameter, truncatedISO8061Date, extractConnectionStringParts, getShareNameAndPathFromUrl, appendToURLQuery, httpAuthorizationToString, setURLPath, setURLQueries, EscapePath, ConvertInternalResponseOfListFiles, ConvertInternalResponseOfListHandles, } from "./utils/utils.common";
-import { Credential } from "./credentials/Credential";
-import { StorageSharedKeyCredential } from "./credentials/StorageSharedKeyCredential";
-import { AnonymousCredential } from "./credentials/AnonymousCredential";
-import { convertTracingToRequestOptionsBase, createSpan } from "./utils/tracing";
+import { appendToURLPath, setURLParameter, truncatedISO8061Date, extractConnectionStringParts, getShareNameAndPathFromUrl, appendToURLQuery, httpAuthorizationToString, setURLPath, setURLQueries, EscapePath, assertResponse, } from "./utils/utils.common";
+import { Credential } from "../../storage-blob/src/credentials/Credential";
+import { StorageSharedKeyCredential } from "../../storage-blob/src/credentials/StorageSharedKeyCredential";
+import { AnonymousCredential } from "../../storage-blob/src/credentials/AnonymousCredential";
+import { tracingClient } from "./utils/tracing";
 import { StorageClient } from "./StorageClient";
 import "@azure/core-paging";
 import { FileSystemAttributes } from "./FileSystemAttributes";
@@ -20,14 +18,18 @@ import { fileAttributesToString, fileCreationTimeToString, fileLastWriteTimeToSt
 import { Batch } from "./utils/Batch";
 import { BufferScheduler } from "./utils/BufferScheduler";
 import { fsStat, fsCreateReadStream, readStreamToLocalFile, streamToBuffer, } from "./utils/utils.node";
-import { StorageClientContext } from "./generated/src/storageClientContext";
-import { SERVICE_VERSION } from "./utils/constants";
-import { generateUuid } from "@azure/core-http";
+import { v4 as generateUuid } from "uuid";
 import { generateFileSASQueryParameters } from "./FileSASSignatureValues";
 /**
  * A ShareClient represents a URL to the Azure Storage share allowing you to manipulate its directories and files.
  */
 export class ShareClient extends StorageClient {
+    /**
+     * The name of the share
+     */
+    get name() {
+        return this._name;
+    }
     constructor(urlOrConnectionString, credentialOrPipelineOrShareName, 
     // Legacy, no way to fix the eslint error without breaking. Disable the rule for this line.
     /* eslint-disable-next-line @azure/azure-sdk/ts-naming-options */
@@ -39,8 +41,7 @@ export class ShareClient extends StorageClient {
             url = urlOrConnectionString;
             pipeline = credentialOrPipelineOrShareName;
         }
-        else if (credentialOrPipelineOrShareName instanceof Credential ||
-            isTokenCredential(credentialOrPipelineOrShareName)) {
+        else if (credentialOrPipelineOrShareName instanceof Credential) {
             // (url: string, credential?: Credential, options?: StoragePipelineOptions)
             url = urlOrConnectionString;
             pipeline = newPipeline(credentialOrPipelineOrShareName, options);
@@ -80,14 +81,7 @@ export class ShareClient extends StorageClient {
         }
         super(url, pipeline);
         this._name = getShareNameAndPathFromUrl(this.url).shareName;
-        this.shareClientConfig = options;
-        this.context = new Share(this.storageClientContext);
-    }
-    /**
-     * The name of the share
-     */
-    get name() {
-        return this._name;
+        this.context = this.storageClientContext.share;
     }
     /**
      * Creates a new ShareClient object identical to the source but with the specified snapshot timestamp.
@@ -97,7 +91,7 @@ export class ShareClient extends StorageClient {
      * @returns A new ShareClient object identical to the source but with the specified snapshot timestamp
      */
     withSnapshot(snapshot) {
-        return new ShareClient(setURLParameter(this.url, URLConstants.Parameters.SHARE_SNAPSHOT, snapshot.length === 0 ? undefined : snapshot), this.pipeline, this.shareClientConfig);
+        return new ShareClient(setURLParameter(this.url, URLConstants.Parameters.SHARE_SNAPSHOT, snapshot.length === 0 ? undefined : snapshot), this.pipeline);
     }
     /**
      * Creates a new share under the specified account. If the share with
@@ -108,20 +102,9 @@ export class ShareClient extends StorageClient {
      * @returns Response data for the Share Create operation.
      */
     async create(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareClient-create", options);
-        try {
-            return await this.context.create(Object.assign(Object.assign(Object.assign({}, options), { enabledProtocols: toShareProtocolsString(options.protocols) }), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareClient-create", options, async (updatedOptions) => {
+            return assertResponse(await this.context.create(Object.assign(Object.assign({}, updatedOptions), { enabledProtocols: toShareProtocolsString(updatedOptions.protocols) })));
+        });
     }
     /**
      * Creates a new share under the specified account. If the share with
@@ -131,29 +114,19 @@ export class ShareClient extends StorageClient {
      * @param options -
      */
     async createIfNotExists(options = {}) {
-        var _a, _b;
-        const { span, updatedOptions } = createSpan("ShareClient-createIfNotExists", options);
-        try {
-            const res = await this.create(updatedOptions);
-            return Object.assign({ succeeded: true }, res);
-        }
-        catch (e) {
-            if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "ShareAlreadyExists") {
-                span.setStatus({
-                    code: SpanStatusCode.ERROR,
-                    message: "Expected exception when creating a share only if it doesn't 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("ShareClient-createIfNotExists", options, async (updatedOptions) => {
+            var _a, _b;
+            try {
+                const res = await this.create(updatedOptions);
+                return Object.assign({ succeeded: true }, res);
             }
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "ShareAlreadyExists") {
+                    return Object.assign(Object.assign({ succeeded: false }, (_b = e.response) === null || _b === void 0 ? void 0 : _b.parsedHeaders), { _response: e.response });
+                }
+                throw e;
+            }
+        });
     }
     /**
      * Creates a {@link ShareDirectoryClient} object.
@@ -164,7 +137,7 @@ export class ShareClient extends StorageClient {
     // Legacy, no way to fix the eslint error without breaking. Disable the rule for this line.
     /* eslint-disable-next-line @azure/azure-sdk/ts-naming-subclients */
     getDirectoryClient(directoryName) {
-        return new ShareDirectoryClient(appendToURLPath(this.url, EscapePath(directoryName)), this.pipeline, this.shareClientConfig);
+        return new ShareDirectoryClient(appendToURLPath(this.url, EscapePath(directoryName)), this.pipeline);
     }
     /**
      * Gets the directory client for the root directory of this share.
@@ -186,25 +159,14 @@ export class ShareClient extends StorageClient {
      * @returns Directory creation response data and the corresponding directory client.
      */
     async createDirectory(directoryName, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareClient-createDirectory", options);
-        try {
+        return tracingClient.withSpan("ShareClient-createDirectory", options, async (updatedOptions) => {
             const directoryClient = this.getDirectoryClient(directoryName);
             const directoryCreateResponse = await directoryClient.create(updatedOptions);
             return {
                 directoryClient,
                 directoryCreateResponse,
             };
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Removes the specified empty sub directory under this share.
@@ -216,21 +178,10 @@ export class ShareClient extends StorageClient {
      * @returns Directory deletion response data.
      */
     async deleteDirectory(directoryName, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareClient-deleteDirectory", options);
-        try {
+        return tracingClient.withSpan("ShareClient-deleteDirectory", options, async (updatedOptions) => {
             const directoryClient = this.getDirectoryClient(directoryName);
-            return await directoryClient.delete(updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return directoryClient.delete(updatedOptions);
+        });
     }
     /**
      * Creates a new file or replaces a file under the root directory of this share.
@@ -243,8 +194,7 @@ export class ShareClient extends StorageClient {
      * @returns File creation response data and the corresponding file client.
      */
     async createFile(fileName, size, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareClient-createFile", options);
-        try {
+        return tracingClient.withSpan("ShareClient-createFile", options, async (updatedOptions) => {
             const directoryClient = this.rootDirectoryClient;
             const fileClient = directoryClient.getFileClient(fileName);
             const fileCreateResponse = await fileClient.create(size, updatedOptions);
@@ -252,17 +202,7 @@ export class ShareClient extends StorageClient {
                 fileClient,
                 fileCreateResponse,
             };
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Removes a file under the root directory of this share from the storage account.
@@ -285,22 +225,11 @@ export class ShareClient extends StorageClient {
      * @returns Promise<FileDeleteResponse> File Delete response data.
      */
     async deleteFile(fileName, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareClient-deleteFile", options);
-        try {
+        return tracingClient.withSpan("ShareClient-deleteFile", options, async (updatedOptions) => {
             const directoryClient = this.rootDirectoryClient;
             const fileClient = directoryClient.getFileClient(fileName);
-            return await fileClient.delete(updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return fileClient.delete(updatedOptions);
+        });
     }
     /**
      * Returns true if the Azrue share resource represented by this client exists; false otherwise.
@@ -312,28 +241,18 @@ export class ShareClient extends StorageClient {
      * @param options - options to Exists operation.
      */
     async exists(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareClient-exists", options);
-        try {
-            await this.getProperties(updatedOptions);
-            return true;
-        }
-        catch (e) {
-            if (e.statusCode === 404) {
-                span.setStatus({
-                    code: SpanStatusCode.ERROR,
-                    message: "Expected exception when checking share existence",
-                });
-                return false;
+        return tracingClient.withSpan("ShareClient-exists", options, async (updatedOptions) => {
+            try {
+                await this.getProperties(updatedOptions);
+                return true;
             }
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (e.statusCode === 404) {
+                    return false;
+                }
+                throw e;
+            }
+        });
     }
     /**
      * Returns all user-defined metadata and system properties for the specified
@@ -348,24 +267,10 @@ export class ShareClient extends StorageClient {
      * @returns Response data for the Share Get Properties operation.
      */
     async getProperties(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareClient-getProperties", options);
-        try {
-            const res = await this.context.getProperties(Object.assign(Object.assign({}, options), convertTracingToRequestOptionsBase(updatedOptions)));
-            // parse protocols
-            const protocols = toShareProtocols(res.enabledProtocols);
-            res.protocols = protocols;
-            return res;
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareClient-getProperties", options, async (updatedOptions) => {
+            const res = assertResponse(await this.context.getProperties(updatedOptions));
+            return Object.assign(Object.assign({}, res), { protocols: toShareProtocols(res.enabledProtocols) });
+        });
     }
     /**
      * Marks the specified share for deletion. The share and any directories or files
@@ -376,20 +281,9 @@ export class ShareClient extends StorageClient {
      * @returns Response data for the Share Delete operation.
      */
     async delete(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareClient-delete", options);
-        try {
-            return await this.context.delete(Object.assign(Object.assign({}, options), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareClient-delete", options, async (updatedOptions) => {
+            return assertResponse(await this.context.delete(Object.assign({}, updatedOptions)));
+        });
     }
     /**
      * Marks the specified share for deletion if it exists. The share and any directories or files
@@ -399,29 +293,19 @@ export class ShareClient extends StorageClient {
      * @param options -
      */
     async deleteIfExists(options = {}) {
-        var _a, _b;
-        const { span, updatedOptions } = createSpan("ShareClient-deleteIfExists", options);
-        try {
-            const res = await this.delete(updatedOptions);
-            return Object.assign({ succeeded: true }, res);
-        }
-        catch (e) {
-            if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "ShareNotFound") {
-                span.setStatus({
-                    code: SpanStatusCode.ERROR,
-                    message: "Expected exception when deleting a share 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("ShareClient-deleteIfExists", options, async (updatedOptions) => {
+            var _a, _b;
+            try {
+                const res = await this.delete(updatedOptions);
+                return Object.assign({ succeeded: true }, res);
             }
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "ShareNotFound") {
+                    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 share.
@@ -435,20 +319,9 @@ export class ShareClient extends StorageClient {
      * @returns Response data for the Share Set Metadata operation.
      */
     async setMetadata(metadata, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareClient-setMetadata", options);
-        try {
-            return await this.context.setMetadata(Object.assign(Object.assign(Object.assign({}, options), { metadata }), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareClient-setMetadata", options, async (updatedOptions) => {
+            return assertResponse(await this.context.setMetadata(Object.assign(Object.assign({}, updatedOptions), { metadata })));
+        });
     }
     /**
      * Gets the permissions for the specified share. The permissions indicate
@@ -463,9 +336,8 @@ export class ShareClient extends StorageClient {
      * @returns Response data for the Share Get Access Policy operation.
      */
     async getAccessPolicy(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareClient-getAccessPolicy", options);
-        try {
-            const response = await this.context.getAccessPolicy(Object.assign(Object.assign({}, options), convertTracingToRequestOptionsBase(updatedOptions)));
+        return tracingClient.withSpan("ShareClient-getAccessPolicy", options, async (updatedOptions) => {
+            const response = assertResponse(await this.context.getAccessPolicy(Object.assign({}, updatedOptions)));
             const res = {
                 _response: response._response,
                 date: response.date,
@@ -494,17 +366,7 @@ export class ShareClient extends StorageClient {
                 });
             }
             return res;
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Sets the permissions for the specified share. The permissions indicate
@@ -524,9 +386,8 @@ export class ShareClient extends StorageClient {
      * @returns Response data for the Share Set Access Policy operation.
      */
     async setAccessPolicy(shareAcl, options = {}) {
-        var _a, _b, _c;
-        const { span, updatedOptions } = createSpan("ShareClient-setAccessPolicy", options);
-        try {
+        return tracingClient.withSpan("ShareClient-setAccessPolicy", options, async (updatedOptions) => {
+            var _a, _b, _c;
             const acl = [];
             for (const identifier of shareAcl || []) {
                 acl.push({
@@ -542,18 +403,8 @@ export class ShareClient extends StorageClient {
                     id: identifier.id,
                 });
             }
-            return await this.context.setAccessPolicy(Object.assign(Object.assign(Object.assign({}, options), { shareAcl: acl }), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return assertResponse(await this.context.setAccessPolicy(Object.assign(Object.assign({}, updatedOptions), { shareAcl: acl })));
+        });
     }
     /**
      * Creates a read-only snapshot of a share.
@@ -562,20 +413,9 @@ export class ShareClient extends StorageClient {
      * @returns Response data for the Share Create Snapshot operation.
      */
     async createSnapshot(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareClient-createSnapshot", options);
-        try {
-            return await this.context.createSnapshot(Object.assign(Object.assign({ abortSignal: options.abortSignal }, options), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareClient-createSnapshot", options, async (updatedOptions) => {
+            return assertResponse(await this.context.createSnapshot(updatedOptions));
+        });
     }
     /**
      * Sets quota for the specified share.
@@ -587,20 +427,9 @@ export class ShareClient extends StorageClient {
      * @returns Response data for the Share Get Quota operation.
      */
     async setQuota(quotaInGB, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareClient-setQuota", options);
-        try {
-            return await this.context.setProperties(Object.assign(Object.assign(Object.assign({}, options), { quota: quotaInGB }), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareClient-setQuota", options, async (updatedOptions) => {
+            return assertResponse(await this.context.setProperties(Object.assign(Object.assign({}, updatedOptions), { quota: quotaInGB })));
+        });
     }
     /**
      * Sets properties of the share.
@@ -609,20 +438,9 @@ export class ShareClient extends StorageClient {
      * @returns Response data for the Share Set Properties operation.
      */
     async setProperties(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareClient-setProperties", options);
-        try {
-            return await this.context.setProperties(Object.assign(Object.assign({}, options), { quota: options.quotaInGB, tracingOptions: updatedOptions.tracingOptions }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareClient-setProperties", options, async (updatedOptions) => {
+            return assertResponse(await this.context.setProperties(Object.assign(Object.assign({}, options), { quota: options.quotaInGB, tracingOptions: updatedOptions.tracingOptions })));
+        });
     }
     /**
      * Retrieves statistics related to the share.
@@ -631,22 +449,11 @@ export class ShareClient extends StorageClient {
      * @returns Response data for the Share Get Statistics operation.
      */
     async getStatistics(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareClient-getStatistics", options);
-        try {
-            const response = await this.context.getStatistics(Object.assign(Object.assign({}, options), convertTracingToRequestOptionsBase(updatedOptions)));
+        return tracingClient.withSpan("ShareClient-getStatistics", options, async (updatedOptions) => {
+            const response = assertResponse(await this.context.getStatistics(updatedOptions));
             const GBBytes = 1024 * 1024 * 1024;
             return Object.assign(Object.assign({}, response), { shareUsage: Math.ceil(response.shareUsageBytes / GBBytes) });
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Creates a file permission (a security descriptor) at the share level.
@@ -657,22 +464,11 @@ export class ShareClient extends StorageClient {
      * @param filePermission - File permission described in the SDDL
      */
     async createPermission(filePermission, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareClient-createPermission", options);
-        try {
-            return await this.context.createPermission({
+        return tracingClient.withSpan("ShareClient-createPermission", options, async (updatedOptions) => {
+            return assertResponse(await this.context.createPermission({
                 permission: filePermission,
-            }, Object.assign(Object.assign({ abortSignal: options.abortSignal }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            }, updatedOptions));
+        });
     }
     /**
      * Gets the Security Descriptor Definition Language (SDDL) for a given file permission key
@@ -683,20 +479,9 @@ export class ShareClient extends StorageClient {
      * @param filePermissionKey - File permission key which indicates the security descriptor of the permission.
      */
     async getPermission(filePermissionKey, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareClient-getPermission", options);
-        try {
-            return await this.context.getPermission(filePermissionKey, Object.assign(Object.assign({ abortSignal: options.abortSignal }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareClient-getPermission", options, async (updatedOptions) => {
+            return assertResponse(await this.context.getPermission(filePermissionKey, updatedOptions));
+        });
     }
     /**
      * Only available for ShareClient constructed with a shared key credential.
@@ -721,28 +506,6 @@ export class ShareClient extends StorageClient {
  * A ShareDirectoryClient represents a URL to the Azure Storage directory allowing you to manipulate its files and directories.
  */
 export class ShareDirectoryClient extends StorageClient {
-    constructor(url, credentialOrPipeline, options = {}) {
-        let pipeline;
-        if (credentialOrPipeline instanceof Pipeline) {
-            pipeline = credentialOrPipeline;
-        }
-        else if (credentialOrPipeline instanceof Credential ||
-            isTokenCredential(credentialOrPipeline)) {
-            pipeline = newPipeline(credentialOrPipeline, options);
-        }
-        else {
-            // The second parameter is undefined. Use anonymous credential.
-            pipeline = newPipeline(new AnonymousCredential(), options);
-        }
-        super(url, pipeline);
-        ({
-            baseName: this._name,
-            shareName: this._shareName,
-            path: this._path,
-        } = getShareNameAndPathFromUrl(this.url));
-        this.shareClientConfig = options;
-        this.context = new Directory(this.storageClientContext);
-    }
     /**
      * The share name corresponding to this directory client
      */
@@ -761,6 +524,29 @@ export class ShareDirectoryClient extends StorageClient {
     get name() {
         return this._name;
     }
+    constructor(url, credentialOrPipeline, 
+    // Legacy, no way to fix the eslint error without breaking. Disable the rule for this line.
+    /* eslint-disable-next-line @azure/azure-sdk/ts-naming-options */
+    options = {}) {
+        let pipeline;
+        if (credentialOrPipeline instanceof Pipeline) {
+            pipeline = credentialOrPipeline;
+        }
+        else if (credentialOrPipeline instanceof Credential) {
+            pipeline = newPipeline(credentialOrPipeline, options);
+        }
+        else {
+            // The second parameter is undefined. Use anonymous credential.
+            pipeline = newPipeline(new AnonymousCredential(), options);
+        }
+        super(url, pipeline);
+        ({
+            baseName: this._name,
+            shareName: this._shareName,
+            path: this._path,
+        } = getShareNameAndPathFromUrl(this.url));
+        this.context = this.storageClientContext.directory;
+    }
     /**
      * Creates a new directory under the specified share or parent directory.
      * @see https://docs.microsoft.com/en-us/rest/api/storageservices/create-directory
@@ -769,29 +555,18 @@ export class ShareDirectoryClient extends StorageClient {
      * @returns Response data for the Directory  operation.
      */
     async create(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-create", options);
-        try {
-            if (!options.fileAttributes) {
-                options = validateAndSetDefaultsForFileAndDirectoryCreateCommonOptions(options);
-                // By default set it as a directory.
-                const attributes = new FileSystemAttributes();
-                attributes.directory = true;
-                options.fileAttributes = attributes;
-            }
-            return await this.context.create(options.fileAttributes
-                ? fileAttributesToString(options.fileAttributes)
-                : FileAttributesNone, Object.assign(Object.assign({ abortSignal: options.abortSignal, metadata: options.metadata, filePermission: options.filePermission, filePermissionKey: options.filePermissionKey, fileChangeOn: fileChangeTimeToString(options.changeTime), fileCreatedOn: fileCreationTimeToString(options.creationTime), fileLastWriteOn: fileLastWriteTimeToString(options.lastWriteTime) }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        if (!options.fileAttributes) {
+            options = validateAndSetDefaultsForFileAndDirectoryCreateCommonOptions(options);
+            // By default set it as a directory.
+            const attributes = new FileSystemAttributes();
+            attributes.directory = true;
+            options.fileAttributes = attributes;
+        }
+        return tracingClient.withSpan("ShareDirectoryClient-create", options, async (updatedOptions) => {
+            return assertResponse(await this.context.create(updatedOptions.fileAttributes
+                ? fileAttributesToString(updatedOptions.fileAttributes)
+                : FileAttributesNone, Object.assign(Object.assign({}, updatedOptions), { fileChangeOn: fileChangeTimeToString(updatedOptions.changeTime), fileCreatedOn: fileCreationTimeToString(updatedOptions.creationTime), fileLastWriteOn: fileLastWriteTimeToString(updatedOptions.lastWriteTime) })));
+        });
     }
     /**
      * Creates a new directory under the specified share or parent directory if it does not already exists.
@@ -801,29 +576,19 @@ export class ShareDirectoryClient extends StorageClient {
      * @param options -
      */
     async createIfNotExists(options = {}) {
-        var _a, _b;
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-createIfNotExists", options);
-        try {
-            const res = await this.create(updatedOptions);
-            return Object.assign({ succeeded: true }, res);
-        }
-        catch (e) {
-            if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "ResourceAlreadyExists") {
-                span.setStatus({
-                    code: SpanStatusCode.ERROR,
-                    message: "Expected exception when creating a directory 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("ShareDirectoryClient-createIfNotExists", options, async (updatedOptions) => {
+            var _a, _b;
+            try {
+                const res = await this.create(updatedOptions);
+                return Object.assign({ succeeded: true }, res);
             }
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "ResourceAlreadyExists") {
+                    return Object.assign(Object.assign({ succeeded: false }, (_b = e.response) === null || _b === void 0 ? void 0 : _b.parsedHeaders), { _response: e.response });
+                }
+                throw e;
+            }
+        });
     }
     /**
      * Sets properties on the directory.
@@ -833,23 +598,12 @@ export class ShareDirectoryClient extends StorageClient {
      *                                            existing values will be preserved.
      */
     async setProperties(properties = {}) {
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-setProperties", properties);
-        try {
-            properties = validateAndSetDefaultsForFileAndDirectorySetPropertiesCommonOptions(properties);
-            return await this.context.setProperties(properties.fileAttributes
-                ? fileAttributesToString(properties.fileAttributes)
-                : FileAttributesPreserve, Object.assign(Object.assign({ abortSignal: properties.abortSignal, filePermission: properties.filePermission, filePermissionKey: properties.filePermissionKey, fileChangeOn: fileChangeTimeToString(updatedOptions.changeTime), fileCreatedOn: fileCreationTimeToString(properties.creationTime), fileLastWriteOn: fileLastWriteTimeToString(properties.lastWriteTime) }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        properties = validateAndSetDefaultsForFileAndDirectorySetPropertiesCommonOptions(properties);
+        return tracingClient.withSpan("ShareDirectoryClient-setProperties", properties, async (updatedOptions) => {
+            return assertResponse(await this.context.setProperties(updatedOptions.fileAttributes
+                ? fileAttributesToString(updatedOptions.fileAttributes)
+                : FileAttributesPreserve, Object.assign(Object.assign({}, updatedOptions), { fileChangeOn: fileChangeTimeToString(updatedOptions.changeTime), fileCreatedOn: fileCreationTimeToString(updatedOptions.creationTime), fileLastWriteOn: fileLastWriteTimeToString(updatedOptions.lastWriteTime) })));
+        });
     }
     /**
      * Creates a ShareDirectoryClient object for a sub directory.
@@ -866,7 +620,7 @@ export class ShareDirectoryClient extends StorageClient {
      * ```
      */
     getDirectoryClient(subDirectoryName) {
-        return new ShareDirectoryClient(appendToURLPath(this.url, EscapePath(subDirectoryName)), this.pipeline, this.shareClientConfig);
+        return new ShareDirectoryClient(appendToURLPath(this.url, EscapePath(subDirectoryName)), this.pipeline);
     }
     /**
      * Creates a new subdirectory under this directory.
@@ -877,25 +631,14 @@ export class ShareDirectoryClient extends StorageClient {
      * @returns Directory create response data and the corresponding DirectoryClient instance.
      */
     async createSubdirectory(directoryName, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-createSubdirectory", options);
-        try {
+        return tracingClient.withSpan("ShareDirectoryClient-createSubdirectory", options, async (updatedOptions) => {
             const directoryClient = this.getDirectoryClient(directoryName);
             const directoryCreateResponse = await directoryClient.create(updatedOptions);
             return {
                 directoryClient,
                 directoryCreateResponse,
             };
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Removes the specified empty sub directory under this directory.
@@ -907,21 +650,10 @@ export class ShareDirectoryClient extends StorageClient {
      * @returns Directory deletion response data.
      */
     async deleteSubdirectory(directoryName, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-deleteSubdirectory", options);
-        try {
+        return tracingClient.withSpan("ShareDirectoryClient-deleteSubdirectory", options, async (updatedOptions) => {
             const directoryClient = this.getDirectoryClient(directoryName);
-            return await directoryClient.delete(updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return directoryClient.delete(updatedOptions);
+        });
     }
     /**
      * Creates a new file or replaces a file under this directory. Note it only initializes the file with no content.
@@ -933,25 +665,14 @@ export class ShareDirectoryClient extends StorageClient {
      * @returns File creation response data and the corresponding file client.
      */
     async createFile(fileName, size, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-createFile", options);
-        try {
+        return tracingClient.withSpan("ShareDirectoryClient-createFile", options, async (updatedOptions) => {
             const fileClient = this.getFileClient(fileName);
             const fileCreateResponse = await fileClient.create(size, updatedOptions);
             return {
                 fileClient,
                 fileCreateResponse,
             };
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Removes the specified file under this directory from the storage account.
@@ -972,21 +693,10 @@ export class ShareDirectoryClient extends StorageClient {
      * @returns File deletion response data.
      */
     async deleteFile(fileName, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-deleteFile", options);
-        try {
+        return tracingClient.withSpan("ShareDirectoryClient-deleteFile", options, async (updatedOptions) => {
             const fileClient = this.getFileClient(fileName);
-            return await fileClient.delete(updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return fileClient.delete(updatedOptions);
+        });
     }
     /**
      * Creates a {@link ShareFileClient} object.
@@ -1011,7 +721,7 @@ export class ShareDirectoryClient extends StorageClient {
     // Legacy, no way to fix the eslint error without breaking. Disable the rule for this line.
     /* eslint-disable-next-line @azure/azure-sdk/ts-naming-subclients */
     getFileClient(fileName) {
-        return new ShareFileClient(appendToURLPath(this.url, EscapePath(fileName)), this.pipeline, this.shareClientConfig);
+        return new ShareFileClient(appendToURLPath(this.url, EscapePath(fileName)), this.pipeline);
     }
     /**
      * Returns true if the specified directory exists; false otherwise.
@@ -1023,31 +733,18 @@ export class ShareDirectoryClient extends StorageClient {
      * @param options - options to Exists operation.
      */
     async exists(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-exists", options);
-        try {
-            await this.getProperties({
-                abortSignal: options.abortSignal,
-                tracingOptions: Object.assign(Object.assign({}, options.tracingOptions), convertTracingToRequestOptionsBase(updatedOptions)),
-            });
-            return true;
-        }
-        catch (e) {
-            if (e.statusCode === 404) {
-                span.setStatus({
-                    code: SpanStatusCode.ERROR,
-                    message: "Expected exception when checking directory existence",
-                });
-                return false;
+        return tracingClient.withSpan("ShareDirectoryClient-exists", options, async (updatedOptions) => {
+            try {
+                await this.getProperties(updatedOptions);
+                return true;
             }
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (e.statusCode === 404) {
+                    return false;
+                }
+                throw e;
+            }
+        });
     }
     /**
      * Returns all system properties for the specified directory, and can also be used to check the
@@ -1059,20 +756,9 @@ export class ShareDirectoryClient extends StorageClient {
      * @returns Response data for the Directory Get Properties operation.
      */
     async getProperties(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-getProperties", options);
-        try {
-            return await this.context.getProperties(Object.assign(Object.assign({ abortSignal: options.abortSignal }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareDirectoryClient-getProperties", options, async (updatedOptions) => {
+            return assertResponse(await this.context.getProperties(updatedOptions));
+        });
     }
     /**
      * Removes the specified empty directory. Note that the directory must be empty before it can be
@@ -1083,20 +769,9 @@ export class ShareDirectoryClient extends StorageClient {
      * @returns Response data for the Directory Delete operation.
      */
     async delete(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-delete", options);
-        try {
-            return await this.context.delete(Object.assign(Object.assign({ abortSignal: options.abortSignal }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareDirectoryClient-delete", options, async (updatedOptions) => {
+            return assertResponse(await this.context.delete(updatedOptions));
+        });
     }
     /**
      * Removes the specified empty directory if it exists. Note that the directory must be empty before it can be
@@ -1106,30 +781,20 @@ export class ShareDirectoryClient extends StorageClient {
      * @param options -
      */
     async deleteIfExists(options = {}) {
-        var _a, _b, _c;
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-deleteIfExists", options);
-        try {
-            const res = await this.delete(updatedOptions);
-            return Object.assign({ succeeded: true }, res);
-        }
-        catch (e) {
-            if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "ResourceNotFound" ||
-                ((_b = e.details) === null || _b === void 0 ? void 0 : _b.errorCode) === "ParentNotFound") {
-                span.setStatus({
-                    code: SpanStatusCode.ERROR,
-                    message: "Expected exception when deleting a directory only if it exists.",
-                });
-                return Object.assign(Object.assign({ succeeded: false }, (_c = e.response) === null || _c === void 0 ? void 0 : _c.parsedHeaders), { _response: e.response });
+        return tracingClient.withSpan("ShareDirectoryClient-deleteIfExists", options, async (updatedOptions) => {
+            var _a, _b, _c;
+            try {
+                const res = await this.delete(updatedOptions);
+                return Object.assign({ succeeded: true }, res);
             }
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "ResourceNotFound" ||
+                    ((_b = e.details) === null || _b === void 0 ? void 0 : _b.errorCode) === "ParentNotFound") {
+                    return Object.assign(Object.assign({ succeeded: false }, (_c = e.response) === null || _c === void 0 ? void 0 : _c.parsedHeaders), { _response: e.response });
+                }
+                throw e;
+            }
+        });
     }
     /**
      * Updates user defined metadata for the specified directory.
@@ -1140,20 +805,9 @@ export class ShareDirectoryClient extends StorageClient {
      * @returns Response data for the Directory Set Metadata operation.
      */
     async setMetadata(metadata, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-setMetadata", options);
-        try {
-            return await this.context.setMetadata(Object.assign(Object.assign({ abortSignal: options.abortSignal, metadata }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareDirectoryClient-setMetadata", options, async (updatedOptions) => {
+            return assertResponse(await this.context.setMetadata(Object.assign(Object.assign({}, updatedOptions), { metadata })));
+        });
     }
     /**
      * Returns an AsyncIterableIterator for {@link DirectoryListFilesAndDirectoriesSegmentResponse} objects
@@ -1187,26 +841,33 @@ export class ShareDirectoryClient extends StorageClient {
      */
     listFilesAndDirectoriesItems(options = {}) {
         return __asyncGenerator(this, arguments, function* listFilesAndDirectoriesItems_1() {
-            var e_1, _a;
+            var _a, e_1, _b, _c;
             if (options.prefix === "") {
                 options.prefix = undefined;
             }
             let marker;
             try {
-                for (var _b = __asyncValues(this.iterateFilesAndDirectoriesSegments(marker, options)), _c; _c = yield __await(_b.next()), !_c.done;) {
-                    const listFilesAndDirectoriesResponse = _c.value;
-                    for (const file of listFilesAndDirectoriesResponse.segment.fileItems) {
-                        yield yield __await(Object.assign({ kind: "file" }, file));
+                for (var _d = true, _e = __asyncValues(this.iterateFilesAndDirectoriesSegments(marker, options)), _f; _f = yield __await(_e.next()), _a = _f.done, !_a;) {
+                    _c = _f.value;
+                    _d = false;
+                    try {
+                        const listFilesAndDirectoriesResponse = _c;
+                        for (const file of listFilesAndDirectoriesResponse.segment.fileItems) {
+                            yield yield __await(Object.assign({ kind: "file" }, file));
+                        }
+                        for (const directory of listFilesAndDirectoriesResponse.segment.directoryItems) {
+                            yield yield __await(Object.assign({ kind: "directory" }, directory));
+                        }
                     }
-                    for (const directory of listFilesAndDirectoriesResponse.segment.directoryItems) {
-                        yield yield __await(Object.assign({ kind: "directory" }, directory));
+                    finally {
+                        _d = true;
                     }
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_c && !_c.done && (_a = _b.return)) yield __await(_a.call(_b));
+                    if (!_d && !_a && (_b = _e.return)) yield __await(_b.call(_e));
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -1353,25 +1014,12 @@ export class ShareDirectoryClient extends StorageClient {
      * @returns Response data for the Directory List Files and Directories operation.
      */
     async listFilesAndDirectoriesSegment(marker, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-listFilesAndDirectoriesSegment", options);
         if (options.prefix === "") {
             options.prefix = undefined;
         }
-        try {
-            const response = await this.context.listFilesAndDirectoriesSegment(Object.assign(Object.assign(Object.assign({ marker }, options), this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-            const wrappedResponse = Object.assign(Object.assign({}, ConvertInternalResponseOfListFiles(response)), { _response: Object.assign(Object.assign({}, response._response), { parsedBody: ConvertInternalResponseOfListFiles(response._response.parsedBody) }) });
-            return wrappedResponse;
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareDirectoryClient-listFilesAndDirectoriesSegment", options, async (updatedOptions) => {
+            return assertResponse(await this.context.listFilesAndDirectoriesSegment(Object.assign(Object.assign({}, updatedOptions), { marker })));
+        });
     }
     /**
      * Returns an AsyncIterableIterator for {@link DirectoryListHandlesResponse}
@@ -1402,22 +1050,29 @@ export class ShareDirectoryClient extends StorageClient {
      */
     listHandleItems(options = {}) {
         return __asyncGenerator(this, arguments, function* listHandleItems_1() {
-            var e_2, _a;
+            var _a, e_2, _b, _c;
             let marker;
             try {
-                for (var _b = __asyncValues(this.iterateHandleSegments(marker, options)), _c; _c = yield __await(_b.next()), !_c.done;) {
-                    const listHandlesResponse = _c.value;
-                    if (listHandlesResponse.handleList) {
-                        for (const handle of listHandlesResponse.handleList) {
-                            yield yield __await(handle);
+                for (var _d = true, _e = __asyncValues(this.iterateHandleSegments(marker, options)), _f; _f = yield __await(_e.next()), _a = _f.done, !_a;) {
+                    _c = _f.value;
+                    _d = false;
+                    try {
+                        const listHandlesResponse = _c;
+                        if (listHandlesResponse.handleList) {
+                            for (const handle of listHandlesResponse.handleList) {
+                                yield yield __await(handle);
+                            }
                         }
                     }
+                    finally {
+                        _d = true;
+                    }
                 }
             }
             catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
-                    if (_c && !_c.done && (_a = _b.return)) yield __await(_a.call(_b));
+                    if (!_d && !_a && (_b = _e.return)) yield __await(_b.call(_e));
                 }
                 finally { if (e_2) throw e_2.error; }
             }
@@ -1535,28 +1190,16 @@ export class ShareDirectoryClient extends StorageClient {
      * @param options -
      */
     async listHandlesSegment(marker, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-listHandlesSegment", options);
-        try {
+        return tracingClient.withSpan("ShareDirectoryClient-listHandlesSegment", options, async (updatedOptions) => {
             marker = marker === "" ? undefined : marker;
-            const response = await this.context.listHandles(Object.assign(Object.assign(Object.assign({ marker }, options), this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
+            const response = assertResponse(await this.context.listHandles(Object.assign(Object.assign({}, updatedOptions), { marker })));
             // TODO: Protocol layer issue that when handle list is in returned XML
             // response.handleList is an empty string
             if (response.handleList === "") {
                 response.handleList = undefined;
             }
-            const wrappedResponse = Object.assign(Object.assign({}, ConvertInternalResponseOfListHandles(response)), { _response: Object.assign(Object.assign({}, response._response), { parsedBody: ConvertInternalResponseOfListHandles(response._response.parsedBody) }) });
-            return wrappedResponse;
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return response;
+        });
     }
     /**
      * Force close all handles for a directory.
@@ -1570,25 +1213,14 @@ export class ShareDirectoryClient extends StorageClient {
      * @param options -
      */
     async forceCloseHandlesSegment(marker, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-forceCloseHandlesSegment", options);
-        try {
-            marker = marker === "" ? undefined : marker;
-            const rawResponse = await this.context.forceCloseHandles("*", Object.assign(Object.assign(Object.assign({ marker }, options), convertTracingToRequestOptionsBase(updatedOptions)), this.shareClientConfig));
-            const response = rawResponse;
-            response.closedHandlesCount = rawResponse.numberOfHandlesClosed || 0;
-            response.closeFailureCount = rawResponse.numberOfHandlesFailedToClose || 0;
-            return response;
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareDirectoryClient-forceCloseHandlesSegment", options, async (updatedOptions) => {
+            var _a, _b;
+            if (marker === "") {
+                marker = undefined;
+            }
+            const rawResponse = assertResponse(await this.context.forceCloseHandles("*", Object.assign(Object.assign({}, updatedOptions), { marker })));
+            return Object.assign(Object.assign({}, rawResponse), { closedHandlesCount: (_a = rawResponse.numberOfHandlesClosed) !== null && _a !== void 0 ? _a : 0, closeFailureCount: (_b = rawResponse.numberOfHandlesFailedToClose) !== null && _b !== void 0 ? _b : 0 });
+        });
     }
     /**
      * Force close all handles for a directory.
@@ -1597,8 +1229,7 @@ export class ShareDirectoryClient extends StorageClient {
      * @param options -
      */
     async forceCloseAllHandles(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-forceCloseAllHandles", options);
-        try {
+        return tracingClient.withSpan("ShareDirectoryClient-forceCloseAllHandles", options, async (updatedOptions) => {
             let handlesClosed = 0;
             let numberOfHandlesFailedToClose = 0;
             let marker = "";
@@ -1612,18 +1243,11 @@ export class ShareDirectoryClient extends StorageClient {
                     numberOfHandlesFailedToClose += response.closeFailureCount;
                 }
             } while (marker);
-            return { closedHandlesCount: handlesClosed, closeFailureCount: numberOfHandlesFailedToClose };
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return {
+                closedHandlesCount: handlesClosed,
+                closeFailureCount: numberOfHandlesFailedToClose,
+            };
+        });
     }
     /**
      * Force close a specific handle for a directory.
@@ -1636,27 +1260,16 @@ export class ShareDirectoryClient extends StorageClient {
      * @param options -
      */
     async forceCloseHandle(handleId, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-forceCloseHandle", options);
-        try {
+        return tracingClient.withSpan("ShareDirectoryClient-forceCloseHandle", options, async (updatedOptions) => {
             if (handleId === "*") {
                 throw new RangeError(`Parameter handleID should be a specified handle ID. Use forceCloseHandlesSegment() to close all handles.`);
             }
-            const rawResponse = await this.context.forceCloseHandles(handleId, Object.assign(Object.assign({ abortSignal: options.abortSignal }, convertTracingToRequestOptionsBase(updatedOptions)), this.shareClientConfig));
+            const rawResponse = await this.context.forceCloseHandles(handleId, updatedOptions);
             const response = rawResponse;
             response.closedHandlesCount = rawResponse.numberOfHandlesClosed || 0;
             response.closeFailureCount = rawResponse.numberOfHandlesFailedToClose || 0;
             return response;
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Renames a directory.
@@ -1676,7 +1289,6 @@ export class ShareDirectoryClient extends StorageClient {
      * ```
      */
     async rename(destinationPath, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareDirectoryClient-rename", options);
         const split = destinationPath.split("?");
         let destinationUrl;
         if (split.length === 2) {
@@ -1693,9 +1305,9 @@ export class ShareDirectoryClient extends StorageClient {
         else {
             throw new RangeError("Destination path should not contain more than one query string");
         }
-        const destDirectory = new ShareDirectoryClient(destinationUrl, this.pipeline, this.shareClientConfig);
-        try {
-            const response = await destDirectory.context.rename(this.url, Object.assign(Object.assign(Object.assign({}, updatedOptions), { sourceLeaseAccessConditions: updatedOptions.sourceLeaseAccessConditions
+        const destDirectory = new ShareDirectoryClient(destinationUrl, this.pipeline);
+        return tracingClient.withSpan("ShareDirectoryClient-rename", options, async (updatedOptions) => {
+            const response = assertResponse(await destDirectory.context.rename(this.url, Object.assign(Object.assign({}, updatedOptions), { sourceLeaseAccessConditions: updatedOptions.sourceLeaseAccessConditions
                     ? {
                         sourceLeaseId: updatedOptions.sourceLeaseAccessConditions.leaseId,
                     }
@@ -1703,28 +1315,36 @@ export class ShareDirectoryClient extends StorageClient {
                     ? {
                         destinationLeaseId: updatedOptions.destinationLeaseAccessConditions.leaseId,
                     }
-                    : undefined }), this.shareClientConfig));
+                    : undefined })));
             return {
                 destinationDirectoryClient: destDirectory,
                 directoryRenameResponse: response,
             };
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
+    }
+}
+/**
+ * A ShareFileClient represents a URL to an Azure Storage file.
+ */
+export class ShareFileClient extends StorageClient {
+    /**
+     * The share name corresponding to this file client
+     */
+    get shareName() {
+        return this._shareName;
+    }
+    /**
+     * The full path of the file
+     */
+    get path() {
+        return this._path;
+    }
+    /**
+     * The name of the file
+     */
+    get name() {
+        return this._name;
     }
-}
-/**
- * A ShareFileClient represents a URL to an Azure Storage file.
- */
-export class ShareFileClient extends StorageClient {
     constructor(url, credentialOrPipeline, 
     // Legacy, no way to fix the eslint error without breaking. Disable the rule for this line.
     /* eslint-disable-next-line @azure/azure-sdk/ts-naming-options */
@@ -1733,8 +1353,7 @@ export class ShareFileClient extends StorageClient {
         if (credentialOrPipeline instanceof Pipeline) {
             pipeline = credentialOrPipeline;
         }
-        else if (credentialOrPipeline instanceof Credential ||
-            isTokenCredential(credentialOrPipeline)) {
+        else if (credentialOrPipeline instanceof Credential) {
             pipeline = newPipeline(credentialOrPipeline, options);
         }
         else {
@@ -1747,26 +1366,7 @@ export class ShareFileClient extends StorageClient {
             shareName: this._shareName,
             path: this._path,
         } = getShareNameAndPathFromUrl(this.url));
-        this.shareClientConfig = options;
-        this.context = new File(this.storageClientContext);
-    }
-    /**
-     * The share name corresponding to this file client
-     */
-    get shareName() {
-        return this._shareName;
-    }
-    /**
-     * The full path of the file
-     */
-    get path() {
-        return this._path;
-    }
-    /**
-     * The name of the file
-     */
-    get name() {
-        return this._name;
+        this.context = this.storageClientContext.file;
     }
     /**
      * Creates a new ShareFileClient object identical to the source but with the specified share snapshot timestamp.
@@ -1776,7 +1376,7 @@ export class ShareFileClient extends StorageClient {
      * @returns A new ShareFileClient object identical to the source but with the specified share snapshot timestamp.
      */
     withShareSnapshot(shareSnapshot) {
-        return new ShareFileClient(setURLParameter(this.url, URLConstants.Parameters.SHARE_SNAPSHOT, shareSnapshot.length === 0 ? undefined : shareSnapshot), this.pipeline, this.shareClientConfig);
+        return new ShareFileClient(setURLParameter(this.url, URLConstants.Parameters.SHARE_SNAPSHOT, shareSnapshot.length === 0 ? undefined : shareSnapshot), this.pipeline);
     }
     /**
      * Creates a new file or replaces a file. Note it only initializes the file with no content.
@@ -1801,27 +1401,16 @@ export class ShareFileClient extends StorageClient {
      * ```
      */
     async create(size, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-create", options);
-        try {
-            if (size < 0 || size > FILE_MAX_SIZE_BYTES) {
-                throw new RangeError(`File size must >= 0 and < ${FILE_MAX_SIZE_BYTES}.`);
-            }
-            options = validateAndSetDefaultsForFileAndDirectoryCreateCommonOptions(options);
-            options.fileHttpHeaders = options.fileHttpHeaders || {};
-            return await this.context.create(size, options.fileAttributes
-                ? fileAttributesToString(options.fileAttributes)
-                : FileAttributesNone, Object.assign(Object.assign({ abortSignal: options.abortSignal, fileHttpHeaders: options.fileHttpHeaders, metadata: options.metadata, filePermission: options.filePermission, filePermissionKey: options.filePermissionKey, fileChangeOn: fileChangeTimeToString(options.changeTime), fileCreatedOn: fileCreationTimeToString(options.creationTime), fileLastWriteOn: fileLastWriteTimeToString(options.lastWriteTime), leaseAccessConditions: options.leaseAccessConditions }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        if (size < 0 || size > FILE_MAX_SIZE_BYTES) {
+            throw new RangeError(`File size must >= 0 and < ${FILE_MAX_SIZE_BYTES}.`);
+        }
+        options = validateAndSetDefaultsForFileAndDirectoryCreateCommonOptions(options);
+        options.fileHttpHeaders = options.fileHttpHeaders || {};
+        return tracingClient.withSpan("ShareFileClient-create", options, async (updatedOptions) => {
+            return assertResponse(await this.context.create(size, updatedOptions.fileAttributes
+                ? fileAttributesToString(updatedOptions.fileAttributes)
+                : FileAttributesNone, Object.assign(Object.assign({}, updatedOptions), { fileChangeOn: fileChangeTimeToString(updatedOptions.changeTime), fileCreatedOn: fileCreationTimeToString(updatedOptions.creationTime), fileLastWriteOn: fileLastWriteTimeToString(updatedOptions.lastWriteTime) })));
+        });
     }
     /**
      * Reads or downloads a file from the system, including its metadata and properties.
@@ -1885,15 +1474,14 @@ export class ShareFileClient extends StorageClient {
      * ```
      */
     async download(offset = 0, count, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-download", options);
-        try {
-            if (options.rangeGetContentMD5 && offset === 0 && count === undefined) {
+        return tracingClient.withSpan("ShareFileClient-download", options, async (updatedOptions) => {
+            if (updatedOptions.rangeGetContentMD5 && offset === 0 && count === undefined) {
                 throw new RangeError(`rangeGetContentMD5 only works with partial data downloading`);
             }
             const downloadFullFile = offset === 0 && !count;
-            const res = await this.context.download(Object.assign(Object.assign({ abortSignal: options.abortSignal, requestOptions: {
-                    onDownloadProgress: isNode ? undefined : options.onProgress, // for Node.js, progress is reported by RetriableReadableStream
-                }, range: downloadFullFile ? undefined : rangeToString({ offset, count }), rangeGetContentMD5: options.rangeGetContentMD5, leaseAccessConditions: options.leaseAccessConditions }, convertTracingToRequestOptionsBase(updatedOptions)), this.shareClientConfig));
+            const res = assertResponse(await this.context.download(Object.assign(Object.assign({}, updatedOptions), { requestOptions: {
+                    onDownloadProgress: isNode ? undefined : updatedOptions.onProgress, // for Node.js, progress is reported by RetriableReadableStream
+                }, range: downloadFullFile ? undefined : rangeToString({ offset, count }) })));
             // Return browser response immediately
             if (!isNode) {
                 return res;
@@ -1903,9 +1491,9 @@ export class ShareFileClient extends StorageClient {
             // bundlers may try to bundle following code and "FileReadResponse.ts".
             // In this case, "FileDownloadResponse.browser.ts" will be used as a shim of "FileDownloadResponse.ts"
             // The config is in package.json "browser" field
-            if (options.maxRetryRequests === undefined || options.maxRetryRequests < 0) {
+            if (updatedOptions.maxRetryRequests === undefined || updatedOptions.maxRetryRequests < 0) {
                 // TODO: Default value or make it a required parameter?
-                options.maxRetryRequests = DEFAULT_MAX_DOWNLOAD_RETRY_REQUESTS;
+                updatedOptions.maxRetryRequests = DEFAULT_MAX_DOWNLOAD_RETRY_REQUESTS;
             }
             if (res.contentLength === undefined) {
                 throw new RangeError(`File download response doesn't contain valid content length header`);
@@ -1923,27 +1511,16 @@ export class ShareFileClient extends StorageClient {
                 //     chunkDownloadOptions.range
                 //   }, options: ${JSON.stringify(chunkDownloadOptions)}`
                 // );
-                const downloadRes = await this.context.download(Object.assign(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.leaseAccessConditions }, updatedDownloadOptions), convertTracingToRequestOptionsBase(updatedDownloadOptions)));
+                const downloadRes = await this.context.download(Object.assign(Object.assign({}, updatedOptions), updatedDownloadOptions));
                 if (!(downloadRes.etag === res.etag)) {
                     throw new Error("File has been modified concurrently");
                 }
                 return downloadRes.readableStreamBody;
             }, offset, res.contentLength, {
-                abortSignal: options.abortSignal,
-                maxRetryRequests: options.maxRetryRequests,
-                onProgress: options.onProgress,
-            });
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
+                maxRetryRequests: updatedOptions.maxRetryRequests,
+                onProgress: updatedOptions.onProgress,
             });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Returns true if the specified file exists; false otherwise.
@@ -1955,31 +1532,18 @@ export class ShareFileClient extends StorageClient {
      * @param options - options to Exists operation.
      */
     async exists(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-exists", options);
-        try {
-            await this.getProperties({
-                abortSignal: options.abortSignal,
-                tracingOptions: Object.assign(Object.assign({}, options.tracingOptions), convertTracingToRequestOptionsBase(updatedOptions)),
-            });
-            return true;
-        }
-        catch (e) {
-            if (e.statusCode === 404) {
-                span.setStatus({
-                    code: SpanStatusCode.ERROR,
-                    message: "Expected exception when checking file existence",
-                });
-                return false;
+        return tracingClient.withSpan("ShareFileClient-exists", options, async (updatedOptions) => {
+            try {
+                await this.getProperties(updatedOptions);
+                return true;
             }
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (e.statusCode === 404) {
+                    return false;
+                }
+                throw e;
+            }
+        });
     }
     /**
      * Returns all user-defined metadata, standard HTTP properties, and system properties
@@ -1990,20 +1554,9 @@ export class ShareFileClient extends StorageClient {
      * @returns Response data for the File Get Properties operation.
      */
     async getProperties(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-getProperties", options);
-        try {
-            return this.context.getProperties(Object.assign(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.leaseAccessConditions }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareFileClient-getProperties", options, async (updatedOptions) => {
+            return assertResponse(await this.context.getProperties(updatedOptions));
+        });
     }
     /**
      * Sets properties on the file.
@@ -2015,24 +1568,13 @@ export class ShareFileClient extends StorageClient {
      *                                       existing values will be preserved.
      */
     async setProperties(properties = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-setProperties", properties);
-        try {
-            properties = validateAndSetDefaultsForFileAndDirectorySetPropertiesCommonOptions(properties);
-            properties.fileHttpHeaders = properties.fileHttpHeaders || {};
-            return await this.context.setHttpHeaders(properties.fileAttributes
-                ? fileAttributesToString(properties.fileAttributes)
-                : FileAttributesPreserve, Object.assign(Object.assign({ abortSignal: properties.abortSignal, fileHttpHeaders: properties.fileHttpHeaders, filePermission: properties.filePermission, filePermissionKey: properties.filePermissionKey, leaseAccessConditions: properties.leaseAccessConditions, fileChangeOn: fileChangeTimeToString(properties.changeTime), fileCreatedOn: fileCreationTimeToString(properties.creationTime), fileLastWriteOn: fileLastWriteTimeToString(properties.lastWriteTime) }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        properties = validateAndSetDefaultsForFileAndDirectorySetPropertiesCommonOptions(properties);
+        properties.fileHttpHeaders = properties.fileHttpHeaders || {};
+        return tracingClient.withSpan("ShareFileClient-setProperties", properties, async (updatedOptions) => {
+            return assertResponse(await this.context.setHttpHeaders(updatedOptions.fileAttributes
+                ? fileAttributesToString(updatedOptions.fileAttributes)
+                : FileAttributesPreserve, Object.assign(Object.assign({}, updatedOptions), { fileChangeOn: fileChangeTimeToString(updatedOptions.changeTime), fileCreatedOn: fileCreationTimeToString(updatedOptions.creationTime), fileLastWriteOn: fileLastWriteTimeToString(updatedOptions.lastWriteTime) })));
+        });
     }
     /**
      * Removes the file from the storage account.
@@ -2052,20 +1594,9 @@ export class ShareFileClient extends StorageClient {
      * @returns Response data for the File Delete operation.
      */
     async delete(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-delete", options);
-        try {
-            return await this.context.delete(Object.assign(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.leaseAccessConditions }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareFileClient-delete", options, async (updatedOptions) => {
+            return assertResponse(await this.context.delete(updatedOptions));
+        });
     }
     /**
      * Removes the file from the storage account if it exists.
@@ -2084,30 +1615,20 @@ export class ShareFileClient extends StorageClient {
      * @param options -
      */
     async deleteIfExists(options = {}) {
-        var _a, _b, _c;
-        const { span, updatedOptions } = createSpan("ShareFileClient-deleteIfExists", options);
-        try {
-            const res = await this.delete(updatedOptions);
-            return Object.assign({ succeeded: true }, res);
-        }
-        catch (e) {
-            if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "ResourceNotFound" ||
-                ((_b = e.details) === null || _b === void 0 ? void 0 : _b.errorCode) === "ParentNotFound") {
-                span.setStatus({
-                    code: SpanStatusCode.ERROR,
-                    message: "Expected exception when deleting a file only if it exists.",
-                });
-                return Object.assign(Object.assign({ succeeded: false }, (_c = e.response) === null || _c === void 0 ? void 0 : _c.parsedHeaders), { _response: e.response });
+        return tracingClient.withSpan("ShareFileClient-deleteIfExists", options, async (updatedOptions) => {
+            var _a, _b, _c;
+            try {
+                const res = await this.delete(updatedOptions);
+                return Object.assign({ succeeded: true }, res);
             }
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "ResourceNotFound" ||
+                    ((_b = e.details) === null || _b === void 0 ? void 0 : _b.errorCode) === "ParentNotFound") {
+                    return Object.assign(Object.assign({ succeeded: false }, (_c = e.response) === null || _c === void 0 ? void 0 : _c.parsedHeaders), { _response: e.response });
+                }
+                throw e;
+            }
+        });
     }
     /**
      * Sets HTTP headers on the file.
@@ -2122,24 +1643,13 @@ export class ShareFileClient extends StorageClient {
      * @returns Response data for the File Set HTTP Headers operation.
      */
     async setHttpHeaders(fileHttpHeaders = {}, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-setHTTPHeaders", options);
-        try {
-            // FileAttributes, filePermission, createTime, lastWriteTime will all be preserved
-            options = validateAndSetDefaultsForFileAndDirectorySetPropertiesCommonOptions(options);
-            return await this.context.setHttpHeaders(options.fileAttributes
-                ? fileAttributesToString(options.fileAttributes)
-                : FileAttributesPreserve, Object.assign(Object.assign({ abortSignal: options.abortSignal, fileHttpHeaders, filePermission: options.filePermission, filePermissionKey: options.filePermissionKey, leaseAccessConditions: options.leaseAccessConditions, fileCreatedOn: fileCreationTimeToString(options.creationTime), fileLastWriteOn: fileLastWriteTimeToString(options.lastWriteTime), fileChangeOn: fileChangeTimeToString(options.changeTime) }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        // FileAttributes, filePermission, createTime, lastWriteTime will all be preserved
+        options = validateAndSetDefaultsForFileAndDirectorySetPropertiesCommonOptions(options);
+        return tracingClient.withSpan("ShareFileClient-setHTTPHeaders", options, async (updatedOptions) => {
+            return assertResponse(await this.context.setHttpHeaders(updatedOptions.fileAttributes
+                ? fileAttributesToString(updatedOptions.fileAttributes)
+                : FileAttributesPreserve, Object.assign(Object.assign({}, updatedOptions), { fileHttpHeaders, fileCreatedOn: fileCreationTimeToString(updatedOptions.creationTime), fileLastWriteOn: fileLastWriteTimeToString(updatedOptions.lastWriteTime), fileChangeOn: fileChangeTimeToString(updatedOptions.changeTime) })));
+        });
     }
     /**
      * Resize file.
@@ -2153,25 +1663,14 @@ export class ShareFileClient extends StorageClient {
      * @returns Response data for the File Set HTTP Headers operation.
      */
     async resize(length, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-resize", options);
-        try {
-            if (length < 0) {
-                throw new RangeError(`Size cannot less than 0 when resizing file.`);
-            }
-            // FileAttributes, filePermission, createTime, lastWriteTime will all be preserved.
-            options = validateAndSetDefaultsForFileAndDirectorySetPropertiesCommonOptions(options);
-            return await this.context.setHttpHeaders(fileAttributesToString(options.fileAttributes), Object.assign(Object.assign({ abortSignal: options.abortSignal, fileContentLength: length, filePermission: options.filePermission, filePermissionKey: options.filePermissionKey, leaseAccessConditions: options.leaseAccessConditions, fileChangeOn: fileChangeTimeToString(options.changeTime), fileCreatedOn: fileCreationTimeToString(options.creationTime), fileLastWriteOn: fileLastWriteTimeToString(options.lastWriteTime) }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
+        if (length < 0) {
+            throw new RangeError(`Size cannot less than 0 when resizing file.`);
         }
+        // FileAttributes, filePermission, createTime, lastWriteTime will all be preserved.
+        options = validateAndSetDefaultsForFileAndDirectorySetPropertiesCommonOptions(options);
+        return tracingClient.withSpan("ShareFileClient-resize", options, async (updatedOptions) => {
+            return assertResponse(await this.context.setHttpHeaders(fileAttributesToString(updatedOptions.fileAttributes), Object.assign(Object.assign({}, updatedOptions), { fileContentLength: length, fileChangeOn: fileChangeTimeToString(options.changeTime), fileCreatedOn: fileCreationTimeToString(options.creationTime), fileLastWriteOn: fileLastWriteTimeToString(options.lastWriteTime) })));
+        });
     }
     /**
      * Updates user-defined metadata for the specified file.
@@ -2185,20 +1684,9 @@ export class ShareFileClient extends StorageClient {
      * @returns Response data for the File Set Metadata operation.
      */
     async setMetadata(metadata = {}, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-setMetadata", options);
-        try {
-            return await this.context.setMetadata(Object.assign(Object.assign({ abortSignal: options.abortSignal, metadata, leaseAccessConditions: options.leaseAccessConditions }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareFileClient-setMetadata", options, async (updatedOptions) => {
+            return assertResponse(await this.context.setMetadata(Object.assign(Object.assign({}, updatedOptions), { metadata })));
+        });
     }
     /**
      * Upload a range of bytes to a file. This operation can only be called on an existing file.
@@ -2228,8 +1716,7 @@ export class ShareFileClient extends StorageClient {
      * ```
      */
     async uploadRange(body, offset, contentLength, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-uploadRange", options);
-        try {
+        return tracingClient.withSpan("ShareFileClient-uploadRange", options, async (updatedOptions) => {
             if (offset < 0) {
                 throw new RangeError(`offset must be >= 0`);
             }
@@ -2239,20 +1726,10 @@ export class ShareFileClient extends StorageClient {
             if (contentLength > FILE_RANGE_MAX_SIZE_BYTES) {
                 throw new RangeError(`offset must be < ${FILE_RANGE_MAX_SIZE_BYTES} bytes`);
             }
-            return await this.context.uploadRange(rangeToString({ count: contentLength, offset }), "update", contentLength, Object.assign(Object.assign(Object.assign({ abortSignal: options.abortSignal, contentMD5: options.contentMD5, requestOptions: {
-                    onUploadProgress: options.onProgress,
-                }, body: body }, convertTracingToRequestOptionsBase(updatedOptions)), { leaseAccessConditions: options.leaseAccessConditions, fileLastWrittenMode: options.fileLastWrittenMode }), this.shareClientConfig));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return assertResponse(await this.context.uploadRange(rangeToString({ count: contentLength, offset }), "update", contentLength, Object.assign(Object.assign({}, updatedOptions), { requestOptions: {
+                    onUploadProgress: updatedOptions.onProgress,
+                }, body })));
+        });
     }
     /**
      * Upload a range of bytes to a file where the contents are read from a another file's URL.
@@ -2265,26 +1742,15 @@ export class ShareFileClient extends StorageClient {
      * @param options - Options to configure File - Upload Range from URL operation.
      */
     async uploadRangeFromURL(sourceURL, sourceOffset, destOffset, count, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-uploadRangeFromURL", options);
-        try {
+        return tracingClient.withSpan("ShareFileClient-uploadRangeFromURL", options, async (updatedOptions) => {
             if (sourceOffset < 0 || destOffset < 0) {
                 throw new RangeError(`sourceOffset and destOffset must be >= 0`);
             }
             if (count <= 0 || count > FILE_RANGE_MAX_SIZE_BYTES) {
                 throw new RangeError(`count must be > 0 and <= ${FILE_RANGE_MAX_SIZE_BYTES} bytes`);
             }
-            return await this.context.uploadRangeFromURL(rangeToString({ offset: destOffset, count }), sourceURL, 0, Object.assign(Object.assign(Object.assign({ abortSignal: options.abortSignal, sourceRange: rangeToString({ offset: sourceOffset, count }), sourceModifiedAccessConditions: options.sourceConditions, copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization), fileLastWrittenMode: options.fileLastWrittenMode }, this.shareClientConfig), options), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return assertResponse(await this.context.uploadRangeFromURL(rangeToString({ offset: destOffset, count }), sourceURL, 0, Object.assign(Object.assign({}, updatedOptions), { sourceRange: rangeToString({ offset: sourceOffset, count }), sourceModifiedAccessConditions: updatedOptions.sourceConditions, copySourceAuthorization: httpAuthorizationToString(updatedOptions.sourceAuthorization) })));
+        });
     }
     /**
      * Clears the specified range and
@@ -2295,23 +1761,12 @@ export class ShareFileClient extends StorageClient {
      * @param options - Options to File Clear Range operation.
      */
     async clearRange(offset, contentLength, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-clearRange", options);
-        try {
+        return tracingClient.withSpan("ShareFileClient-clearRange", options, async (updatedOptions) => {
             if (offset < 0 || contentLength <= 0) {
                 throw new RangeError(`offset must >= 0 and contentLength must be > 0`);
             }
-            return await this.context.uploadRange(rangeToString({ count: contentLength, offset }), "clear", 0, Object.assign(Object.assign(Object.assign({ abortSignal: options.abortSignal }, convertTracingToRequestOptionsBase(updatedOptions)), { leaseAccessConditions: options.leaseAccessConditions, fileLastWrittenMode: options.fileLastWrittenMode }), this.shareClientConfig));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return assertResponse(await this.context.uploadRange(rangeToString({ count: contentLength, offset }), "clear", 0, updatedOptions));
+        });
     }
     /**
      * Returns the list of valid ranges for a file.
@@ -2319,25 +1774,14 @@ export class ShareFileClient extends StorageClient {
      * @param options - Options to File Get range List operation.
      */
     async getRangeList(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-getRangeList", options);
-        try {
-            const originalResponse = await this.context.getRangeList(Object.assign(Object.assign({ abortSignal: options.abortSignal, range: options.range ? rangeToString(options.range) : undefined, leaseAccessConditions: options.leaseAccessConditions }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
+        return tracingClient.withSpan("ShareFileClient-getRangeList", options, async (updatedOptions) => {
+            const originalResponse = assertResponse(await this.context.getRangeList(Object.assign(Object.assign({}, updatedOptions), { range: updatedOptions.range ? rangeToString(updatedOptions.range) : undefined })));
             // Only returns ranges, ignoring clearRanges.
             const parsedBody = originalResponse._response.parsedBody.ranges
                 ? originalResponse._response.parsedBody.ranges
                 : [];
             return Object.assign(Object.assign({}, originalResponse), { _response: Object.assign(Object.assign({}, originalResponse._response), { parsedBody }), rangeList: originalResponse.ranges ? originalResponse.ranges : [] });
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Returns the list of ranges that differ between a previous share snapshot and this file.
@@ -2346,20 +1790,9 @@ export class ShareFileClient extends StorageClient {
      * @param options -
      */
     async getRangeListDiff(prevShareSnapshot, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-getRangeListDiff", options);
-        try {
-            return await this.context.getRangeList(Object.assign(Object.assign(Object.assign(Object.assign({ prevsharesnapshot: prevShareSnapshot }, options), { range: options.range ? rangeToString(options.range) : undefined }), this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareFileClient-getRangeListDiff", options, async (updatedOptions) => {
+            return assertResponse(await this.context.getRangeList(Object.assign(Object.assign({}, updatedOptions), { prevsharesnapshot: prevShareSnapshot, range: updatedOptions.range ? rangeToString(updatedOptions.range) : undefined })));
+        });
     }
     /**
      * Copies a blob or file to a destination file within the storage account.
@@ -2374,20 +1807,9 @@ export class ShareFileClient extends StorageClient {
      * @param options - Options to File Start Copy operation.
      */
     async startCopyFromURL(copySource, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-startCopyFromURL", options);
-        try {
-            return await this.context.startCopy(copySource, Object.assign(Object.assign({ abortSignal: options.abortSignal, metadata: options.metadata, leaseAccessConditions: options.leaseAccessConditions, filePermission: options.filePermission, filePermissionKey: options.filePermissionKey, copyFileSmbInfo: options.copyFileSmbInfo }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareFileClient-startCopyFromURL", options, async (updatedOptions) => {
+            return assertResponse(await this.context.startCopy(copySource, updatedOptions));
+        });
     }
     /**
      * Aborts a pending Copy File operation, and leaves a destination file with zero length and full
@@ -2398,20 +1820,9 @@ export class ShareFileClient extends StorageClient {
      * @param options - Options to File Abort Copy From URL operation.
      */
     async abortCopyFromURL(copyId, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-abortCopyFromURL", options);
-        try {
-            return await this.context.abortCopy(copyId, Object.assign(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.leaseAccessConditions }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareFileClient-abortCopyFromURL", options, async (updatedOptions) => {
+            return assertResponse(await this.context.abortCopy(copyId, updatedOptions));
+        });
     }
     // High Level functions
     /**
@@ -2421,8 +1832,7 @@ export class ShareFileClient extends StorageClient {
      * @param options -
      */
     async uploadData(data, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-uploadData", options);
-        try {
+        return tracingClient.withSpan("ShareFileClient-uploadData", options, async (updatedOptions) => {
             if (isNode) {
                 let buffer;
                 if (data instanceof Buffer) {
@@ -2441,17 +1851,7 @@ export class ShareFileClient extends StorageClient {
                 const browserBlob = new Blob([data]);
                 return this.uploadSeekableInternal((offset, size) => browserBlob.slice(offset, offset + size), browserBlob.size, updatedOptions);
             }
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * ONLY AVAILABLE IN BROWSERS.
@@ -2464,20 +1864,9 @@ export class ShareFileClient extends StorageClient {
      * @param options -
      */
     async uploadSeekableBlob(blobFactory, size, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-UploadSeekableBlob", options);
-        try {
+        return tracingClient.withSpan("ShareFileClient-UploadSeekableBlob", options, async (updatedOptions) => {
             return this.uploadSeekableInternal(blobFactory, size, updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * ONLY AVAILABLE IN NODE.JS RUNTIME.
@@ -2489,27 +1878,16 @@ export class ShareFileClient extends StorageClient {
      * @param options -
      */
     async uploadFile(filePath, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-uploadFile", options);
-        try {
+        return tracingClient.withSpan("ShareFileClient-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, updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * ONLY AVAILABLE IN NODE.JS RUNTIME.
@@ -2525,22 +1903,11 @@ export class ShareFileClient extends StorageClient {
      * @param options -
      */
     async uploadResetableStream(streamFactory, size, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-uploadResetableStream", options);
-        try {
-            return await this.uploadSeekableInternal((offset, count) => {
+        return tracingClient.withSpan("ShareFileClient-uploadResetableStream", options, async (updatedOptions) => {
+            return this.uploadSeekableInternal((offset, count) => {
                 return () => streamFactory(offset, count);
             }, size, updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      *
@@ -2550,8 +1917,7 @@ export class ShareFileClient extends StorageClient {
      * @param options -
      */
     async uploadSeekableInternal(bodyFactory, size, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-uploadSeekableInternal", options);
-        try {
+        return tracingClient.withSpan("ShareFileClient-uploadSeekableInternal", options, async (updatedOptions) => {
             if (!options.rangeSize) {
                 options.rangeSize = FILE_RANGE_MAX_SIZE_BYTES;
             }
@@ -2595,18 +1961,8 @@ export class ShareFileClient extends StorageClient {
                     }
                 });
             }
-            return await batch.do();
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return batch.do();
+        });
     }
     async downloadToBuffer(bufferOrOffset, offsetOrCount, countOrOptions, optOptions = {}) {
         let buffer = undefined;
@@ -2623,8 +1979,7 @@ export class ShareFileClient extends StorageClient {
             count = typeof offsetOrCount === "number" ? offsetOrCount : 0;
             options = countOrOptions || {};
         }
-        const { span, updatedOptions } = createSpan("ShareFileClient-downloadToBuffer", options);
-        try {
+        return tracingClient.withSpan("ShareFileClient-downloadToBuffer", options, async (updatedOptions) => {
             if (!options.rangeSize) {
                 options.rangeSize = FILE_RANGE_MAX_SIZE_BYTES;
             }
@@ -2696,17 +2051,7 @@ export class ShareFileClient extends StorageClient {
             }
             await batch.do();
             return buffer;
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * ONLY AVAILABLE IN NODE.JS RUNTIME.
@@ -2730,8 +2075,7 @@ export class ShareFileClient extends StorageClient {
      * @param options -
      */
     async uploadStream(stream, size, bufferSize, maxBuffers, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-uploadStream", options);
-        try {
+        return tracingClient.withSpan("ShareFileClient-uploadStream", options, async (updatedOptions) => {
             if (!options.fileHttpHeaders) {
                 options.fileHttpHeaders = {};
             }
@@ -2771,18 +2115,8 @@ export class ShareFileClient extends StorageClient {
             // this situation, outgoing handlers are blocked.
             // Outgoing queue shouldn't be empty.
             Math.ceil((maxBuffers / 4) * 3));
-            return await scheduler.do();
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return scheduler.do();
+        });
     }
     /**
      * ONLY AVAILABLE IN NODE.JS RUNTIME.
@@ -2801,8 +2135,7 @@ export class ShareFileClient extends StorageClient {
      *                                                 at the specified path.
      */
     async downloadToFile(filePath, offset = 0, count, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-downloadToFile", options);
-        try {
+        return tracingClient.withSpan("ShareFileClient-downloadToFile", options, async (updatedOptions) => {
             const response = await this.download(offset, count, updatedOptions);
             if (response.readableStreamBody) {
                 await readStreamToLocalFile(response.readableStreamBody, filePath);
@@ -2810,17 +2143,7 @@ export class ShareFileClient extends StorageClient {
             // The stream is no longer accessible so setting it to undefined.
             response.fileDownloadStream = undefined;
             return response;
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Lists handles for a file.
@@ -2834,28 +2157,16 @@ export class ShareFileClient extends StorageClient {
      * @param options -
      */
     async listHandlesSegment(marker, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-listHandlesSegment", options);
-        try {
+        return tracingClient.withSpan("ShareFileClient-listHandlesSegment", options, async (updatedOptions) => {
             marker = marker === "" ? undefined : marker;
-            const response = await this.context.listHandles(Object.assign(Object.assign(Object.assign({ abortSignal: options.abortSignal, marker }, options), convertTracingToRequestOptionsBase(updatedOptions)), this.shareClientConfig));
+            const response = assertResponse(await this.context.listHandles(Object.assign(Object.assign({}, updatedOptions), { marker })));
             // TODO: Protocol layer issue that when handle list is in returned XML
             // response.handleList is an empty string
             if (response.handleList === "") {
                 response.handleList = undefined;
             }
-            const wrappedResponse = Object.assign(Object.assign({}, ConvertInternalResponseOfListHandles(response)), { _response: Object.assign(Object.assign({}, response._response), { parsedBody: ConvertInternalResponseOfListHandles(response._response.parsedBody) }) });
-            return wrappedResponse;
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return response;
+        });
     }
     /**
      * Returns an AsyncIterableIterator for FileListHandlesResponse
@@ -2886,22 +2197,29 @@ export class ShareFileClient extends StorageClient {
      */
     listHandleItems(options = {}) {
         return __asyncGenerator(this, arguments, function* listHandleItems_2() {
-            var e_3, _a;
+            var _a, e_3, _b, _c;
             let marker;
             try {
-                for (var _b = __asyncValues(this.iterateHandleSegments(marker, options)), _c; _c = yield __await(_b.next()), !_c.done;) {
-                    const listHandlesResponse = _c.value;
-                    if (listHandlesResponse.handleList) {
-                        for (const handle of listHandlesResponse.handleList) {
-                            yield yield __await(handle);
+                for (var _d = true, _e = __asyncValues(this.iterateHandleSegments(marker, options)), _f; _f = yield __await(_e.next()), _a = _f.done, !_a;) {
+                    _c = _f.value;
+                    _d = false;
+                    try {
+                        const listHandlesResponse = _c;
+                        if (listHandlesResponse.handleList) {
+                            for (const handle of listHandlesResponse.handleList) {
+                                yield yield __await(handle);
+                            }
                         }
                     }
+                    finally {
+                        _d = true;
+                    }
                 }
             }
             catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
-                    if (_c && !_c.done && (_a = _b.return)) yield __await(_a.call(_b));
+                    if (!_d && !_a && (_b = _e.return)) yield __await(_b.call(_e));
                 }
                 finally { if (e_3) throw e_3.error; }
             }
@@ -2953,25 +2271,14 @@ export class ShareFileClient extends StorageClient {
      * @param options - Options to force close handles operation.
      */
     async forceCloseHandlesSegment(marker, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-forceCloseHandlesSegment", options);
-        try {
+        return tracingClient.withSpan("ShareFileClient-forceCloseHandlesSegment", options, async (updatedOptions) => {
             marker = marker === "" ? undefined : marker;
-            const rawResponse = await this.context.forceCloseHandles("*", Object.assign(Object.assign({ abortSignal: options.abortSignal, marker }, this.shareClientConfig), convertTracingToRequestOptionsBase(updatedOptions)));
+            const rawResponse = await this.context.forceCloseHandles("*", Object.assign(Object.assign({}, updatedOptions), { marker }));
             const response = rawResponse;
             response.closedHandlesCount = rawResponse.numberOfHandlesClosed || 0;
             response.closeFailureCount = rawResponse.numberOfHandlesFailedToClose || 0;
             return response;
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Force close all handles for a file.
@@ -2980,8 +2287,7 @@ export class ShareFileClient extends StorageClient {
      * @param options - Options to force close handles operation.
      */
     async forceCloseAllHandles(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-forceCloseAllHandles", options);
-        try {
+        return tracingClient.withSpan("ShareFileClient-forceCloseAllHandles", options, async (updatedOptions) => {
             let handlesClosed = 0;
             let numberOfHandlesFailedToClose = 0;
             let marker = "";
@@ -2999,17 +2305,7 @@ export class ShareFileClient extends StorageClient {
                 closedHandlesCount: handlesClosed,
                 closeFailureCount: numberOfHandlesFailedToClose,
             };
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Force close a specific handle for a file.
@@ -3020,27 +2316,16 @@ export class ShareFileClient extends StorageClient {
      * @param FileForceCloseHandlesOptions - Options to force close handles operation.
      */
     async forceCloseHandle(handleId, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-forceCloseHandle", options);
-        try {
+        return tracingClient.withSpan("ShareFileClient-forceCloseHandle", options, async (updatedOptions) => {
             if (handleId === "*") {
                 throw new RangeError(`Parameter handleID should be a specified handle ID. Use forceCloseHandlesSegment() to close all handles.`);
             }
-            const rawResponse = await this.context.forceCloseHandles(handleId, Object.assign(Object.assign({ abortSignal: options.abortSignal }, convertTracingToRequestOptionsBase(updatedOptions)), this.shareClientConfig));
+            const rawResponse = await this.context.forceCloseHandles(handleId, updatedOptions);
             const response = rawResponse;
             response.closedHandlesCount = rawResponse.numberOfHandlesClosed || 0;
             response.closeFailureCount = rawResponse.numberOfHandlesFailedToClose || 0;
             return response;
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Get a {@link ShareLeaseClient} that manages leases on the file.
@@ -3087,7 +2372,6 @@ export class ShareFileClient extends StorageClient {
      * ```
      */
     async rename(destinationPath, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareFileClient-rename", options);
         const split = destinationPath.split("?");
         let destinationUrl;
         if (split.length === 2) {
@@ -3104,9 +2388,9 @@ export class ShareFileClient extends StorageClient {
         else {
             throw new RangeError("Destination path should not contain more than one query string");
         }
-        const destFile = new ShareFileClient(destinationUrl, this.pipeline, this.shareClientConfig);
-        try {
-            const response = await destFile.context.rename(this.url, Object.assign(Object.assign(Object.assign({}, updatedOptions), { sourceLeaseAccessConditions: updatedOptions.sourceLeaseAccessConditions
+        const destFile = new ShareFileClient(destinationUrl, this.pipeline);
+        return tracingClient.withSpan("ShareFileClient-rename", options, async (updatedOptions) => {
+            const response = assertResponse(await destFile.context.rename(this.url, Object.assign(Object.assign({}, updatedOptions), { sourceLeaseAccessConditions: updatedOptions.sourceLeaseAccessConditions
                     ? {
                         sourceLeaseId: updatedOptions.sourceLeaseAccessConditions.leaseId,
                     }
@@ -3118,22 +2402,12 @@ export class ShareFileClient extends StorageClient {
                     ? {
                         fileContentType: options.contentType,
                     }
-                    : undefined }), this.shareClientConfig));
+                    : undefined })));
             return {
                 destinationFileClient: destFile,
                 fileRenameResponse: response,
             };
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
 }
 /**
@@ -3143,27 +2417,6 @@ export class ShareFileClient extends StorageClient {
  * @see https://docs.microsoft.com/rest/api/storageservices/lease-share
  */
 export class ShareLeaseClient {
-    /**
-     * Creates an instance of ShareLeaseClient.
-     * @param client - The client to make the lease operation requests.
-     * @param leaseId - Initial proposed lease id.
-     */
-    constructor(client, leaseId) {
-        const clientContext = new StorageClientContext(client.url, Object.assign({ version: SERVICE_VERSION }, client.pipeline.toServiceClientOptions()));
-        if (client instanceof ShareClient) {
-            this.isShare = true;
-            this.fileOrShare = new Share(clientContext);
-        }
-        else {
-            this.isShare = false;
-            this.fileOrShare = new File(clientContext);
-        }
-        this._url = client.url;
-        if (!leaseId) {
-            leaseId = generateUuid();
-        }
-        this._leaseId = leaseId;
-    }
     /**
      * Gets the lease Id.
      *
@@ -3180,6 +2433,25 @@ export class ShareLeaseClient {
     get url() {
         return this._url;
     }
+    /**
+     * Creates an instance of ShareLeaseClient.
+     * @param client - The client to make the lease operation requests.
+     * @param leaseId - Initial proposed lease id.
+     */
+    constructor(client, leaseId) {
+        const clientContext = client["storageClientContext"];
+        if (client instanceof ShareClient) {
+            this.fileOrShare = clientContext.share;
+        }
+        else {
+            this.fileOrShare = clientContext.file;
+        }
+        this._url = client.url;
+        if (!leaseId) {
+            leaseId = generateUuid();
+        }
+        this._leaseId = leaseId;
+    }
     /**
      * Establishes and manages a lock on a file, share or share snapshot for write and delete operations.
      *
@@ -3188,20 +2460,9 @@ export class ShareLeaseClient {
      * @returns Response data for acquire lease operation.
      */
     async acquireLease(duration = -1, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareLeaseClient-acquireLease", options);
-        try {
-            return await this.fileOrShare.acquireLease(Object.assign({ abortSignal: options.abortSignal, duration, proposedLeaseId: this._leaseId }, convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareLeaseClient-acquireLease", options, async (updatedOptions) => {
+            return assertResponse(await this.fileOrShare.acquireLease(Object.assign(Object.assign({}, updatedOptions), { duration, proposedLeaseId: this._leaseId })));
+        });
     }
     /**
      * To change the ID of an existing lease.
@@ -3211,22 +2472,11 @@ export class ShareLeaseClient {
      * @returns Response data for change lease operation.
      */
     async changeLease(proposedLeaseId, options = {}) {
-        const { span, updatedOptions } = createSpan("ShareLeaseClient-changeLease", options);
-        try {
-            const response = await this.fileOrShare.changeLease(this._leaseId, Object.assign({ proposedLeaseId, abortSignal: options.abortSignal }, convertTracingToRequestOptionsBase(updatedOptions)));
+        return tracingClient.withSpan("ShareLeaseClient-changeLease", options, async (updatedOptions) => {
+            const response = assertResponse(await this.fileOrShare.changeLease(this._leaseId, Object.assign(Object.assign({}, updatedOptions), { proposedLeaseId })));
             this._leaseId = proposedLeaseId;
             return response;
-        }
-        catch (e) {
-            span.setStatus({
-                code: 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
@@ -3236,20 +2486,9 @@ export class ShareLeaseClient {
      * @returns Response data for release lease operation.
      */
     async releaseLease(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareLeaseClient-releaseLease", options);
-        try {
-            return await this.fileOrShare.releaseLease(this._leaseId, Object.assign({ abortSignal: options.abortSignal }, convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareLeaseClient-releaseLease", options, async (updatedOptions) => {
+            return assertResponse(await this.fileOrShare.releaseLease(this._leaseId, updatedOptions));
+        });
     }
     /**
      * To force end the lease.
@@ -3258,20 +2497,9 @@ export class ShareLeaseClient {
      * @returns Response data for break lease operation.
      */
     async breakLease(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareLeaseClient-breakLease", options);
-        try {
-            return await this.fileOrShare.breakLease(Object.assign({ abortSignal: options.abortSignal }, convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareLeaseClient-breakLease", options, async (updatedOptions) => {
+            return assertResponse(await this.fileOrShare.breakLease(updatedOptions));
+        });
     }
     /**
      * To renew the lease. Only available for lease on share or share snapshot.
@@ -3282,23 +2510,18 @@ export class ShareLeaseClient {
      * @returns Response data for renew lease operation.
      */
     async renewLease(options = {}) {
-        const { span, updatedOptions } = createSpan("ShareLeaseClient-renewLease", options);
-        if (!this.isShare) {
-            throw new RangeError("The renewLease operation is not available for lease on file.");
-        }
-        try {
-            return await this.fileOrShare.renewLease(this._leaseId, Object.assign({ abortSignal: options.abortSignal }, convertTracingToRequestOptionsBase(updatedOptions)));
-        }
-        catch (e) {
-            span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("ShareLeaseClient-renewLease", options, async (updatedOptions) => {
+            if (isFile(this.fileOrShare)) {
+                throw new RangeError("The renewLease operation is not available for lease on file.");
+            }
+            return assertResponse(await this.fileOrShare.renewLease(this._leaseId, updatedOptions));
+        });
     }
 }
+/**
+ * @internal
+ */
+function isFile(fileOrShare) {
+    return "renewLease" in fileOrShare;
+}
 //# sourceMappingURL=Clients.js.map