@azure/storage-queue 12.13.0 → 12.20.0-alpha.20230616.2

package/dist/index.js

@@ -2,13 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var coreHttp = require('@azure/core-http');
+var coreRestPipeline = require('@azure/core-rest-pipeline');
 var crypto = require('crypto');
-var logger$1 = require('@azure/logger');
+var coreUtil = require('@azure/core-util');
+var tslib = require('tslib');
+var coreHttpCompat = require('@azure/core-http-compat');
+var coreClient = require('@azure/core-client');
+var coreXml = require('@azure/core-xml');
+var coreAuth = require('@azure/core-auth');
+var logger$2 = require('@azure/logger');
 var abortController = require('@azure/abort-controller');
-var os = require('os');
 var coreTracing = require('@azure/core-tracing');
-var tslib = require('tslib');
 require('@azure/core-paging');
 
 function _interopNamespace(e) {
@@ -29,8 +33,8 @@ function _interopNamespace(e) {
     return Object.freeze(n);
 }
 
-var coreHttp__namespace = /*#__PURE__*/_interopNamespace(coreHttp);
-var os__namespace = /*#__PURE__*/_interopNamespace(os);
+var coreHttpCompat__namespace = /*#__PURE__*/_interopNamespace(coreHttpCompat);
+var coreClient__namespace = /*#__PURE__*/_interopNamespace(coreClient);
 
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
@@ -327,90 +331,11 @@ function ipRangeToString(ipRange) {
 
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-const SDK_VERSION = "12.13.0";
-const SERVICE_VERSION = "2022-11-02";
-/**
- * The OAuth scope to use with Azure Storage.
- */
-const StorageOAuthScopes = "https://storage.azure.com/.default";
-const URLConstants = {
-    Parameters: {
-        FORCE_BROWSER_NO_CACHE: "_",
-        SIGNATURE: "sig",
-        TIMEOUT: "timeout",
-    },
-};
-const HeaderConstants = {
-    AUTHORIZATION: "authorization",
-    AUTHORIZATION_SCHEME: "Bearer",
-    CONTENT_ENCODING: "content-encoding",
-    CONTENT_LANGUAGE: "content-language",
-    CONTENT_LENGTH: "content-length",
-    CONTENT_MD5: "content-md5",
-    CONTENT_TYPE: "content-type",
-    COOKIE: "Cookie",
-    DATE: "date",
-    IF_MATCH: "if-match",
-    IF_MODIFIED_SINCE: "if-modified-since",
-    IF_NONE_MATCH: "if-none-match",
-    IF_UNMODIFIED_SINCE: "if-unmodified-since",
-    PREFIX_FOR_STORAGE: "x-ms-",
-    RANGE: "Range",
-    USER_AGENT: "User-Agent",
-    X_MS_CLIENT_REQUEST_ID: "x-ms-client-request-id",
-    X_MS_COPY_SOURCE: "x-ms-copy-source",
-    X_MS_DATE: "x-ms-date",
-};
+const SDK_VERSION$1 = "12.20.0";
+const SERVICE_VERSION = "2021-10-04";
 const DevelopmentConnectionString = `DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;
   AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;
   QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;`;
-const StorageQueueLoggingAllowedHeaderNames = [
-    "Access-Control-Allow-Origin",
-    "Cache-Control",
-    "Content-Length",
-    "Content-Type",
-    "Date",
-    "Request-Id",
-    "traceparent",
-    "Transfer-Encoding",
-    "User-Agent",
-    "x-ms-client-request-id",
-    "x-ms-date",
-    "x-ms-error-code",
-    "x-ms-request-id",
-    "x-ms-return-client-request-id",
-    "x-ms-version",
-    "x-ms-approximate-messages-count",
-    "x-ms-popreceipt",
-    "x-ms-time-next-visible",
-];
-const StorageQueueLoggingAllowedQueryParameters = [
-    "comp",
-    "maxresults",
-    "rscc",
-    "rscd",
-    "rsce",
-    "rscl",
-    "rsct",
-    "se",
-    "si",
-    "sip",
-    "sp",
-    "spr",
-    "sr",
-    "srt",
-    "ss",
-    "st",
-    "sv",
-    "include",
-    "marker",
-    "prefix",
-    "messagettl",
-    "numofmessages",
-    "peekonly",
-    "popreceipt",
-    "visibilitytimeout",
-];
 /// List of ports used for path style addressing.
 /// Path style addressing means that storage account is put in URI's Path segment in instead of in host.
 const PathStylePorts = [
@@ -436,44 +361,6 @@ const PathStylePorts = [
     "11104",
 ];
 
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-const packageName = "azure-storage-queue";
-const packageVersion = "12.13.0";
-class StorageClientContext extends coreHttp__namespace.ServiceClient {
-    /**
-     * Initializes a new instance of the StorageClientContext class.
-     * @param url The URL of the service account, queue or message that is the target of the desired
-     *            operation.
-     * @param options The parameter options
-     */
-    constructor(url, options) {
-        if (url === undefined) {
-            throw new Error("'url' cannot be null");
-        }
-        // Initializing default values for options
-        if (!options) {
-            options = {};
-        }
-        if (!options.userAgent) {
-            const defaultUserAgent = coreHttp__namespace.getDefaultUserAgentValue();
-            options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
-        }
-        super(undefined, options);
-        this.requestContentType = "application/json; charset=utf-8";
-        this.baseUri = options.endpoint || "{url}";
-        // Parameter assignments
-        this.url = url;
-        // Assigning values to Constant parameters
-        this.version = options.version || "2022-11-02";
-    }
-}
-
 /**
  * Append a string to URL path. Will remove duplicated "/" in front of the string
  * when URL path ends with a "/".
@@ -483,76 +370,12 @@ class StorageClientContext extends coreHttp__namespace.ServiceClient {
  * @returns An updated URL string
  */
 function appendToURLPath(url, name) {
-    const urlParsed = coreHttp.URLBuilder.parse(url);
-    let path = urlParsed.getPath();
+    const urlParsed = new URL(url);
+    let path = urlParsed.pathname;
     path = path ? (path.endsWith("/") ? `${path}${name}` : `${path}/${name}`) : name;
-    urlParsed.setPath(path);
-    return urlParsed.toString();
-}
-/**
- * Set URL parameter name and value. If name exists in URL parameters, old value
- * will be replaced by name key. If not provide value, the parameter will be deleted.
- *
- * @param url - Source URL string
- * @param name - Parameter name
- * @param value - Parameter value
- * @returns An updated URL string
- */
-function setURLParameter(url, name, value) {
-    const urlParsed = coreHttp.URLBuilder.parse(url);
-    urlParsed.setQueryParameter(name, value);
-    return urlParsed.toString();
-}
-/**
- * Set URL host.
- *
- * @param url - Source URL string
- * @param host - New host string
- * @returns An updated URL string
- */
-function setURLHost(url, host) {
-    const urlParsed = coreHttp.URLBuilder.parse(url);
-    urlParsed.setHost(host);
+    urlParsed.pathname = path;
     return urlParsed.toString();
 }
-/**
- * Gets URL path from an URL string.
- *
- * @param url - Source URL string
- * @returns The path part of the given URL string.
- */
-function getURLPath(url) {
-    const urlParsed = coreHttp.URLBuilder.parse(url);
-    return urlParsed.getPath();
-}
-/**
- * Gets URL query key value pairs from an URL string.
- *
- * @param url -
- * @returns query key value string pairs from the given URL string.
- */
-function getURLQueries(url) {
-    let queryString = coreHttp.URLBuilder.parse(url).getQuery();
-    if (!queryString) {
-        return {};
-    }
-    queryString = queryString.trim();
-    queryString = queryString.startsWith("?") ? queryString.substr(1) : queryString;
-    let querySubStrings = queryString.split("&");
-    querySubStrings = querySubStrings.filter((value) => {
-        const indexOfEqual = value.indexOf("=");
-        const lastIndexOfEqual = value.lastIndexOf("=");
-        return (indexOfEqual > 0 && indexOfEqual === lastIndexOfEqual && lastIndexOfEqual < value.length - 1);
-    });
-    const queries = {};
-    for (const querySubString of querySubStrings) {
-        const splitResults = querySubString.split("=");
-        const key = splitResults[0];
-        const value = splitResults[1];
-        queries[key] = value;
-    }
-    return queries;
-}
 function getProxyUriFromDevConnString(connectionString) {
     // Development Connection String
     // https://docs.microsoft.com/en-us/azure/storage/common/storage-configure-connection-string#connect-to-the-emulator-account-using-the-well-known-account-name-and-key
@@ -641,7 +464,7 @@ function extractConnectionStringParts(connectionString) {
     }
     else {
         // SAS connection string
-        const accountSas = getValueInConnString(connectionString, "SharedAccessSignature");
+        let accountSas = getValueInConnString(connectionString, "SharedAccessSignature");
         const accountName = getAccountNameFromUrl(queueEndpoint);
         if (!queueEndpoint) {
             throw new Error("Invalid QueueEndpoint in the provided SAS Connection String");
@@ -649,6 +472,10 @@ function extractConnectionStringParts(connectionString) {
         else if (!accountSas) {
             throw new Error("Invalid SharedAccessSignature in the provided SAS Connection String");
         }
+        // remove test SAS
+        if (accountSas === "fakeSasToken") {
+            accountSas = "";
+        }
         return { kind: "SASConnString", url: queueEndpoint, accountName, accountSas };
     }
 }
@@ -667,53 +494,24 @@ function truncatedISO8061Date(date, withMilliseconds = true) {
         ? dateString.substring(0, dateString.length - 1) + "0000" + "Z"
         : dateString.substring(0, dateString.length - 5) + "Z";
 }
-/**
- * Delay specified time interval.
- *
- * @param timeInMs -
- * @param aborter -
- * @param abortError -
- */
-async function delay(timeInMs, aborter, abortError) {
-    return new Promise((resolve, reject) => {
-        /* eslint-disable-next-line prefer-const*/
-        let timeout;
-        const abortHandler = () => {
-            if (timeout !== undefined) {
-                clearTimeout(timeout);
-            }
-            reject(abortError);
-        };
-        const resolveHandler = () => {
-            if (aborter !== undefined) {
-                aborter.removeEventListener("abort", abortHandler);
-            }
-            resolve();
-        };
-        timeout = setTimeout(resolveHandler, timeInMs);
-        if (aborter !== undefined) {
-            aborter.addEventListener("abort", abortHandler);
-        }
-    });
-}
 /**
  * Extracts account name from the url
  * @param url - url to extract the account name from
  * @returns with the account name
  */
 function getAccountNameFromUrl(url) {
-    const parsedUrl = coreHttp.URLBuilder.parse(url);
+    const parsedUrl = new URL(url);
     let accountName;
     try {
-        if (parsedUrl.getHost().split(".")[1] === "queue") {
+        if (parsedUrl.hostname.split(".")[1] === "queue") {
             // `${defaultEndpointsProtocol}://${accountName}.queue.${endpointSuffix}`;
-            accountName = parsedUrl.getHost().split(".")[0];
+            accountName = parsedUrl.hostname.split(".")[0];
         }
         else if (isIpEndpointStyle(parsedUrl)) {
             // IPv4/IPv6 address hosts... Example - http://192.0.0.10:10001/devstoreaccount1/
             // Single word domain without a [dot] in the endpoint... Example - http://localhost:10001/devstoreaccount1/
             // .getPath() -> /devstoreaccount1/
-            accountName = parsedUrl.getPath().split("/")[1];
+            accountName = parsedUrl.pathname.split("/")[1];
         }
         else {
             // Custom domain case: "https://customdomain.com/containername/blob".
@@ -726,28 +524,13 @@ function getAccountNameFromUrl(url) {
     }
 }
 function isIpEndpointStyle(parsedUrl) {
-    if (parsedUrl.getHost() === undefined) {
-        return false;
-    }
-    const host = parsedUrl.getHost() + (parsedUrl.getPort() === undefined ? "" : ":" + parsedUrl.getPort());
+    const host = parsedUrl.host;
     // Case 1: Ipv6, use a broad regex to find out candidates whose host contains two ':'.
     // Case 2: localhost(:port), use broad regex to match port part.
     // Case 3: Ipv4, use broad regex which just check if host contains Ipv4.
     // For valid host please refer to https://man7.org/linux/man-pages/man7/hostname.7.html.
     return (/^.*:.*:.*$|^localhost(:[0-9]+)?$|^(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])){3}(:[0-9]+)?$/.test(host) ||
-        (parsedUrl.getPort() !== undefined && PathStylePorts.includes(parsedUrl.getPort())));
-}
-/**
- * Gets a new StorageClientContext
- * @param url - Url used for the StorageClientContext
- * @param pipeline - a pipeline containing HTTP request policies
- * @returns new StorageClientContext
- */
-function getStorageClientContext(url, pipeline) {
-    const storageClientContext = new StorageClientContext(url, pipeline.toServiceClientOptions());
-    // Override protocol layer's default content-type
-    storageClientContext.requestContentType = undefined;
-    return storageClientContext;
+        (Boolean(parsedUrl.port) && PathStylePorts.includes(parsedUrl.port)));
 }
 /**
  * Append a string to URL query.
@@ -757,17 +540,29 @@ function getStorageClientContext(url, pipeline) {
  * @returns An updated URL string.
  */
 function appendToURLQuery(url, queryParts) {
-    const urlParsed = coreHttp.URLBuilder.parse(url);
-    let query = urlParsed.getQuery();
+    const urlParsed = new URL(url);
+    let query = urlParsed.search;
     if (query) {
         query += "&" + queryParts;
     }
     else {
         query = queryParts;
     }
-    urlParsed.setQuery(query);
+    urlParsed.search = query;
     return urlParsed.toString();
 }
+/**
+ * A typesafe helper for ensuring that a given response object has
+ * the original _response attached.
+ * @param response - A response object from calling a client operation
+ * @returns The same object, but with known _response property
+ */
+function assertResponse(response) {
+    if (`_response` in response) {
+        return response;
+    }
+    throw new TypeError(`Unexpected response object ${response}`);
+}
 
 // Copyright (c) Microsoft Corporation.
 /**
@@ -794,6 +589,20 @@ exports.SASProtocol = void 0;
  * NOTE: Instances of this class are immutable.
  */
 class SASQueryParameters {
+    /**
+     * Optional. IP range allowed for this SAS.
+     *
+     * @readonly
+     */
+    get ipRange() {
+        if (this.ipRangeInner) {
+            return {
+                end: this.ipRangeInner.end,
+                start: this.ipRangeInner.start,
+            };
+        }
+        return undefined;
+    }
     /**
      * Creates an instance of SASQueryParameters.
      *
@@ -822,20 +631,6 @@ class SASQueryParameters {
         this.resource = resource;
         this.signature = signature;
     }
-    /**
-     * Optional. IP range allowed for this SAS.
-     *
-     * @readonly
-     */
-    get ipRange() {
-        if (this.ipRangeInner) {
-            return {
-                end: this.ipRangeInner.end,
-                start: this.ipRangeInner.start,
-            };
-        }
-        return undefined;
-    }
     /**
      * Encodes all SAS query parameters into a string that can be appended to a URL.
      *
@@ -958,12 +753,52 @@ function generateAccountSASQueryParameters(accountSASSignatureValues, sharedKeyC
     return new SASQueryParameters(version, signature, parsedPermissions, parsedServices, parsedResourceTypes, accountSASSignatureValues.protocol, accountSASSignatureValues.startsOn, accountSASSignatureValues.expiresOn, accountSASSignatureValues.ipRange);
 }
 
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+/**
+ * The base class from which all request policies derive.
+ */
+class BaseRequestPolicy {
+    /**
+     * The main method to implement that manipulates a request/response.
+     */
+    constructor(
+    /**
+     * The next policy in the pipeline. Each policy is responsible for executing the next one if the request is to continue through the pipeline.
+     */
+    _nextPolicy, 
+    /**
+     * The options that can be passed to a given request policy.
+     */
+    _options) {
+        this._nextPolicy = _nextPolicy;
+        this._options = _options;
+    }
+    /**
+     * Get whether or not a log with the provided log level should be logged.
+     * @param logLevel - The log level of the log that will be logged.
+     * @returns Whether or not a log with the provided log level should be logged.
+     */
+    shouldLog(logLevel) {
+        return this._options.shouldLog(logLevel);
+    }
+    /**
+     * Attempt to log the provided message to the provided logger. If no logger was provided or if
+     * the log level does not meat the logger's threshold, then nothing will be logged.
+     * @param logLevel - The log level of this log.
+     * @param message - The message of this log.
+     */
+    log(logLevel, message) {
+        this._options.log(logLevel, message);
+    }
+}
+
 // Copyright (c) Microsoft Corporation.
 /**
  * Credential policy used to sign HTTP(S) requests before sending. This is an
  * abstract class.
  */
-class CredentialPolicy extends coreHttp.BaseRequestPolicy {
+class CredentialPolicy extends BaseRequestPolicy {
     /**
      * Sends out request.
      *
@@ -1023,8 +858,8 @@ class Credential {
 
 // Copyright (c) Microsoft Corporation.
 /**
- * AnonymousCredential provides a {@link CredentialPolicyCreator} member used to create
- * {@link AnonymousCredentialPolicy} objects. {@link AnonymousCredentialPolicy} is used with
+ * AnonymousCredential provides a credentialPolicyCreator member used to create
+ * AnonymousCredentialPolicy objects. AnonymousCredentialPolicy is used with
  * HTTP(S) requests that read public resources or for use with Shared Access
  * Signatures (SAS).
  */
@@ -1041,31 +876,320 @@ class AnonymousCredential extends Credential {
 }
 
 // Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+const SDK_VERSION = "12.13.0";
 /**
- * StorageSharedKeyCredentialPolicy is a policy used to sign HTTP request with a shared key.
+ * The OAuth scope to use with Azure Storage.
  */
-class StorageSharedKeyCredentialPolicy extends CredentialPolicy {
-    /**
-     * Creates an instance of StorageSharedKeyCredentialPolicy.
-     * @param nextPolicy -
-     * @param options -
-     * @param factory -
-     */
-    constructor(nextPolicy, options, factory) {
-        super(nextPolicy, options);
-        this.factory = factory;
-    }
-    /**
-     * Signs request.
-     *
-     * @param request -
-     */
-    signRequest(request) {
-        request.headers.set(HeaderConstants.X_MS_DATE, new Date().toUTCString());
-        if (request.body && typeof request.body === "string" && request.body.length > 0) {
-            request.headers.set(HeaderConstants.CONTENT_LENGTH, Buffer.byteLength(request.body));
-        }
-        const stringToSign = [
+const StorageOAuthScopes = "https://storage.azure.com/.default";
+const URLConstants = {
+    Parameters: {
+        FORCE_BROWSER_NO_CACHE: "_",
+        SIGNATURE: "sig",
+        SNAPSHOT: "snapshot",
+        VERSIONID: "versionid",
+        TIMEOUT: "timeout",
+    },
+};
+const HeaderConstants = {
+    AUTHORIZATION: "Authorization",
+    AUTHORIZATION_SCHEME: "Bearer",
+    CONTENT_ENCODING: "Content-Encoding",
+    CONTENT_ID: "Content-ID",
+    CONTENT_LANGUAGE: "Content-Language",
+    CONTENT_LENGTH: "Content-Length",
+    CONTENT_MD5: "Content-Md5",
+    CONTENT_TRANSFER_ENCODING: "Content-Transfer-Encoding",
+    CONTENT_TYPE: "Content-Type",
+    COOKIE: "Cookie",
+    DATE: "date",
+    IF_MATCH: "if-match",
+    IF_MODIFIED_SINCE: "if-modified-since",
+    IF_NONE_MATCH: "if-none-match",
+    IF_UNMODIFIED_SINCE: "if-unmodified-since",
+    PREFIX_FOR_STORAGE: "x-ms-",
+    RANGE: "Range",
+    USER_AGENT: "User-Agent",
+    X_MS_CLIENT_REQUEST_ID: "x-ms-client-request-id",
+    X_MS_COPY_SOURCE: "x-ms-copy-source",
+    X_MS_DATE: "x-ms-date",
+    X_MS_ERROR_CODE: "x-ms-error-code",
+    X_MS_VERSION: "x-ms-version",
+};
+const StorageBlobLoggingAllowedHeaderNames = [
+    "Access-Control-Allow-Origin",
+    "Cache-Control",
+    "Content-Length",
+    "Content-Type",
+    "Date",
+    "Request-Id",
+    "traceparent",
+    "Transfer-Encoding",
+    "User-Agent",
+    "x-ms-client-request-id",
+    "x-ms-date",
+    "x-ms-error-code",
+    "x-ms-request-id",
+    "x-ms-return-client-request-id",
+    "x-ms-version",
+    "Accept-Ranges",
+    "Content-Disposition",
+    "Content-Encoding",
+    "Content-Language",
+    "Content-MD5",
+    "Content-Range",
+    "ETag",
+    "Last-Modified",
+    "Server",
+    "Vary",
+    "x-ms-content-crc64",
+    "x-ms-copy-action",
+    "x-ms-copy-completion-time",
+    "x-ms-copy-id",
+    "x-ms-copy-progress",
+    "x-ms-copy-status",
+    "x-ms-has-immutability-policy",
+    "x-ms-has-legal-hold",
+    "x-ms-lease-state",
+    "x-ms-lease-status",
+    "x-ms-range",
+    "x-ms-request-server-encrypted",
+    "x-ms-server-encrypted",
+    "x-ms-snapshot",
+    "x-ms-source-range",
+    "If-Match",
+    "If-Modified-Since",
+    "If-None-Match",
+    "If-Unmodified-Since",
+    "x-ms-access-tier",
+    "x-ms-access-tier-change-time",
+    "x-ms-access-tier-inferred",
+    "x-ms-account-kind",
+    "x-ms-archive-status",
+    "x-ms-blob-append-offset",
+    "x-ms-blob-cache-control",
+    "x-ms-blob-committed-block-count",
+    "x-ms-blob-condition-appendpos",
+    "x-ms-blob-condition-maxsize",
+    "x-ms-blob-content-disposition",
+    "x-ms-blob-content-encoding",
+    "x-ms-blob-content-language",
+    "x-ms-blob-content-length",
+    "x-ms-blob-content-md5",
+    "x-ms-blob-content-type",
+    "x-ms-blob-public-access",
+    "x-ms-blob-sequence-number",
+    "x-ms-blob-type",
+    "x-ms-copy-destination-snapshot",
+    "x-ms-creation-time",
+    "x-ms-default-encryption-scope",
+    "x-ms-delete-snapshots",
+    "x-ms-delete-type-permanent",
+    "x-ms-deny-encryption-scope-override",
+    "x-ms-encryption-algorithm",
+    "x-ms-if-sequence-number-eq",
+    "x-ms-if-sequence-number-le",
+    "x-ms-if-sequence-number-lt",
+    "x-ms-incremental-copy",
+    "x-ms-lease-action",
+    "x-ms-lease-break-period",
+    "x-ms-lease-duration",
+    "x-ms-lease-id",
+    "x-ms-lease-time",
+    "x-ms-page-write",
+    "x-ms-proposed-lease-id",
+    "x-ms-range-get-content-md5",
+    "x-ms-rehydrate-priority",
+    "x-ms-sequence-number-action",
+    "x-ms-sku-name",
+    "x-ms-source-content-md5",
+    "x-ms-source-if-match",
+    "x-ms-source-if-modified-since",
+    "x-ms-source-if-none-match",
+    "x-ms-source-if-unmodified-since",
+    "x-ms-tag-count",
+    "x-ms-encryption-key-sha256",
+    "x-ms-if-tags",
+    "x-ms-source-if-tags",
+];
+const StorageBlobLoggingAllowedQueryParameters = [
+    "comp",
+    "maxresults",
+    "rscc",
+    "rscd",
+    "rsce",
+    "rscl",
+    "rsct",
+    "se",
+    "si",
+    "sip",
+    "sp",
+    "spr",
+    "sr",
+    "srt",
+    "ss",
+    "st",
+    "sv",
+    "include",
+    "marker",
+    "prefix",
+    "copyid",
+    "restype",
+    "blockid",
+    "blocklisttype",
+    "delimiter",
+    "prevsnapshot",
+    "ske",
+    "skoid",
+    "sks",
+    "skt",
+    "sktid",
+    "skv",
+    "snapshot",
+];
+
+// Copyright (c) Microsoft Corporation.
+/**
+ * Set URL parameter name and value. If name exists in URL parameters, old value
+ * will be replaced by name key. If not provide value, the parameter will be deleted.
+ *
+ * @param url - Source URL string
+ * @param name - Parameter name
+ * @param value - Parameter value
+ * @returns An updated URL string
+ */
+function setURLParameter(url, name, value) {
+    const urlParsed = new URL(url);
+    const encodedName = encodeURIComponent(name);
+    const encodedValue = value ? encodeURIComponent(value) : undefined;
+    // mutating searchParams will change the encoding, so we have to do this ourselves
+    const searchString = urlParsed.search === "" ? "?" : urlParsed.search;
+    const searchPieces = [];
+    for (const pair of searchString.slice(1).split("&")) {
+        if (pair) {
+            const [key] = pair.split("=", 2);
+            if (key !== encodedName) {
+                searchPieces.push(pair);
+            }
+        }
+    }
+    if (encodedValue) {
+        searchPieces.push(`${encodedName}=${encodedValue}`);
+    }
+    urlParsed.search = searchPieces.length ? `?${searchPieces.join("&")}` : "";
+    return urlParsed.toString();
+}
+/**
+ * Set URL host.
+ *
+ * @param url - Source URL string
+ * @param host - New host string
+ * @returns An updated URL string
+ */
+function setURLHost(url, host) {
+    const urlParsed = new URL(url);
+    urlParsed.hostname = host;
+    return urlParsed.toString();
+}
+/**
+ * Get URL path from an URL string.
+ *
+ * @param url - Source URL string
+ */
+function getURLPath(url) {
+    try {
+        const urlParsed = new URL(url);
+        return urlParsed.pathname;
+    }
+    catch (e) {
+        return undefined;
+    }
+}
+/**
+ * Get URL query key value pairs from an URL string.
+ *
+ * @param url -
+ */
+function getURLQueries(url) {
+    let queryString = new URL(url).search;
+    if (!queryString) {
+        return {};
+    }
+    queryString = queryString.trim();
+    queryString = queryString.startsWith("?") ? queryString.substring(1) : queryString;
+    let querySubStrings = queryString.split("&");
+    querySubStrings = querySubStrings.filter((value) => {
+        const indexOfEqual = value.indexOf("=");
+        const lastIndexOfEqual = value.lastIndexOf("=");
+        return (indexOfEqual > 0 && indexOfEqual === lastIndexOfEqual && lastIndexOfEqual < value.length - 1);
+    });
+    const queries = {};
+    for (const querySubString of querySubStrings) {
+        const splitResults = querySubString.split("=");
+        const key = splitResults[0];
+        const value = splitResults[1];
+        queries[key] = value;
+    }
+    return queries;
+}
+/**
+ * Delay specified time interval.
+ *
+ * @param timeInMs -
+ * @param aborter -
+ * @param abortError -
+ */
+async function delay(timeInMs, aborter, abortError) {
+    return new Promise((resolve, reject) => {
+        /* eslint-disable-next-line prefer-const */
+        let timeout;
+        const abortHandler = () => {
+            if (timeout !== undefined) {
+                clearTimeout(timeout);
+            }
+            reject(abortError);
+        };
+        const resolveHandler = () => {
+            if (aborter !== undefined) {
+                aborter.removeEventListener("abort", abortHandler);
+            }
+            resolve();
+        };
+        timeout = setTimeout(resolveHandler, timeInMs);
+        if (aborter !== undefined) {
+            aborter.addEventListener("abort", abortHandler);
+        }
+    });
+}
+
+// Copyright (c) Microsoft Corporation.
+/**
+ * StorageSharedKeyCredentialPolicy is a policy used to sign HTTP request with a shared key.
+ */
+class StorageSharedKeyCredentialPolicy extends CredentialPolicy {
+    /**
+     * Creates an instance of StorageSharedKeyCredentialPolicy.
+     * @param nextPolicy -
+     * @param options -
+     * @param factory -
+     */
+    constructor(nextPolicy, options, factory) {
+        super(nextPolicy, options);
+        this.factory = factory;
+    }
+    /**
+     * Signs request.
+     *
+     * @param request -
+     */
+    signRequest(request) {
+        request.headers.set(HeaderConstants.X_MS_DATE, new Date().toUTCString());
+        if (request.body &&
+            (typeof request.body === "string" || request.body !== undefined) &&
+            request.body.length > 0) {
+            request.headers.set(HeaderConstants.CONTENT_LENGTH, Buffer.byteLength(request.body));
+        }
+        const stringToSign = [
             request.method.toUpperCase(),
             this.getHeaderValueToSign(request, HeaderConstants.CONTENT_LANGUAGE),
             this.getHeaderValueToSign(request, HeaderConstants.CONTENT_ENCODING),
@@ -1151,7 +1275,7 @@ class StorageSharedKeyCredentialPolicy extends CredentialPolicy {
      * @param request -
      */
     getCanonicalizedResourceString(request) {
-        const path = encodeURI(getURLPath(request.url) || "/");
+        const path = getURLPath(request.url) || "/";
         let canonicalizedResourceString = "";
         canonicalizedResourceString += `/${this.factory.accountName}${path}`;
         const queries = getURLQueries(request.url);
@@ -1192,7 +1316,7 @@ class StorageSharedKeyCredential extends Credential {
         this.accountKey = Buffer.from(accountKey, "base64");
     }
     /**
-     * Creates a {@link StorageSharedKeyCredentialPolicy} object.
+     * Creates a StorageSharedKeyCredentialPolicy object.
      *
      * @param nextPolicy -
      * @param options -
@@ -1214,65 +1338,7 @@ class StorageSharedKeyCredential extends Credential {
 /**
  * The `@azure/logger` configuration for this package.
  */
-const logger = logger$1.createClientLogger("storage-queue");
-
-// Copyright (c) Microsoft Corporation.
-/**
- * StorageBrowserPolicy will handle differences between Node.js and browser runtime, including:
- *
- * 1. Browsers cache GET/HEAD requests by adding conditional headers such as 'IF_MODIFIED_SINCE'.
- * StorageBrowserPolicy is a policy used to add a timestamp query to GET/HEAD request URL
- * thus avoid the browser cache.
- *
- * 2. Remove cookie header for security
- *
- * 3. Remove content-length header to avoid browsers warning
- */
-class StorageBrowserPolicy extends coreHttp.BaseRequestPolicy {
-    /**
-     * Creates an instance of StorageBrowserPolicy.
-     * @param nextPolicy -
-     * @param options -
-     */
-    // The base class has a protected constructor. Adding a public one to enable constructing of this class.
-    /* eslint-disable-next-line @typescript-eslint/no-useless-constructor*/
-    constructor(nextPolicy, options) {
-        super(nextPolicy, options);
-    }
-    /**
-     * Sends out request.
-     *
-     * @param request -
-     */
-    async sendRequest(request) {
-        if (coreHttp.isNode) {
-            return this._nextPolicy.sendRequest(request);
-        }
-        if (request.method.toUpperCase() === "GET" || request.method.toUpperCase() === "HEAD") {
-            request.url = setURLParameter(request.url, URLConstants.Parameters.FORCE_BROWSER_NO_CACHE, new Date().getTime().toString());
-        }
-        request.headers.remove(HeaderConstants.COOKIE);
-        // According to XHR standards, content-length should be fully controlled by browsers
-        request.headers.remove(HeaderConstants.CONTENT_LENGTH);
-        return this._nextPolicy.sendRequest(request);
-    }
-}
-
-// Copyright (c) Microsoft Corporation.
-/**
- * StorageBrowserPolicyFactory is a factory class helping generating {@link StorageBrowserPolicy} objects.
- */
-class StorageBrowserPolicyFactory {
-    /**
-     * Creates a StorageBrowserPolicyFactory object.
-     *
-     * @param nextPolicy -
-     * @param options -
-     */
-    create(nextPolicy, options) {
-        return new StorageBrowserPolicy(nextPolicy, options);
-    }
-}
+const logger$1 = logger$2.createClientLogger("storage-blob");
 
 // Copyright (c) Microsoft Corporation.
 /**
@@ -1290,19 +1356,19 @@ exports.StorageRetryPolicyType = void 0;
     StorageRetryPolicyType[StorageRetryPolicyType["FIXED"] = 1] = "FIXED";
 })(exports.StorageRetryPolicyType || (exports.StorageRetryPolicyType = {}));
 // Default values of StorageRetryOptions
-const DEFAULT_RETRY_OPTIONS = {
+const DEFAULT_RETRY_OPTIONS$1 = {
     maxRetryDelayInMs: 120 * 1000,
     maxTries: 4,
     retryDelayInMs: 4 * 1000,
     retryPolicyType: exports.StorageRetryPolicyType.EXPONENTIAL,
     secondaryHost: "",
-    tryTimeoutInMs: 30 * 1000, // https://docs.microsoft.com/en-us/rest/api/storageservices/setting-timeouts-for-queue-service-operations
+    tryTimeoutInMs: undefined, // Use server side default timeout strategy
 };
-const RETRY_ABORT_ERROR = new abortController.AbortError("The operation was aborted.");
+const RETRY_ABORT_ERROR$1 = new abortController.AbortError("The operation was aborted.");
 /**
  * Retry policy with exponential retry and linear retry implemented.
  */
-class StorageRetryPolicy extends coreHttp.BaseRequestPolicy {
+class StorageRetryPolicy extends BaseRequestPolicy {
     /**
      * Creates an instance of RetryPolicy.
      *
@@ -1310,30 +1376,30 @@ class StorageRetryPolicy extends coreHttp.BaseRequestPolicy {
      * @param options -
      * @param retryOptions -
      */
-    constructor(nextPolicy, options, retryOptions = DEFAULT_RETRY_OPTIONS) {
+    constructor(nextPolicy, options, retryOptions = DEFAULT_RETRY_OPTIONS$1) {
         super(nextPolicy, options);
         // Initialize retry options
         this.retryOptions = {
             retryPolicyType: retryOptions.retryPolicyType
                 ? retryOptions.retryPolicyType
-                : DEFAULT_RETRY_OPTIONS.retryPolicyType,
+                : DEFAULT_RETRY_OPTIONS$1.retryPolicyType,
             maxTries: retryOptions.maxTries && retryOptions.maxTries >= 1
                 ? Math.floor(retryOptions.maxTries)
-                : DEFAULT_RETRY_OPTIONS.maxTries,
+                : DEFAULT_RETRY_OPTIONS$1.maxTries,
             tryTimeoutInMs: retryOptions.tryTimeoutInMs && retryOptions.tryTimeoutInMs >= 0
                 ? retryOptions.tryTimeoutInMs
-                : DEFAULT_RETRY_OPTIONS.tryTimeoutInMs,
+                : DEFAULT_RETRY_OPTIONS$1.tryTimeoutInMs,
             retryDelayInMs: retryOptions.retryDelayInMs && retryOptions.retryDelayInMs >= 0
                 ? Math.min(retryOptions.retryDelayInMs, retryOptions.maxRetryDelayInMs
                     ? retryOptions.maxRetryDelayInMs
-                    : DEFAULT_RETRY_OPTIONS.maxRetryDelayInMs)
-                : DEFAULT_RETRY_OPTIONS.retryDelayInMs,
+                    : DEFAULT_RETRY_OPTIONS$1.maxRetryDelayInMs)
+                : DEFAULT_RETRY_OPTIONS$1.retryDelayInMs,
             maxRetryDelayInMs: retryOptions.maxRetryDelayInMs && retryOptions.maxRetryDelayInMs >= 0
                 ? retryOptions.maxRetryDelayInMs
-                : DEFAULT_RETRY_OPTIONS.maxRetryDelayInMs,
+                : DEFAULT_RETRY_OPTIONS$1.maxRetryDelayInMs,
             secondaryHost: retryOptions.secondaryHost
                 ? retryOptions.secondaryHost
-                : DEFAULT_RETRY_OPTIONS.secondaryHost,
+                : DEFAULT_RETRY_OPTIONS$1.secondaryHost,
         };
     }
     /**
@@ -1348,7 +1414,6 @@ class StorageRetryPolicy extends coreHttp.BaseRequestPolicy {
      * Decide and perform next retry. Won't mutate request parameter.
      *
      * @param request -
-     * @param response -
      * @param secondaryHas404 -  If attempt was against the secondary & it returned a StatusNotFound (404), then
      *                                   the resource was not found. This may be due to replication delay. So, in this
      *                                   case, we'll never try the secondary again for this operation.
@@ -1365,10 +1430,12 @@ class StorageRetryPolicy extends coreHttp.BaseRequestPolicy {
             newRequest.url = setURLHost(newRequest.url, this.retryOptions.secondaryHost);
         }
         // Set the server-side timeout query parameter "timeout=[seconds]"
-        newRequest.url = setURLParameter(newRequest.url, URLConstants.Parameters.TIMEOUT, Math.floor(this.retryOptions.tryTimeoutInMs / 1000).toString());
+        if (this.retryOptions.tryTimeoutInMs) {
+            newRequest.url = setURLParameter(newRequest.url, URLConstants.Parameters.TIMEOUT, Math.floor(this.retryOptions.tryTimeoutInMs / 1000).toString());
+        }
         let response;
         try {
-            logger.info(`RetryPolicy: =====> Try=${attempt} ${isPrimaryRetry ? "Primary" : "Secondary"}`);
+            logger$1.info(`RetryPolicy: =====> Try=${attempt} ${isPrimaryRetry ? "Primary" : "Secondary"}`);
             response = await this._nextPolicy.sendRequest(newRequest);
             if (!this.shouldRetry(isPrimaryRetry, attempt, response)) {
                 return response;
@@ -1376,7 +1443,7 @@ class StorageRetryPolicy extends coreHttp.BaseRequestPolicy {
             secondaryHas404 = secondaryHas404 || (!isPrimaryRetry && response.status === 404);
         }
         catch (err) {
-            logger.error(`RetryPolicy: Caught error, message: ${err.message}, code: ${err.code}`);
+            logger$1.error(`RetryPolicy: Caught error, message: ${err.message}, code: ${err.code}`);
             if (!this.shouldRetry(isPrimaryRetry, attempt, response, err)) {
                 throw err;
             }
@@ -1385,127 +1452,456 @@ class StorageRetryPolicy extends coreHttp.BaseRequestPolicy {
         return this.attemptSendRequest(request, secondaryHas404, ++attempt);
     }
     /**
-     * Decide whether to retry according to last HTTP response and retry counters.
-     *
-     * @param isPrimaryRetry -
-     * @param attempt -
-     * @param response -
-     * @param err -
+     * Decide whether to retry according to last HTTP response and retry counters.
+     *
+     * @param isPrimaryRetry -
+     * @param attempt -
+     * @param response -
+     * @param err -
+     */
+    shouldRetry(isPrimaryRetry, attempt, response, err) {
+        if (attempt >= this.retryOptions.maxTries) {
+            logger$1.info(`RetryPolicy: Attempt(s) ${attempt} >= maxTries ${this.retryOptions
+                .maxTries}, no further try.`);
+            return false;
+        }
+        // Handle network failures, you may need to customize the list when you implement
+        // your own http client
+        const retriableErrors = [
+            "ETIMEDOUT",
+            "ESOCKETTIMEDOUT",
+            "ECONNREFUSED",
+            "ECONNRESET",
+            "ENOENT",
+            "ENOTFOUND",
+            "TIMEOUT",
+            "EPIPE",
+            "REQUEST_SEND_ERROR", // For default xhr based http client provided in ms-rest-js
+        ];
+        if (err) {
+            for (const retriableError of retriableErrors) {
+                if (err.name.toUpperCase().includes(retriableError) ||
+                    err.message.toUpperCase().includes(retriableError) ||
+                    (err.code && err.code.toString().toUpperCase() === retriableError)) {
+                    logger$1.info(`RetryPolicy: Network error ${retriableError} found, will retry.`);
+                    return true;
+                }
+            }
+        }
+        // If attempt was against the secondary & it returned a StatusNotFound (404), then
+        // the resource was not found. This may be due to replication delay. So, in this
+        // case, we'll never try the secondary again for this operation.
+        if (response || err) {
+            const statusCode = response ? response.status : err ? err.statusCode : 0;
+            if (!isPrimaryRetry && statusCode === 404) {
+                logger$1.info(`RetryPolicy: Secondary access with 404, will retry.`);
+                return true;
+            }
+            // Server internal error or server timeout
+            if (statusCode === 503 || statusCode === 500) {
+                logger$1.info(`RetryPolicy: Will retry for status code ${statusCode}.`);
+                return true;
+            }
+        }
+        if ((err === null || err === void 0 ? void 0 : err.code) === "PARSE_ERROR" && (err === null || err === void 0 ? void 0 : err.message.startsWith(`Error "Error: Unclosed root tag`))) {
+            logger$1.info("RetryPolicy: Incomplete XML response likely due to service timeout, will retry.");
+            return true;
+        }
+        return false;
+    }
+    /**
+     * Delay a calculated time between retries.
+     *
+     * @param isPrimaryRetry -
+     * @param attempt -
+     * @param abortSignal -
+     */
+    async delay(isPrimaryRetry, attempt, abortSignal) {
+        let delayTimeInMs = 0;
+        if (isPrimaryRetry) {
+            switch (this.retryOptions.retryPolicyType) {
+                case exports.StorageRetryPolicyType.EXPONENTIAL:
+                    delayTimeInMs = Math.min((Math.pow(2, attempt - 1) - 1) * this.retryOptions.retryDelayInMs, this.retryOptions.maxRetryDelayInMs);
+                    break;
+                case exports.StorageRetryPolicyType.FIXED:
+                    delayTimeInMs = this.retryOptions.retryDelayInMs;
+                    break;
+            }
+        }
+        else {
+            delayTimeInMs = Math.random() * 1000;
+        }
+        logger$1.info(`RetryPolicy: Delay for ${delayTimeInMs}ms`);
+        return delay(delayTimeInMs, abortSignal, RETRY_ABORT_ERROR$1);
+    }
+}
+
+// Copyright (c) Microsoft Corporation.
+/**
+ * StorageRetryPolicyFactory is a factory class helping generating {@link StorageRetryPolicy} objects.
+ */
+class StorageRetryPolicyFactory {
+    /**
+     * Creates an instance of StorageRetryPolicyFactory.
+     * @param retryOptions -
+     */
+    constructor(retryOptions) {
+        this.retryOptions = retryOptions;
+    }
+    /**
+     * Creates a StorageRetryPolicy object.
+     *
+     * @param nextPolicy -
+     * @param options -
+     */
+    create(nextPolicy, options) {
+        return new StorageRetryPolicy(nextPolicy, options, this.retryOptions);
+    }
+}
+
+// Copyright (c) Microsoft Corporation.
+let _defaultHttpClient;
+function getCachedDefaultHttpClient() {
+    if (!_defaultHttpClient) {
+        _defaultHttpClient = coreRestPipeline.createDefaultHttpClient();
+    }
+    return _defaultHttpClient;
+}
+
+// Copyright (c) Microsoft Corporation.
+/**
+ * The programmatic identifier of the StorageBrowserPolicy.
+ */
+const storageBrowserPolicyName = "storageBrowserPolicy";
+/**
+ * storageBrowserPolicy is a policy used to prevent browsers from caching requests
+ * and to remove cookies and explicit content-length headers.
+ */
+function storageBrowserPolicy() {
+    return {
+        name: storageBrowserPolicyName,
+        async sendRequest(request, next) {
+            if (coreUtil.isNode) {
+                return next(request);
+            }
+            if (request.method === "GET" || request.method === "HEAD") {
+                request.url = setURLParameter(request.url, URLConstants.Parameters.FORCE_BROWSER_NO_CACHE, new Date().getTime().toString());
+            }
+            request.headers.delete(HeaderConstants.COOKIE);
+            // According to XHR standards, content-length should be fully controlled by browsers
+            request.headers.delete(HeaderConstants.CONTENT_LENGTH);
+            return next(request);
+        },
+    };
+}
+
+// Copyright (c) Microsoft Corporation.
+/**
+ * Name of the {@link storageRetryPolicy}
+ */
+const storageRetryPolicyName = "storageRetryPolicy";
+/**
+ * RetryPolicy types.
+ */
+var StorageRetryPolicyType;
+(function (StorageRetryPolicyType) {
+    /**
+     * Exponential retry. Retry time delay grows exponentially.
+     */
+    StorageRetryPolicyType[StorageRetryPolicyType["EXPONENTIAL"] = 0] = "EXPONENTIAL";
+    /**
+     * Linear retry. Retry time delay grows linearly.
      */
-    shouldRetry(isPrimaryRetry, attempt, response, err) {
-        if (attempt >= this.retryOptions.maxTries) {
-            logger.info(`RetryPolicy: Attempt(s) ${attempt} >= maxTries ${this.retryOptions
-                .maxTries}, no further try.`);
+    StorageRetryPolicyType[StorageRetryPolicyType["FIXED"] = 1] = "FIXED";
+})(StorageRetryPolicyType || (StorageRetryPolicyType = {}));
+// Default values of StorageRetryOptions
+const DEFAULT_RETRY_OPTIONS = {
+    maxRetryDelayInMs: 120 * 1000,
+    maxTries: 4,
+    retryDelayInMs: 4 * 1000,
+    retryPolicyType: StorageRetryPolicyType.EXPONENTIAL,
+    secondaryHost: "",
+    tryTimeoutInMs: undefined, // Use server side default timeout strategy
+};
+const retriableErrors = [
+    "ETIMEDOUT",
+    "ESOCKETTIMEDOUT",
+    "ECONNREFUSED",
+    "ECONNRESET",
+    "ENOENT",
+    "ENOTFOUND",
+    "TIMEOUT",
+    "EPIPE",
+    "REQUEST_SEND_ERROR",
+];
+const RETRY_ABORT_ERROR = new abortController.AbortError("The operation was aborted.");
+/**
+ * Retry policy with exponential retry and linear retry implemented.
+ */
+function storageRetryPolicy(options = {}) {
+    var _a, _b, _c, _d, _e, _f;
+    const retryPolicyType = (_a = options.retryPolicyType) !== null && _a !== void 0 ? _a : DEFAULT_RETRY_OPTIONS.retryPolicyType;
+    const maxTries = (_b = options.maxTries) !== null && _b !== void 0 ? _b : DEFAULT_RETRY_OPTIONS.maxTries;
+    const retryDelayInMs = (_c = options.retryDelayInMs) !== null && _c !== void 0 ? _c : DEFAULT_RETRY_OPTIONS.retryDelayInMs;
+    const maxRetryDelayInMs = (_d = options.maxRetryDelayInMs) !== null && _d !== void 0 ? _d : DEFAULT_RETRY_OPTIONS.maxRetryDelayInMs;
+    const secondaryHost = (_e = options.secondaryHost) !== null && _e !== void 0 ? _e : DEFAULT_RETRY_OPTIONS.secondaryHost;
+    const tryTimeoutInMs = (_f = options.tryTimeoutInMs) !== null && _f !== void 0 ? _f : DEFAULT_RETRY_OPTIONS.tryTimeoutInMs;
+    function shouldRetry({ isPrimaryRetry, attempt, response, error, }) {
+        var _a, _b;
+        if (attempt >= maxTries) {
+            logger$1.info(`RetryPolicy: Attempt(s) ${attempt} >= maxTries ${maxTries}, no further try.`);
             return false;
         }
-        // Handle network failures, you may need to customize the list when you implement
-        // your own http client
-        const retriableErrors = [
-            "ETIMEDOUT",
-            "ESOCKETTIMEDOUT",
-            "ECONNREFUSED",
-            "ECONNRESET",
-            "ENOENT",
-            "ENOTFOUND",
-            "TIMEOUT",
-            "EPIPE",
-            "REQUEST_SEND_ERROR", // For default xhr based http client provided in ms-rest-js
-        ];
-        if (err) {
+        if (error) {
             for (const retriableError of retriableErrors) {
-                if (err.name.toUpperCase().includes(retriableError) ||
-                    err.message.toUpperCase().includes(retriableError) ||
-                    (err.code && err.code.toString().toUpperCase() === retriableError)) {
-                    logger.info(`RetryPolicy: Network error ${retriableError} found, will retry.`);
+                if (error.name.toUpperCase().includes(retriableError) ||
+                    error.message.toUpperCase().includes(retriableError) ||
+                    (error.code && error.code.toString().toUpperCase() === retriableError)) {
+                    logger$1.info(`RetryPolicy: Network error ${retriableError} found, will retry.`);
                     return true;
                 }
             }
+            if ((error === null || error === void 0 ? void 0 : error.code) === "PARSE_ERROR" &&
+                (error === null || error === void 0 ? void 0 : error.message.startsWith(`Error "Error: Unclosed root tag`))) {
+                logger$1.info("RetryPolicy: Incomplete XML response likely due to service timeout, will retry.");
+                return true;
+            }
         }
         // If attempt was against the secondary & it returned a StatusNotFound (404), then
         // the resource was not found. This may be due to replication delay. So, in this
         // case, we'll never try the secondary again for this operation.
-        if (response || err) {
-            const statusCode = response ? response.status : err ? err.statusCode : 0;
+        if (response || error) {
+            const statusCode = (_b = (_a = response === null || response === void 0 ? void 0 : response.status) !== null && _a !== void 0 ? _a : error === null || error === void 0 ? void 0 : error.statusCode) !== null && _b !== void 0 ? _b : 0;
             if (!isPrimaryRetry && statusCode === 404) {
-                logger.info(`RetryPolicy: Secondary access with 404, will retry.`);
+                logger$1.info(`RetryPolicy: Secondary access with 404, will retry.`);
                 return true;
             }
             // Server internal error or server timeout
             if (statusCode === 503 || statusCode === 500) {
-                logger.info(`RetryPolicy: Will retry for status code ${statusCode}.`);
+                logger$1.info(`RetryPolicy: Will retry for status code ${statusCode}.`);
                 return true;
             }
         }
-        if ((err === null || err === void 0 ? void 0 : err.code) === "PARSE_ERROR" && (err === null || err === void 0 ? void 0 : err.message.startsWith(`Error "Error: Unclosed root tag`))) {
-            logger.info("RetryPolicy: Incomplete XML response likely due to service timeout, will retry.");
-            return true;
-        }
         return false;
     }
-    /**
-     * Delay a calculated time between retries.
-     *
-     * @param isPrimaryRetry -
-     * @param attempt -
-     * @param abortSignal -
-     */
-    async delay(isPrimaryRetry, attempt, abortSignal) {
+    function calculateDelay(isPrimaryRetry, attempt) {
         let delayTimeInMs = 0;
         if (isPrimaryRetry) {
-            switch (this.retryOptions.retryPolicyType) {
-                case exports.StorageRetryPolicyType.EXPONENTIAL:
-                    delayTimeInMs = Math.min((Math.pow(2, attempt - 1) - 1) * this.retryOptions.retryDelayInMs, this.retryOptions.maxRetryDelayInMs);
+            switch (retryPolicyType) {
+                case StorageRetryPolicyType.EXPONENTIAL:
+                    delayTimeInMs = Math.min((Math.pow(2, attempt - 1) - 1) * retryDelayInMs, maxRetryDelayInMs);
                     break;
-                case exports.StorageRetryPolicyType.FIXED:
-                    delayTimeInMs = this.retryOptions.retryDelayInMs;
+                case StorageRetryPolicyType.FIXED:
+                    delayTimeInMs = retryDelayInMs;
                     break;
             }
         }
         else {
             delayTimeInMs = Math.random() * 1000;
         }
-        logger.info(`RetryPolicy: Delay for ${delayTimeInMs}ms`);
-        return delay(delayTimeInMs, abortSignal, RETRY_ABORT_ERROR);
+        logger$1.info(`RetryPolicy: Delay for ${delayTimeInMs}ms`);
+        return delayTimeInMs;
     }
+    return {
+        name: storageRetryPolicyName,
+        async sendRequest(request, next) {
+            // Set the server-side timeout query parameter "timeout=[seconds]"
+            if (tryTimeoutInMs) {
+                request.url = setURLParameter(request.url, URLConstants.Parameters.TIMEOUT, String(Math.floor(tryTimeoutInMs / 1000)));
+            }
+            const primaryUrl = request.url;
+            const secondaryUrl = secondaryHost ? setURLHost(request.url, secondaryHost) : undefined;
+            let secondaryHas404 = false;
+            let attempt = 1;
+            let retryAgain = true;
+            let response;
+            let error;
+            while (retryAgain) {
+                const isPrimaryRetry = secondaryHas404 ||
+                    !secondaryUrl ||
+                    !["GET", "HEAD", "OPTIONS"].includes(request.method) ||
+                    attempt % 2 === 1;
+                request.url = isPrimaryRetry ? primaryUrl : secondaryUrl;
+                response = undefined;
+                error = undefined;
+                try {
+                    logger$1.info(`RetryPolicy: =====> Try=${attempt} ${isPrimaryRetry ? "Primary" : "Secondary"}`);
+                    response = await next(request);
+                    secondaryHas404 = secondaryHas404 || (!isPrimaryRetry && response.status === 404);
+                }
+                catch (e) {
+                    if (coreRestPipeline.isRestError(e)) {
+                        logger$1.error(`RetryPolicy: Caught error, message: ${e.message}, code: ${e.code}`);
+                        error = e;
+                    }
+                    else {
+                        logger$1.error(`RetryPolicy: Caught error, message: ${coreUtil.getErrorMessage(e)}`);
+                        throw e;
+                    }
+                }
+                retryAgain = shouldRetry({ isPrimaryRetry, attempt, response, error });
+                if (retryAgain) {
+                    await delay(calculateDelay(isPrimaryRetry, attempt), request.abortSignal, RETRY_ABORT_ERROR);
+                }
+                attempt++;
+            }
+            if (response) {
+                return response;
+            }
+            throw error !== null && error !== void 0 ? error : new coreRestPipeline.RestError("RetryPolicy failed without known error.");
+        },
+    };
 }
 
 // Copyright (c) Microsoft Corporation.
 /**
- * StorageRetryPolicyFactory is a factory class helping generating {@link StorageRetryPolicy} objects.
+ * The programmatic identifier of the storageSharedKeyCredentialPolicy.
  */
-class StorageRetryPolicyFactory {
+const storageSharedKeyCredentialPolicyName = "storageSharedKeyCredentialPolicy";
+/**
+ * storageSharedKeyCredentialPolicy handles signing requests using storage account keys.
+ */
+function storageSharedKeyCredentialPolicy(options) {
+    function signRequest(request) {
+        request.headers.set(HeaderConstants.X_MS_DATE, new Date().toUTCString());
+        if (request.body &&
+            (typeof request.body === "string" || Buffer.isBuffer(request.body)) &&
+            request.body.length > 0) {
+            request.headers.set(HeaderConstants.CONTENT_LENGTH, Buffer.byteLength(request.body));
+        }
+        const stringToSign = [
+            request.method.toUpperCase(),
+            getHeaderValueToSign(request, HeaderConstants.CONTENT_LANGUAGE),
+            getHeaderValueToSign(request, HeaderConstants.CONTENT_ENCODING),
+            getHeaderValueToSign(request, HeaderConstants.CONTENT_LENGTH),
+            getHeaderValueToSign(request, HeaderConstants.CONTENT_MD5),
+            getHeaderValueToSign(request, HeaderConstants.CONTENT_TYPE),
+            getHeaderValueToSign(request, HeaderConstants.DATE),
+            getHeaderValueToSign(request, HeaderConstants.IF_MODIFIED_SINCE),
+            getHeaderValueToSign(request, HeaderConstants.IF_MATCH),
+            getHeaderValueToSign(request, HeaderConstants.IF_NONE_MATCH),
+            getHeaderValueToSign(request, HeaderConstants.IF_UNMODIFIED_SINCE),
+            getHeaderValueToSign(request, HeaderConstants.RANGE),
+        ].join("\n") +
+            "\n" +
+            getCanonicalizedHeadersString(request) +
+            getCanonicalizedResourceString(request);
+        const signature = crypto.createHmac("sha256", options.accountKey)
+            .update(stringToSign, "utf8")
+            .digest("base64");
+        request.headers.set(HeaderConstants.AUTHORIZATION, `SharedKey ${options.accountName}:${signature}`);
+        // console.log(`[URL]:${request.url}`);
+        // console.log(`[HEADERS]:${request.headers.toString()}`);
+        // console.log(`[STRING TO SIGN]:${JSON.stringify(stringToSign)}`);
+        // console.log(`[KEY]: ${request.headers.get(HeaderConstants.AUTHORIZATION)}`);
+    }
     /**
-     * Creates an instance of StorageRetryPolicyFactory.
-     * @param retryOptions -
+     * Retrieve header value according to shared key sign rules.
+     * @see https://docs.microsoft.com/en-us/rest/api/storageservices/authenticate-with-shared-key
      */
-    constructor(retryOptions) {
-        this.retryOptions = retryOptions;
+    function getHeaderValueToSign(request, headerName) {
+        const value = request.headers.get(headerName);
+        if (!value) {
+            return "";
+        }
+        // When using version 2015-02-21 or later, if Content-Length is zero, then
+        // set the Content-Length part of the StringToSign to an empty string.
+        // https://docs.microsoft.com/en-us/rest/api/storageservices/authenticate-with-shared-key
+        if (headerName === HeaderConstants.CONTENT_LENGTH && value === "0") {
+            return "";
+        }
+        return value;
     }
     /**
-     * Creates a {@link StorageRetryPolicy} object.
+     * To construct the CanonicalizedHeaders portion of the signature string, follow these steps:
+     * 1. Retrieve all headers for the resource that begin with x-ms-, including the x-ms-date header.
+     * 2. Convert each HTTP header name to lowercase.
+     * 3. Sort the headers lexicographically by header name, in ascending order.
+     *    Each header may appear only once in the string.
+     * 4. Replace any linear whitespace in the header value with a single space.
+     * 5. Trim any whitespace around the colon in the header.
+     * 6. Finally, append a new-line character to each canonicalized header in the resulting list.
+     *    Construct the CanonicalizedHeaders string by concatenating all headers in this list into a single string.
      *
-     * @param nextPolicy -
-     * @param options -
      */
-    create(nextPolicy, options) {
-        return new StorageRetryPolicy(nextPolicy, options, this.retryOptions);
+    function getCanonicalizedHeadersString(request) {
+        let headersArray = [];
+        for (const [name, value] of request.headers) {
+            if (name.toLowerCase().startsWith(HeaderConstants.PREFIX_FOR_STORAGE)) {
+                headersArray.push({ name, value });
+            }
+        }
+        headersArray.sort((a, b) => {
+            return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
+        });
+        // Remove duplicate headers
+        headersArray = headersArray.filter((value, index, array) => {
+            if (index > 0 && value.name.toLowerCase() === array[index - 1].name.toLowerCase()) {
+                return false;
+            }
+            return true;
+        });
+        let canonicalizedHeadersStringToSign = "";
+        headersArray.forEach((header) => {
+            canonicalizedHeadersStringToSign += `${header.name
+                .toLowerCase()
+                .trimRight()}:${header.value.trimLeft()}\n`;
+        });
+        return canonicalizedHeadersStringToSign;
+    }
+    function getCanonicalizedResourceString(request) {
+        const path = getURLPath(request.url) || "/";
+        let canonicalizedResourceString = "";
+        canonicalizedResourceString += `/${options.accountName}${path}`;
+        const queries = getURLQueries(request.url);
+        const lowercaseQueries = {};
+        if (queries) {
+            const queryKeys = [];
+            for (const key in queries) {
+                if (Object.prototype.hasOwnProperty.call(queries, key)) {
+                    const lowercaseKey = key.toLowerCase();
+                    lowercaseQueries[lowercaseKey] = queries[key];
+                    queryKeys.push(lowercaseKey);
+                }
+            }
+            queryKeys.sort();
+            for (const key of queryKeys) {
+                canonicalizedResourceString += `\n${key}:${decodeURIComponent(lowercaseQueries[key])}`;
+            }
+        }
+        return canonicalizedResourceString;
     }
+    return {
+        name: storageSharedKeyCredentialPolicyName,
+        async sendRequest(request, next) {
+            signRequest(request);
+            return next(request);
+        },
+    };
 }
 
 // Copyright (c) Microsoft Corporation.
 /**
- * TelemetryPolicy is a policy used to tag user-agent header for every requests.
+ * StorageBrowserPolicy will handle differences between Node.js and browser runtime, including:
+ *
+ * 1. Browsers cache GET/HEAD requests by adding conditional headers such as 'IF_MODIFIED_SINCE'.
+ * StorageBrowserPolicy is a policy used to add a timestamp query to GET/HEAD request URL
+ * thus avoid the browser cache.
+ *
+ * 2. Remove cookie header for security
+ *
+ * 3. Remove content-length header to avoid browsers warning
  */
-class TelemetryPolicy extends coreHttp.BaseRequestPolicy {
+class StorageBrowserPolicy extends BaseRequestPolicy {
     /**
-     * Creates an instance of TelemetryPolicy.
+     * Creates an instance of StorageBrowserPolicy.
      * @param nextPolicy -
      * @param options -
-     * @param telemetry -
      */
-    constructor(nextPolicy, options, telemetry) {
+    // The base class has a protected constructor. Adding a public one to enable constructing of this class.
+    /* eslint-disable-next-line @typescript-eslint/no-useless-constructor*/
+    constructor(nextPolicy, options) {
         super(nextPolicy, options);
-        this.telemetry = telemetry;
     }
     /**
      * Sends out request.
@@ -1513,76 +1909,57 @@ class TelemetryPolicy extends coreHttp.BaseRequestPolicy {
      * @param request -
      */
     async sendRequest(request) {
-        if (coreHttp.isNode) {
-            if (!request.headers) {
-                request.headers = new coreHttp.HttpHeaders();
-            }
-            if (!request.headers.get(HeaderConstants.USER_AGENT)) {
-                request.headers.set(HeaderConstants.USER_AGENT, this.telemetry);
-            }
+        if (coreUtil.isNode) {
+            return this._nextPolicy.sendRequest(request);
+        }
+        if (request.method.toUpperCase() === "GET" || request.method.toUpperCase() === "HEAD") {
+            request.url = setURLParameter(request.url, URLConstants.Parameters.FORCE_BROWSER_NO_CACHE, new Date().getTime().toString());
         }
+        request.headers.remove(HeaderConstants.COOKIE);
+        // According to XHR standards, content-length should be fully controlled by browsers
+        request.headers.remove(HeaderConstants.CONTENT_LENGTH);
         return this._nextPolicy.sendRequest(request);
     }
 }
 
 // Copyright (c) Microsoft Corporation.
 /**
- * TelemetryPolicyFactory is a factory class helping generating {@link TelemetryPolicy} objects.
+ * StorageBrowserPolicyFactory is a factory class helping generating StorageBrowserPolicy objects.
  */
-class TelemetryPolicyFactory {
-    /**
-     * Creates an instance of TelemetryPolicyFactory.
-     * @param telemetry -
-     */
-    constructor(telemetry) {
-        const userAgentInfo = [];
-        if (coreHttp.isNode) {
-            if (telemetry) {
-                const telemetryString = telemetry.userAgentPrefix || "";
-                if (telemetryString.length > 0 && userAgentInfo.indexOf(telemetryString) === -1) {
-                    userAgentInfo.push(telemetryString);
-                }
-            }
-            // e.g. azsdk-js-storagequeue/11.0.0
-            const libInfo = `azsdk-js-storagequeue/${SDK_VERSION}`;
-            if (userAgentInfo.indexOf(libInfo) === -1) {
-                userAgentInfo.push(libInfo);
-            }
-            // e.g. (NODE-VERSION 4.9.1; Windows_NT 10.0.16299)
-            let runtimeInfo = `(NODE-VERSION ${process.version})`;
-            if (os__namespace) {
-                runtimeInfo = `(NODE-VERSION ${process.version}; ${os__namespace.type()} ${os__namespace.release()})`;
-            }
-            if (userAgentInfo.indexOf(runtimeInfo) === -1) {
-                userAgentInfo.push(runtimeInfo);
-            }
-        }
-        this.telemetryString = userAgentInfo.join(" ");
-    }
+class StorageBrowserPolicyFactory {
     /**
-     * Creates a {@link TelemetryPolicy} object.
+     * Creates a StorageBrowserPolicyFactory object.
      *
      * @param nextPolicy -
      * @param options -
      */
     create(nextPolicy, options) {
-        return new TelemetryPolicy(nextPolicy, options, this.telemetryString);
+        return new StorageBrowserPolicy(nextPolicy, options);
     }
 }
 
 // Copyright (c) Microsoft Corporation.
-const _defaultHttpClient = new coreHttp.DefaultHttpClient();
-function getCachedDefaultHttpClient() {
-    return _defaultHttpClient;
+/**
+ * A helper to decide if a given argument satisfies the Pipeline contract
+ * @param pipeline - An argument that may be a Pipeline
+ * @returns true when the argument satisfies the Pipeline contract
+ */
+function isPipelineLike(pipeline) {
+    if (!pipeline || typeof pipeline !== "object") {
+        return false;
+    }
+    const castPipeline = pipeline;
+    return (Array.isArray(castPipeline.factories) &&
+        typeof castPipeline.options === "object" &&
+        typeof castPipeline.toServiceClientOptions === "function");
 }
-
-// Copyright (c) Microsoft Corporation.
 /**
  * A Pipeline class containing HTTP request policies.
- * You can create a default Pipeline by calling newPipeline().
+ * You can create a default Pipeline by calling {@link newPipeline}.
  * Or you can create a Pipeline with your own policies by the constructor of Pipeline.
- * Refer to newPipeline() and provided policies as reference before
- * implementing your customized Pipeline.
+ *
+ * Refer to {@link newPipeline} and provided policies before implementing your
+ * customized Pipeline.
  */
 class Pipeline {
     /**
@@ -1593,12 +1970,10 @@ class Pipeline {
      */
     constructor(factories, options = {}) {
         this.factories = factories;
-        // when options.httpClient is not specified, passing in a DefaultHttpClient instance to
-        // avoid each client creating its own http client.
-        this.options = Object.assign(Object.assign({}, options), { httpClient: options.httpClient || getCachedDefaultHttpClient() });
+        this.options = options;
     }
     /**
-     * Transfers Pipeline object to ServiceClientOptions object which required by
+     * Transfer Pipeline object to ServiceClientOptions object which is required by
      * ServiceClient constructor.
      *
      * @returns The ServiceClientOptions object from this Pipeline.
@@ -1614,39 +1989,192 @@ class Pipeline {
  * Creates a new Pipeline object with Credential provided.
  *
  * @param credential -  Such as AnonymousCredential, StorageSharedKeyCredential or any credential from the `@azure/identity` package to authenticate requests to the service. You can also provide an object that implements the TokenCredential interface. If not specified, AnonymousCredential is used.
- * @param pipelineOptions - Options.
+ * @param pipelineOptions - Optional. Options.
  * @returns A new Pipeline object.
  */
 function newPipeline(credential, pipelineOptions = {}) {
-    if (credential === undefined) {
+    if (!credential) {
         credential = new AnonymousCredential();
     }
-    // Order is important. Closer to the API at the top & closer to the network at the bottom.
-    // The credential's policy factory must appear close to the wire so it can sign any
-    // changes made by other factories (like UniqueRequestIDPolicyFactory)
-    const telemetryPolicy = new TelemetryPolicyFactory(pipelineOptions.userAgentOptions);
-    const factories = [
-        coreHttp.tracingPolicy({ userAgent: telemetryPolicy.telemetryString }),
-        coreHttp.keepAlivePolicy(pipelineOptions.keepAliveOptions),
-        telemetryPolicy,
-        coreHttp.generateClientRequestIdPolicy(),
-        new StorageBrowserPolicyFactory(),
-        new StorageRetryPolicyFactory(pipelineOptions.retryOptions),
-        coreHttp.deserializationPolicy(),
-        coreHttp.logPolicy({
-            logger: logger.info,
-            allowedHeaderNames: StorageQueueLoggingAllowedHeaderNames,
-            allowedQueryParameters: StorageQueueLoggingAllowedQueryParameters,
-        }),
+    const pipeline = new Pipeline([], pipelineOptions);
+    pipeline._credential = credential;
+    return pipeline;
+}
+function processDownlevelPipeline(pipeline) {
+    const knownFactoryFunctions = [
+        isAnonymousCredential,
+        isStorageSharedKeyCredential,
+        isCoreHttpBearerTokenFactory,
+        isStorageBrowserPolicyFactory,
+        isStorageRetryPolicyFactory,
+        isStorageTelemetryPolicyFactory,
+        isCoreHttpPolicyFactory,
+    ];
+    if (pipeline.factories.length) {
+        const novelFactories = pipeline.factories.filter((factory) => {
+            return !knownFactoryFunctions.some((knownFactory) => knownFactory(factory));
+        });
+        if (novelFactories.length) {
+            const hasInjector = novelFactories.some((factory) => isInjectorPolicyFactory(factory));
+            // if there are any left over, wrap in a requestPolicyFactoryPolicy
+            return {
+                wrappedPolicies: coreHttpCompat.createRequestPolicyFactoryPolicy(novelFactories),
+                afterRetry: hasInjector,
+            };
+        }
+    }
+    return undefined;
+}
+function getCoreClientOptions(pipeline) {
+    var _a;
+    const _b = pipeline.options, { httpClient: v1Client } = _b, restOptions = tslib.__rest(_b, ["httpClient"]);
+    let httpClient = pipeline._coreHttpClient;
+    if (!httpClient) {
+        httpClient = v1Client ? coreHttpCompat.convertHttpClient(v1Client) : getCachedDefaultHttpClient();
+        pipeline._coreHttpClient = httpClient;
+    }
+    let corePipeline = pipeline._corePipeline;
+    if (!corePipeline) {
+        const packageDetails = `azsdk-js-azure-storage-blob/${SDK_VERSION}`;
+        const userAgentPrefix = restOptions.userAgentOptions && restOptions.userAgentOptions.userAgentPrefix
+            ? `${restOptions.userAgentOptions.userAgentPrefix} ${packageDetails}`
+            : `${packageDetails}`;
+        corePipeline = coreClient.createClientPipeline(Object.assign(Object.assign({}, restOptions), { loggingOptions: {
+                additionalAllowedHeaderNames: StorageBlobLoggingAllowedHeaderNames,
+                additionalAllowedQueryParameters: StorageBlobLoggingAllowedQueryParameters,
+                logger: logger$1.info,
+            }, userAgentOptions: {
+                userAgentPrefix,
+            }, serializationOptions: {
+                stringifyXML: coreXml.stringifyXML,
+                serializerOptions: {
+                    xml: {
+                        // Use customized XML char key of "#" so we can deserialize metadata
+                        // with "_" key
+                        xmlCharKey: "#",
+                    },
+                },
+            }, deserializationOptions: {
+                parseXML: coreXml.parseXML,
+                serializerOptions: {
+                    xml: {
+                        // Use customized XML char key of "#" so we can deserialize metadata
+                        // with "_" key
+                        xmlCharKey: "#",
+                    },
+                },
+            } }));
+        corePipeline.removePolicy({ phase: "Retry" });
+        corePipeline.removePolicy({ name: coreRestPipeline.decompressResponsePolicyName });
+        corePipeline.addPolicy(storageRetryPolicy(restOptions.retryOptions), { phase: "Retry" });
+        corePipeline.addPolicy(storageBrowserPolicy());
+        const downlevelResults = processDownlevelPipeline(pipeline);
+        if (downlevelResults) {
+            corePipeline.addPolicy(downlevelResults.wrappedPolicies, downlevelResults.afterRetry ? { afterPhase: "Retry" } : undefined);
+        }
+        const credential = getCredentialFromPipeline(pipeline);
+        if (coreAuth.isTokenCredential(credential)) {
+            corePipeline.addPolicy(coreRestPipeline.bearerTokenAuthenticationPolicy({
+                credential,
+                scopes: (_a = restOptions.audience) !== null && _a !== void 0 ? _a : StorageOAuthScopes,
+                challengeCallbacks: { authorizeRequestOnChallenge: coreClient.authorizeRequestOnTenantChallenge },
+            }), { phase: "Sign" });
+        }
+        else if (credential instanceof StorageSharedKeyCredential) {
+            corePipeline.addPolicy(storageSharedKeyCredentialPolicy({
+                accountName: credential.accountName,
+                accountKey: credential.accountKey,
+            }), { phase: "Sign" });
+        }
+        pipeline._corePipeline = corePipeline;
+    }
+    return Object.assign(Object.assign({}, restOptions), { httpClient, pipeline: corePipeline });
+}
+function getCredentialFromPipeline(pipeline) {
+    // see if we squirreled one away on the type itself
+    if (pipeline._credential) {
+        return pipeline._credential;
+    }
+    // if it came from another package, loop over the factories and look for one like before
+    let credential = new AnonymousCredential();
+    for (const factory of pipeline.factories) {
+        if (coreAuth.isTokenCredential(factory.credential)) {
+            // Only works if the factory has been attached a "credential" property.
+            // We do that in newPipeline() when using TokenCredential.
+            credential = factory.credential;
+        }
+        else if (isStorageSharedKeyCredential(factory)) {
+            return factory;
+        }
+    }
+    return credential;
+}
+function isStorageSharedKeyCredential(factory) {
+    if (factory instanceof StorageSharedKeyCredential) {
+        return true;
+    }
+    return factory.constructor.name === "StorageSharedKeyCredential";
+}
+function isAnonymousCredential(factory) {
+    if (factory instanceof AnonymousCredential) {
+        return true;
+    }
+    return factory.constructor.name === "AnonymousCredential";
+}
+function isCoreHttpBearerTokenFactory(factory) {
+    return coreAuth.isTokenCredential(factory.credential);
+}
+function isStorageBrowserPolicyFactory(factory) {
+    if (factory instanceof StorageBrowserPolicyFactory) {
+        return true;
+    }
+    return factory.constructor.name === "StorageBrowserPolicyFactory";
+}
+function isStorageRetryPolicyFactory(factory) {
+    if (factory instanceof StorageRetryPolicyFactory) {
+        return true;
+    }
+    return factory.constructor.name === "StorageRetryPolicyFactory";
+}
+function isStorageTelemetryPolicyFactory(factory) {
+    return factory.constructor.name === "TelemetryPolicyFactory";
+}
+function isInjectorPolicyFactory(factory) {
+    return factory.constructor.name === "InjectorPolicyFactory";
+}
+function isCoreHttpPolicyFactory(factory) {
+    const knownPolicies = [
+        "GenerateClientRequestIdPolicy",
+        "TracingPolicy",
+        "LogPolicy",
+        "ProxyPolicy",
+        "DisableResponseDecompressionPolicy",
+        "KeepAlivePolicy",
+        "DeserializationPolicy",
     ];
-    if (coreHttp.isNode) {
-        // ProxyPolicy is only available in Node.js runtime, not in browsers
-        factories.push(coreHttp.proxyPolicy(pipelineOptions.proxyOptions));
-    }
-    factories.push(coreHttp.isTokenCredential(credential)
-        ? coreHttp.bearerTokenAuthenticationPolicy(credential, StorageOAuthScopes)
-        : credential);
-    return new Pipeline(factories, pipelineOptions);
+    const mockHttpClient = {
+        sendRequest: async (request) => {
+            return {
+                request,
+                headers: request.headers.clone(),
+                status: 500,
+            };
+        },
+    };
+    const mockRequestPolicyOptions = {
+        log(_logLevel, _message) {
+            /* do nothing */
+        },
+        shouldLog(_logLevel) {
+            return false;
+        },
+    };
+    const policyInstance = factory.create(mockHttpClient, mockRequestPolicyOptions);
+    const policyName = policyInstance.constructor.name;
+    // bundlers sometimes add a custom suffix to the class name to make it unique
+    return knownPolicies.some((knownPolicyName) => {
+        return policyName.startsWith(knownPolicyName);
+    });
 }
 
 /*
@@ -2667,12 +3195,12 @@ const QueueGetPropertiesHeaders = {
         modelProperties: {
             metadata: {
                 serializedName: "x-ms-meta",
+                headerCollectionPrefix: "x-ms-meta-",
                 xmlName: "x-ms-meta",
                 type: {
                     name: "Dictionary",
                     value: { type: { name: "String" } }
-                },
-                headerCollectionPrefix: "x-ms-meta-"
+                }
             },
             approximateMessagesCount: {
                 serializedName: "x-ms-approximate-messages-count",
@@ -3495,7 +4023,7 @@ const timeoutInSeconds = {
 const version = {
     parameterPath: "version",
     mapper: {
-        defaultValue: "2022-11-02",
+        defaultValue: "2021-10-04",
         isConstant: true,
         serializedName: "x-ms-version",
         type: {
@@ -3596,18 +4124,18 @@ const include = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const metadata = {
     parameterPath: ["options", "metadata"],
     mapper: {
         serializedName: "x-ms-meta",
         xmlName: "x-ms-meta",
+        headerCollectionPrefix: "x-ms-meta-",
         type: {
             name: "Dictionary",
             value: { type: { name: "String" } }
-        },
-        headerCollectionPrefix: "x-ms-meta-"
+        }
     }
 };
 const comp3 = {
@@ -3743,8 +4271,8 @@ const visibilityTimeout1 = {
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
-/** Class representing a Service. */
-class Service {
+/** Class containing Service operations. */
+class ServiceImpl {
     /**
      * Initialize a new instance of the class Service class.
      * @param client Reference to the service client
@@ -3759,11 +4287,7 @@ class Service {
      * @param options The options parameters.
      */
     setProperties(properties, options) {
-        const operationArguments = {
-            properties,
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, setPropertiesOperationSpec);
+        return this.client.sendOperationRequest({ properties, options }, setPropertiesOperationSpec);
     }
     /**
      * gets the properties of a storage account's Queue service, including properties for Storage Analytics
@@ -3771,10 +4295,7 @@ class Service {
      * @param options The options parameters.
      */
     getProperties(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, getPropertiesOperationSpec$1);
+        return this.client.sendOperationRequest({ options }, getPropertiesOperationSpec$1);
     }
     /**
      * Retrieves statistics related to replication for the Queue service. It is only available on the
@@ -3783,24 +4304,18 @@ class Service {
      * @param options The options parameters.
      */
     getStatistics(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, getStatisticsOperationSpec);
+        return this.client.sendOperationRequest({ options }, getStatisticsOperationSpec);
     }
     /**
      * The List Queues Segment operation returns a list of the queues under the specified account
      * @param options The options parameters.
      */
     listQueuesSegment(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, listQueuesSegmentOperationSpec);
+        return this.client.sendOperationRequest({ options }, listQueuesSegmentOperationSpec);
     }
 }
 // Operation Specifications
-const xmlSerializer$3 = new coreHttp__namespace.Serializer(Mappers, /* isXml */ true);
+const xmlSerializer$3 = coreClient__namespace.createSerializer(Mappers, /* isXml */ true);
 const setPropertiesOperationSpec = {
     path: "/",
     httpMethod: "PUT",
@@ -3923,8 +4438,8 @@ const listQueuesSegmentOperationSpec = {
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
-/** Class representing a Queue. */
-class Queue {
+/** Class containing Queue operations. */
+class QueueImpl {
     /**
      * Initialize a new instance of the class Queue class.
      * @param client Reference to the service client
@@ -3937,20 +4452,14 @@ class Queue {
      * @param options The options parameters.
      */
     create(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, createOperationSpec);
+        return this.client.sendOperationRequest({ options }, createOperationSpec);
     }
     /**
      * operation permanently deletes the specified queue
      * @param options The options parameters.
      */
     delete(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, deleteOperationSpec$1);
+        return this.client.sendOperationRequest({ options }, deleteOperationSpec$1);
     }
     /**
      * Retrieves user-defined metadata and queue properties on the specified queue. Metadata is associated
@@ -3958,10 +4467,7 @@ class Queue {
      * @param options The options parameters.
      */
     getProperties(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, getPropertiesOperationSpec);
+        return this.client.sendOperationRequest({ options }, getPropertiesOperationSpec);
     }
     /**
      * sets user-defined metadata on the specified queue. Metadata is associated with the queue as
@@ -3969,10 +4475,7 @@ class Queue {
      * @param options The options parameters.
      */
     setMetadata(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, setMetadataOperationSpec);
+        return this.client.sendOperationRequest({ options }, setMetadataOperationSpec);
     }
     /**
      * returns details about any stored access policies specified on the queue that may be used with Shared
@@ -3980,24 +4483,18 @@ class Queue {
      * @param options The options parameters.
      */
     getAccessPolicy(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, getAccessPolicyOperationSpec);
+        return this.client.sendOperationRequest({ options }, getAccessPolicyOperationSpec);
     }
     /**
      * sets stored access policies for the queue that may be used with Shared Access Signatures
      * @param options The options parameters.
      */
     setAccessPolicy(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, setAccessPolicyOperationSpec);
+        return this.client.sendOperationRequest({ options }, setAccessPolicyOperationSpec);
     }
 }
 // Operation Specifications
-const xmlSerializer$2 = new coreHttp__namespace.Serializer(Mappers, /* isXml */ true);
+const xmlSerializer$2 = coreClient__namespace.createSerializer(Mappers, /* isXml */ true);
 const createOperationSpec = {
     path: "/{queueName}",
     httpMethod: "PUT",
@@ -4159,8 +4656,8 @@ const setAccessPolicyOperationSpec = {
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
-/** Class representing a Messages. */
-class Messages {
+/** Class containing Messages operations. */
+class MessagesImpl {
     /**
      * Initialize a new instance of the class Messages class.
      * @param client Reference to the service client
@@ -4173,20 +4670,14 @@ class Messages {
      * @param options The options parameters.
      */
     dequeue(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, dequeueOperationSpec);
+        return this.client.sendOperationRequest({ options }, dequeueOperationSpec);
     }
     /**
      * The Clear operation deletes all messages from the specified queue.
      * @param options The options parameters.
      */
     clear(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, clearOperationSpec);
+        return this.client.sendOperationRequest({ options }, clearOperationSpec);
     }
     /**
      * The Enqueue operation adds a new message to the back of the message queue. A visibility timeout can
@@ -4197,11 +4688,7 @@ class Messages {
      * @param options The options parameters.
      */
     enqueue(queueMessage, options) {
-        const operationArguments = {
-            queueMessage,
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, enqueueOperationSpec);
+        return this.client.sendOperationRequest({ queueMessage, options }, enqueueOperationSpec);
     }
     /**
      * The Peek operation retrieves one or more messages from the front of the queue, but does not alter
@@ -4209,14 +4696,11 @@ class Messages {
      * @param options The options parameters.
      */
     peek(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, peekOperationSpec);
+        return this.client.sendOperationRequest({ options }, peekOperationSpec);
     }
 }
 // Operation Specifications
-const xmlSerializer$1 = new coreHttp__namespace.Serializer(Mappers, /* isXml */ true);
+const xmlSerializer$1 = coreClient__namespace.createSerializer(Mappers, /* isXml */ true);
 const dequeueOperationSpec = {
     path: "/{queueName}/messages",
     httpMethod: "GET",
@@ -4363,8 +4847,8 @@ const peekOperationSpec = {
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
-/** Class representing a MessageId. */
-class MessageId {
+/** Class containing MessageId operations. */
+class MessageIdImpl {
     /**
      * Initialize a new instance of the class MessageId class.
      * @param client Reference to the service client
@@ -4387,12 +4871,7 @@ class MessageId {
      * @param options The options parameters.
      */
     update(popReceipt, visibilityTimeout, options) {
-        const operationArguments = {
-            popReceipt,
-            visibilityTimeout,
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, updateOperationSpec);
+        return this.client.sendOperationRequest({ popReceipt, visibilityTimeout, options }, updateOperationSpec);
     }
     /**
      * The Delete operation deletes the specified message.
@@ -4401,15 +4880,11 @@ class MessageId {
      * @param options The options parameters.
      */
     delete(popReceipt, options) {
-        const operationArguments = {
-            popReceipt,
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, deleteOperationSpec);
+        return this.client.sendOperationRequest({ popReceipt, options }, deleteOperationSpec);
     }
 }
 // Operation Specifications
-const xmlSerializer = new coreHttp__namespace.Serializer(Mappers, /* isXml */ true);
+const xmlSerializer = coreClient__namespace.createSerializer(Mappers, /* isXml */ true);
 const updateOperationSpec = {
     path: "/{queueName}/messages/{messageid}",
     httpMethod: "PUT",
@@ -4463,6 +4938,67 @@ const deleteOperationSpec = {
     serializer: xmlSerializer
 };
 
+/*
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is regenerated.
+ */
+class StorageClient$1 extends coreHttpCompat__namespace.ExtendedServiceClient {
+    /**
+     * Initializes a new instance of the StorageClient class.
+     * @param url The URL of the service account, queue or message that is the target of the desired
+     *            operation.
+     * @param options The parameter options
+     */
+    constructor(url, options) {
+        var _a, _b;
+        if (url === undefined) {
+            throw new Error("'url' cannot be null");
+        }
+        // Initializing default values for options
+        if (!options) {
+            options = {};
+        }
+        const defaults = {
+            requestContentType: "application/json; charset=utf-8"
+        };
+        const packageDetails = `azsdk-js-azure-storage-queue/12.20.0`;
+        const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix
+            ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
+            : `${packageDetails}`;
+        const optionsWithDefaults = Object.assign(Object.assign(Object.assign({}, defaults), options), { userAgentOptions: {
+                userAgentPrefix
+            }, endpoint: (_b = (_a = options.endpoint) !== null && _a !== void 0 ? _a : options.baseUri) !== null && _b !== void 0 ? _b : "{url}" });
+        super(optionsWithDefaults);
+        // Parameter assignments
+        this.url = url;
+        // Assigning values to Constant parameters
+        this.version = options.version || "2021-10-04";
+        this.service = new ServiceImpl(this);
+        this.queue = new QueueImpl(this);
+        this.messages = new MessagesImpl(this);
+        this.messageId = new MessageIdImpl(this);
+    }
+}
+
+// Copyright (c) Microsoft Corporation.
+/**
+ * @internal
+ */
+class StorageContextClient extends StorageClient$1 {
+    async sendOperationRequest(operationArguments, operationSpec) {
+        const operationSpecToSend = Object.assign({}, operationSpec);
+        if (operationSpecToSend.path === "/{queueName}" ||
+            operationSpecToSend.path === "/{queueName}/messages" ||
+            operationSpecToSend.path === "/{queueName}/messages/{messageid}") {
+            operationSpecToSend.path = "";
+        }
+        return super.sendOperationRequest(operationArguments, operationSpecToSend);
+    }
+}
+
 // Copyright (c) Microsoft Corporation.
 /**
  * A StorageClient represents a based client class for {@link QueueServiceClient}, {@link QueueClient} and etc.
@@ -4477,29 +5013,28 @@ class StorageClient {
         this.url = url;
         this.accountName = getAccountNameFromUrl(url);
         this.pipeline = pipeline;
-        this.storageClientContext = getStorageClientContext(url, pipeline);
-        // Retrieve credential from the pipeline.
-        this.credential = new AnonymousCredential();
-        for (const factory of this.pipeline.factories) {
-            if ((coreHttp.isNode && factory instanceof StorageSharedKeyCredential) ||
-                factory instanceof AnonymousCredential) {
-                this.credential = factory;
-                break;
-            }
-            else {
-                try {
-                    const authPolicy = factory.create();
-                    if (authPolicy.constructor.name === "BearerTokenAuthenticationPolicy") {
-                        this.credential = factory;
-                        break;
-                    }
-                }
-                catch (err) {
-                    // ignore errors in creating policy, the client instance may still work without the policy.
-                }
-            }
-        }
+        this.storageClientContext = getStorageClientContext(this.url, this.pipeline);
+        this.credential = getCredentialFromPipeline(pipeline);
+    }
+}
+/**
+ * @internal
+ */
+function getStorageClientContext(url, pipeline) {
+    const pipelineOptions = pipeline.options;
+    // Set maximum timeout for queue operations.
+    // This was previously set manually in the retry policy specific to this package.
+    // https://docs.microsoft.com/en-us/rest/api/storageservices/setting-timeouts-for-queue-service-operations
+    if (pipelineOptions.retryOptions === undefined) {
+        pipelineOptions.retryOptions = {
+            tryTimeoutInMs: 30 * 1000,
+        };
     }
+    else if (pipelineOptions.retryOptions.tryTimeoutInMs === undefined) {
+        pipelineOptions.retryOptions.tryTimeoutInMs = 30 * 1000;
+    }
+    const coreOptions = getCoreClientOptions(pipeline);
+    return new StorageContextClient(url, coreOptions);
 }
 
 // Copyright (c) Microsoft Corporation.
@@ -4507,8 +5042,9 @@ class StorageClient {
  * Creates a span using the global tracer.
  * @internal
  */
-const createSpan = coreTracing.createSpanFunction({
-    packagePrefix: "Azure.Storage.Queue",
+const tracingClient = coreTracing.createTracingClient({
+    packageName: "@azure/storage-queue",
+    packageVersion: SDK_VERSION$1,
     namespace: "Microsoft.Storage",
 });
 
@@ -4651,6 +5187,12 @@ function getCanonicalName(accountName, queueName) {
  * A QueueClient represents a URL to an Azure Storage Queue's messages allowing you to manipulate its messages.
  */
 class QueueClient extends StorageClient {
+    /**
+     * The name of the queue.
+     */
+    get name() {
+        return this._name;
+    }
     constructor(urlOrConnectionString, credentialOrPipelineOrQueueName, 
     // 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 */
@@ -4663,9 +5205,9 @@ class QueueClient extends StorageClient {
             url = urlOrConnectionString;
             pipeline = credentialOrPipelineOrQueueName;
         }
-        else if ((coreHttp.isNode && credentialOrPipelineOrQueueName instanceof StorageSharedKeyCredential) ||
+        else if ((coreUtil.isNode && credentialOrPipelineOrQueueName instanceof StorageSharedKeyCredential) ||
             credentialOrPipelineOrQueueName instanceof AnonymousCredential ||
-            coreHttp.isTokenCredential(credentialOrPipelineOrQueueName)) {
+            coreAuth.isTokenCredential(credentialOrPipelineOrQueueName)) {
             // (url: string, credential?: StorageSharedKeyCredential | AnonymousCredential | TokenCredential, options?: StoragePipelineOptions)
             url = urlOrConnectionString;
             pipeline = newPipeline(credentialOrPipelineOrQueueName, options);
@@ -4673,7 +5215,7 @@ class QueueClient extends StorageClient {
         else if (!credentialOrPipelineOrQueueName &&
             typeof credentialOrPipelineOrQueueName !== "string") {
             // (url: string, credential?: StorageSharedKeyCredential | AnonymousCredential | TokenCredential, options?: StoragePipelineOptions)
-            // The second paramter is undefined. Use anonymous credential.
+            // The second parameter is undefined. Use anonymous credential.
             url = urlOrConnectionString;
             pipeline = newPipeline(new AnonymousCredential(), options);
         }
@@ -4682,12 +5224,12 @@ class QueueClient extends StorageClient {
             // (connectionString: string, containerName: string, queueName: string, options?: StoragePipelineOptions)
             const extractedCreds = extractConnectionStringParts(urlOrConnectionString);
             if (extractedCreds.kind === "AccountConnString") {
-                if (coreHttp.isNode) {
+                if (coreUtil.isNode) {
                     const queueName = credentialOrPipelineOrQueueName;
                     const sharedKeyCredential = new StorageSharedKeyCredential(extractedCreds.accountName, extractedCreds.accountKey);
                     url = appendToURLPath(extractedCreds.url, queueName);
                     if (!options.proxyOptions) {
-                        options.proxyOptions = coreHttp.getDefaultProxySettings(extractedCreds.proxyUri);
+                        options.proxyOptions = coreRestPipeline.getDefaultProxySettings(extractedCreds.proxyUri);
                     }
                     pipeline = newPipeline(sharedKeyCredential, options);
                 }
@@ -4709,20 +5251,14 @@ class QueueClient extends StorageClient {
         }
         super(url, pipeline);
         this._name = this.getQueueNameFromUrl();
-        this.queueContext = new Queue(this.storageClientContext);
+        this.queueContext = this.storageClientContext.queue;
         // MessagesContext
         // Build the url with "messages"
         const partsOfUrl = this.url.split("?");
         this._messagesUrl = partsOfUrl[1]
             ? appendToURLPath(partsOfUrl[0], "messages") + "?" + partsOfUrl[1]
             : appendToURLPath(partsOfUrl[0], "messages");
-        this.messagesContext = new Messages(getStorageClientContext(this._messagesUrl, this.pipeline));
-    }
-    /**
-     * The name of the queue.
-     */
-    get name() {
-        return this._name;
+        this.messagesContext = getStorageClientContext(this._messagesUrl, this.pipeline).messages;
     }
     getMessageIdContext(messageId) {
         // Build the url with messageId
@@ -4730,7 +5266,7 @@ class QueueClient extends StorageClient {
         const urlWithMessageId = partsOfUrl[1]
             ? appendToURLPath(partsOfUrl[0], messageId) + "?" + partsOfUrl[1]
             : appendToURLPath(partsOfUrl[0], messageId);
-        return new MessageId(getStorageClientContext(urlWithMessageId, this.pipeline));
+        return getStorageClientContext(urlWithMessageId, this.pipeline).messageId;
     }
     /**
      * Creates a new queue under the specified account.
@@ -4747,20 +5283,9 @@ class QueueClient extends StorageClient {
      * ```
      */
     async create(options = {}) {
-        const { span, updatedOptions } = createSpan("QueueClient-create", options);
-        try {
-            return await this.queueContext.create(Object.assign(Object.assign({}, updatedOptions), { abortSignal: options.abortSignal }));
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("QueueClient-create", options, async (updatedOptions) => {
+            return assertResponse(await this.queueContext.create(updatedOptions));
+        });
     }
     /**
      * Creates a new queue under the specified account if it doesn't already exist.
@@ -4770,35 +5295,25 @@ class QueueClient extends StorageClient {
      * @param options -
      */
     async createIfNotExists(options = {}) {
-        var _a, _b;
-        const { span, updatedOptions } = createSpan("QueueClient-createIfNotExists", options);
-        try {
-            const response = await this.create(updatedOptions);
-            // When a queue with the specified name already exists, the Queue service checks the metadata associated with the existing queue.
-            // If the existing metadata is identical to the metadata specified on the Create Queue request, status code 204 (No Content) is returned.
-            // If the existing metadata does not match, the operation fails and status code 409 (Conflict) is returned.
-            if (response._response.status === 204) {
-                return Object.assign({ succeeded: false }, response);
+        return tracingClient.withSpan("QueueClient-createIfNotExists", options, async (updatedOptions) => {
+            var _a, _b;
+            try {
+                const response = await this.create(updatedOptions);
+                // When a queue with the specified name already exists, the Queue service checks the metadata associated with the existing queue.
+                // If the existing metadata is identical to the metadata specified on the Create Queue request, status code 204 (No Content) is returned.
+                // If the existing metadata does not match, the operation fails and status code 409 (Conflict) is returned.
+                if (response._response.status === 204) {
+                    return Object.assign({ succeeded: false }, response);
+                }
+                return Object.assign({ succeeded: true }, response);
             }
-            return Object.assign({ succeeded: true }, response);
-        }
-        catch (e) {
-            if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "QueueAlreadyExists") {
-                span.setStatus({
-                    code: coreTracing.SpanStatusCode.ERROR,
-                    message: "Expected exception when creating a queue 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 });
+            catch (e) {
+                if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "QueueAlreadyExists") {
+                    return Object.assign(Object.assign({ succeeded: false }, (_b = e.response) === null || _b === void 0 ? void 0 : _b.parsedHeaders), { _response: e.response });
+                }
+                throw e;
             }
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Deletes the specified queue permanently if it exists.
@@ -4807,29 +5322,19 @@ class QueueClient extends StorageClient {
      * @param options -
      */
     async deleteIfExists(options = {}) {
-        var _a, _b;
-        const { span, updatedOptions } = createSpan("QueueClient-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) === "QueueNotFound") {
-                span.setStatus({
-                    code: coreTracing.SpanStatusCode.ERROR,
-                    message: "Expected exception when deleting a queue 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("QueueClient-deleteIfExists", options, async (updatedOptions) => {
+            var _a, _b;
+            try {
+                const res = await this.delete(updatedOptions);
+                return Object.assign({ succeeded: true }, res);
             }
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (((_a = e.details) === null || _a === void 0 ? void 0 : _a.errorCode) === "QueueNotFound") {
+                    return Object.assign(Object.assign({ succeeded: false }, (_b = e.response) === null || _b === void 0 ? void 0 : _b.parsedHeaders), { _response: e.response });
+                }
+                throw e;
+            }
+        });
     }
     /**
      * Deletes the specified queue permanently.
@@ -4848,23 +5353,12 @@ class QueueClient extends StorageClient {
      * ```
      */
     async delete(options = {}) {
-        const { span, updatedOptions } = createSpan("QueueClient-delete", options);
-        try {
-            return await this.queueContext.delete({
+        return tracingClient.withSpan("QueueClient-delete", options, async (updatedOptions) => {
+            return assertResponse(await this.queueContext.delete({
                 abortSignal: options.abortSignal,
                 tracingOptions: updatedOptions.tracingOptions,
-            });
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            }));
+        });
     }
     /**
      * Returns true if the specified queue exists; false otherwise.
@@ -4876,31 +5370,18 @@ class QueueClient extends StorageClient {
      * @param options - options to Exists operation.
      */
     async exists(options = {}) {
-        const { span, updatedOptions } = createSpan("QueueClient-exists", options);
-        try {
-            await this.getProperties({
-                abortSignal: options.abortSignal,
-                tracingOptions: updatedOptions.tracingOptions,
-            });
-            return true;
-        }
-        catch (e) {
-            if (e.statusCode === 404) {
-                span.setStatus({
-                    code: coreTracing.SpanStatusCode.ERROR,
-                    message: "Expected exception when checking queue existence",
-                });
-                return false;
+        return tracingClient.withSpan("QueueClient-exists", options, async (updatedOptions) => {
+            try {
+                await this.getProperties(updatedOptions);
+                return true;
             }
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            catch (e) {
+                if (e.statusCode === 404) {
+                    return false;
+                }
+                throw e;
+            }
+        });
     }
     /**
      * Gets all user-defined metadata and system properties for the specified
@@ -4916,23 +5397,9 @@ class QueueClient extends StorageClient {
      * @returns Response data for the Queue get properties operation.
      */
     async getProperties(options = {}) {
-        const { span, updatedOptions } = createSpan("QueueClient-getProperties", options);
-        try {
-            return await this.queueContext.getProperties({
-                abortSignal: options.abortSignal,
-                tracingOptions: updatedOptions.tracingOptions,
-            });
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("QueueClient-getProperties", options, async (updatedOptions) => {
+            return assertResponse(await this.queueContext.getProperties(updatedOptions));
+        });
     }
     /**
      * Sets one or more user-defined name-value pairs for the specified queue.
@@ -4946,24 +5413,9 @@ class QueueClient extends StorageClient {
      * @returns Response data for the Queue set metadata operation.
      */
     async setMetadata(metadata, options = {}) {
-        const { span, updatedOptions } = createSpan("QueueClient-setMetadata", options);
-        try {
-            return await this.queueContext.setMetadata({
-                abortSignal: options.abortSignal,
-                metadata,
-                tracingOptions: updatedOptions.tracingOptions,
-            });
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("QueueClient-setMetadata", options, async (updatedOptions) => {
+            return assertResponse(await this.queueContext.setMetadata(Object.assign(Object.assign({}, updatedOptions), { metadata })));
+        });
     }
     /**
      * Gets details about any stored access policies specified on the queue that may be used with Shared Access Signatures.
@@ -4977,12 +5429,11 @@ class QueueClient extends StorageClient {
      * @returns Response data for the Queue get access policy operation.
      */
     async getAccessPolicy(options = {}) {
-        const { span, updatedOptions } = createSpan("QueueClient-getAccessPolicy", options);
-        try {
-            const response = await this.queueContext.getAccessPolicy({
+        return tracingClient.withSpan("QueueClient-getAccessPolicy", options, async (updatedOptions) => {
+            const response = assertResponse(await this.queueContext.getAccessPolicy({
                 abortSignal: options.abortSignal,
                 tracingOptions: updatedOptions.tracingOptions,
-            });
+            }));
             const res = {
                 _response: response._response,
                 date: response.date,
@@ -5011,17 +5462,7 @@ class QueueClient extends StorageClient {
                 });
             }
             return res;
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Sets stored access policies for the queue that may be used with Shared Access Signatures.
@@ -5032,8 +5473,7 @@ class QueueClient extends StorageClient {
      * @returns Response data for the Queue set access policy operation.
      */
     async setAccessPolicy(queueAcl, options = {}) {
-        const { span, updatedOptions } = createSpan("QueueClient-setAccessPolicy", options);
-        try {
+        return tracingClient.withSpan("QueueClient-setAccessPolicy", options, async (updatedOptions) => {
             const acl = [];
             for (const identifier of queueAcl || []) {
                 acl.push({
@@ -5049,22 +5489,8 @@ class QueueClient extends StorageClient {
                     id: identifier.id,
                 });
             }
-            return await this.queueContext.setAccessPolicy({
-                abortSignal: options.abortSignal,
-                queueAcl: acl,
-                tracingOptions: updatedOptions.tracingOptions,
-            });
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            return assertResponse(await this.queueContext.setAccessPolicy(Object.assign(Object.assign({}, updatedOptions), { queueAcl: acl })));
+        });
     }
     /**
      * Clear deletes all messages from a queue.
@@ -5074,23 +5500,9 @@ class QueueClient extends StorageClient {
      * @returns Response data for the clear messages operation.
      */
     async clearMessages(options = {}) {
-        const { span, updatedOptions } = createSpan("QueueClient-clearMessages", options);
-        try {
-            return await this.messagesContext.clear({
-                abortSignal: options.abortSignal,
-                tracingOptions: updatedOptions.tracingOptions,
-            });
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("QueueClient-clearMessages", options, async (updatedOptions) => {
+            return assertResponse(await this.messagesContext.clear(updatedOptions));
+        });
     }
     /**
      * sendMessage adds a new message to the back of a queue. The visibility timeout specifies how long
@@ -5114,11 +5526,10 @@ class QueueClient extends StorageClient {
      * ```
      */
     async sendMessage(messageText, options = {}) {
-        const { span, updatedOptions } = createSpan("QueueClient-sendMessage", options);
-        try {
-            const response = await this.messagesContext.enqueue({
+        return tracingClient.withSpan("QueueClient-sendMessage", options, async (updatedOptions) => {
+            const response = assertResponse(await this.messagesContext.enqueue({
                 messageText: messageText,
-            }, updatedOptions);
+            }, updatedOptions));
             const item = response[0];
             return {
                 _response: response._response,
@@ -5133,17 +5544,7 @@ class QueueClient extends StorageClient {
                 insertedOn: item.insertedOn,
                 expiresOn: item.expiresOn,
             };
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * receiveMessages retrieves one or more messages from the front of the queue.
@@ -5171,9 +5572,8 @@ class QueueClient extends StorageClient {
      * ```
      */
     async receiveMessages(options = {}) {
-        const { span, updatedOptions } = createSpan("QueueClient-receiveMessages", options);
-        try {
-            const response = await this.messagesContext.dequeue(updatedOptions);
+        return tracingClient.withSpan("QueueClient-receiveMessages", options, async (updatedOptions) => {
+            const response = assertResponse(await this.messagesContext.dequeue(updatedOptions));
             const res = {
                 _response: response._response,
                 date: response.date,
@@ -5187,17 +5587,7 @@ class QueueClient extends StorageClient {
                 res.receivedMessageItems.push(item);
             }
             return res;
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * peekMessages retrieves one or more messages from the front of the queue but does not alter the visibility of the message.
@@ -5214,9 +5604,8 @@ class QueueClient extends StorageClient {
      * ```
      */
     async peekMessages(options = {}) {
-        const { span, updatedOptions } = createSpan("QueueClient-peekMessages", options);
-        try {
-            const response = await this.messagesContext.peek(updatedOptions);
+        return tracingClient.withSpan("QueueClient-peekMessages", options, async (updatedOptions) => {
+            const response = assertResponse(await this.messagesContext.peek(updatedOptions));
             const res = {
                 _response: response._response,
                 date: response.date,
@@ -5230,17 +5619,7 @@ class QueueClient extends StorageClient {
                 res.peekedMessageItems.push(item);
             }
             return res;
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * deleteMessage permanently removes the specified message from its queue.
@@ -5252,23 +5631,9 @@ class QueueClient extends StorageClient {
      * @returns Response data for the delete message operation.
      */
     async deleteMessage(messageId, popReceipt, options = {}) {
-        const { span, updatedOptions } = createSpan("QueueClient-deleteMessage", options);
-        try {
-            return await this.getMessageIdContext(messageId).delete(popReceipt, {
-                abortSignal: options.abortSignal,
-                tracingOptions: updatedOptions.tracingOptions,
-            });
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("QueueClient-deleteMessage", options, async (updatedOptions) => {
+            return assertResponse(await this.getMessageIdContext(messageId).delete(popReceipt, updatedOptions));
+        });
     }
     /**
      * Update changes a message's visibility timeout and contents.
@@ -5288,28 +5653,17 @@ class QueueClient extends StorageClient {
      * @returns Response data for the update message operation.
      */
     async updateMessage(messageId, popReceipt, message, visibilityTimeout, options = {}) {
-        const { span, updatedOptions } = createSpan("QueueClient-updateMessage", options);
-        let queueMessage = undefined;
-        if (message !== undefined) {
-            queueMessage = { messageText: message };
-        }
-        try {
-            return await this.getMessageIdContext(messageId).update(popReceipt, visibilityTimeout || 0, {
+        return tracingClient.withSpan("QueueClient-updateMessage", options, async (updatedOptions) => {
+            let queueMessage = undefined;
+            if (message !== undefined) {
+                queueMessage = { messageText: message };
+            }
+            return assertResponse(await this.getMessageIdContext(messageId).update(popReceipt, visibilityTimeout || 0, {
                 abortSignal: options.abortSignal,
                 tracingOptions: updatedOptions.tracingOptions,
                 queueMessage,
-            });
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            }));
+        });
     }
     getQueueNameFromUrl() {
         let queueName;
@@ -5319,22 +5673,22 @@ class QueueClient extends StorageClient {
             // "https://myaccount.queue.core.windows.net/myqueue".
             // IPv4/IPv6 address hosts, Endpoints - `http://127.0.0.1:10001/devstoreaccount1/myqueue`
             // http://localhost:10001/devstoreaccount1/queuename
-            const parsedUrl = coreHttp.URLBuilder.parse(this.url);
-            if (parsedUrl.getHost().split(".")[1] === "queue") {
+            const parsedUrl = new URL(this.url);
+            if (parsedUrl.hostname.split(".")[1] === "queue") {
                 // "https://myaccount.queue.core.windows.net/queuename".
                 // .getPath() -> /queuename
-                queueName = parsedUrl.getPath().split("/")[1];
+                queueName = parsedUrl.pathname.split("/")[1];
             }
             else if (isIpEndpointStyle(parsedUrl)) {
                 // IPv4/IPv6 address hosts... Example - http://192.0.0.10:10001/devstoreaccount1/queuename
                 // Single word domain without a [dot] in the endpoint... Example - http://localhost:10001/devstoreaccount1/queuename
                 // .getPath() -> /devstoreaccount1/queuename
-                queueName = parsedUrl.getPath().split("/")[2];
+                queueName = parsedUrl.pathname.split("/")[2];
             }
             else {
                 // "https://customdomain.com/queuename".
                 // .getPath() -> /queuename
-                queueName = parsedUrl.getPath().split("/")[1];
+                queueName = parsedUrl.pathname.split("/")[1];
             }
             if (!queueName) {
                 throw new Error("Provided queueName is invalid.");
@@ -5371,26 +5725,6 @@ class QueueClient extends StorageClient {
  * to manipulate queues.
  */
 class QueueServiceClient 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 */
-    options) {
-        let pipeline;
-        if (credentialOrPipeline instanceof Pipeline) {
-            pipeline = credentialOrPipeline;
-        }
-        else if ((coreHttp.isNode && credentialOrPipeline instanceof StorageSharedKeyCredential) ||
-            credentialOrPipeline instanceof AnonymousCredential ||
-            coreHttp.isTokenCredential(credentialOrPipeline)) {
-            pipeline = newPipeline(credentialOrPipeline, options);
-        }
-        else {
-            // The second paramter is undefined. Use anonymous credential.
-            pipeline = newPipeline(new AnonymousCredential(), options);
-        }
-        super(url, pipeline);
-        this.serviceContext = new Service(this.storageClientContext);
-    }
     /**
      * Creates an instance of QueueServiceClient.
      *
@@ -5410,10 +5744,10 @@ class QueueServiceClient extends StorageClient {
         options = options || {};
         const extractedCreds = extractConnectionStringParts(connectionString);
         if (extractedCreds.kind === "AccountConnString") {
-            if (coreHttp.isNode) {
+            if (coreUtil.isNode) {
                 const sharedKeyCredential = new StorageSharedKeyCredential(extractedCreds.accountName, extractedCreds.accountKey);
                 if (!options.proxyOptions) {
-                    options.proxyOptions = coreHttp.getDefaultProxySettings(extractedCreds.proxyUri);
+                    options.proxyOptions = coreRestPipeline.getDefaultProxySettings(extractedCreds.proxyUri);
                 }
                 const pipeline = newPipeline(sharedKeyCredential, options);
                 return new QueueServiceClient(extractedCreds.url, pipeline);
@@ -5430,6 +5764,26 @@ class QueueServiceClient extends StorageClient {
             throw new Error("Connection string must be either an Account connection string or a SAS connection string");
         }
     }
+    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 ((coreUtil.isNode && credentialOrPipeline instanceof StorageSharedKeyCredential) ||
+            credentialOrPipeline instanceof AnonymousCredential ||
+            coreAuth.isTokenCredential(credentialOrPipeline)) {
+            pipeline = newPipeline(credentialOrPipeline, options);
+        }
+        else {
+            // The second parameter is undefined. Use anonymous credential.
+            pipeline = newPipeline(new AnonymousCredential(), options);
+        }
+        super(url, pipeline);
+        this.serviceContext = this.storageClientContext.service;
+    }
     /**
      * Creates a {@link QueueClient} object.
      *
@@ -5461,30 +5815,12 @@ class QueueServiceClient extends StorageClient {
      * @returns Response data for the list queues segment operation.
      */
     async listQueuesSegment(marker, options = {}) {
-        const { span, updatedOptions } = createSpan("QueueServiceClient-listQueuesSegment", options);
         if (options.prefix === "") {
             options.prefix = undefined;
         }
-        try {
-            return await this.serviceContext.listQueuesSegment({
-                abortSignal: options.abortSignal,
-                marker: marker,
-                maxPageSize: options.maxPageSize,
-                prefix: options.prefix,
-                include: options.include === undefined ? undefined : [options.include],
-                tracingOptions: updatedOptions.tracingOptions,
-            });
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("QueueServiceClient-listQueuesSegment", options, async (updatedOptions) => {
+            return assertResponse(await this.serviceContext.listQueuesSegment(Object.assign(Object.assign({}, updatedOptions), { marker, include: options.include === undefined ? undefined : [options.include] })));
+        });
     }
     /**
      * Returns an AsyncIterableIterator for {@link ServiceListQueuesSegmentResponse} objects
@@ -5518,23 +5854,30 @@ class QueueServiceClient extends StorageClient {
      */
     listItems(options = {}) {
         return tslib.__asyncGenerator(this, arguments, function* listItems_1() {
-            var e_1, _a;
+            var _a, e_1, _b, _c;
             if (options.prefix === "") {
                 options.prefix = undefined;
             }
             let marker;
             try {
-                for (var _b = tslib.__asyncValues(this.listSegments(marker, options)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
-                    const segment = _c.value;
-                    if (segment.queueItems) {
-                        yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(segment.queueItems)));
+                for (var _d = true, _e = tslib.__asyncValues(this.listSegments(marker, options)), _f; _f = yield tslib.__await(_e.next()), _a = _f.done, !_a;) {
+                    _c = _f.value;
+                    _d = false;
+                    try {
+                        const segment = _c;
+                        if (segment.queueItems) {
+                            yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(segment.queueItems)));
+                        }
+                    }
+                    finally {
+                        _d = true;
                     }
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_c && !_c.done && (_a = _b.return)) yield tslib.__await(_a.call(_b));
+                    if (!_d && !_a && (_b = _e.return)) yield tslib.__await(_b.call(_e));
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -5563,7 +5906,7 @@ class QueueServiceClient extends StorageClient {
      * let iterator = queueServiceClient.listQueues();
      * let item = await iterator.next();
      * while (!item.done) {
-     *   console.log(`Queue${i}: ${iterator.value.name}`);
+     *   console.log(`Queue${i}: ${item.value.name}`);
      *   i++;
      *   item = await iterator.next();
      * }
@@ -5654,23 +5997,9 @@ class QueueServiceClient extends StorageClient {
      * @returns Response data including the queue service properties.
      */
     async getProperties(options = {}) {
-        const { span, updatedOptions } = createSpan("QueueServiceClient-getProperties", options);
-        try {
-            return await this.serviceContext.getProperties({
-                abortSignal: options.abortSignal,
-                tracingOptions: updatedOptions.tracingOptions,
-            });
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("QueueServiceClient-getProperties", options, async (updatedOptions) => {
+            return assertResponse(await this.serviceContext.getProperties(updatedOptions));
+        });
     }
     /**
      * Sets properties for a storage account’s Queue service endpoint, including properties
@@ -5682,23 +6011,9 @@ class QueueServiceClient extends StorageClient {
      * @returns Response data for the Set Properties operation.
      */
     async setProperties(properties, options = {}) {
-        const { span, updatedOptions } = createSpan("QueueServiceClient-setProperties", options);
-        try {
-            return await this.serviceContext.setProperties(properties, {
-                abortSignal: options.abortSignal,
-                tracingOptions: updatedOptions.tracingOptions,
-            });
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("QueueServiceClient-setProperties", options, async (updatedOptions) => {
+            return assertResponse(await this.serviceContext.setProperties(properties, updatedOptions));
+        });
     }
     /**
      * Retrieves statistics related to replication for the Queue service. It is only
@@ -5710,23 +6025,9 @@ class QueueServiceClient extends StorageClient {
      * @returns Response data for get statistics the operation.
      */
     async getStatistics(options = {}) {
-        const { span, updatedOptions } = createSpan("QueueServiceClient-getStatistics", options);
-        try {
-            return await this.serviceContext.getStatistics({
-                abortSignal: options.abortSignal,
-                tracingOptions: updatedOptions.tracingOptions,
-            });
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("QueueServiceClient-getStatistics", options, async (updatedOptions) => {
+            return assertResponse(await this.serviceContext.getStatistics(updatedOptions));
+        });
     }
     /**
      * Creates a new queue under the specified account.
@@ -5737,20 +6038,9 @@ class QueueServiceClient extends StorageClient {
      * @returns Response data for the Queue create operation.
      */
     async createQueue(queueName, options = {}) {
-        const { span, updatedOptions } = createSpan("QueueServiceClient-createQueue", options);
-        try {
-            return await this.getQueueClient(queueName).create(updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("QueueServiceClient-createQueue", options, async (updatedOptions) => {
+            return this.getQueueClient(queueName).create(updatedOptions);
+        });
     }
     /**
      * Deletes the specified queue permanently.
@@ -5761,20 +6051,9 @@ class QueueServiceClient extends StorageClient {
      * @returns Response data for the Queue delete operation.
      */
     async deleteQueue(queueName, options = {}) {
-        const { span, updatedOptions } = createSpan("QueueServiceClient-deleteQueue", options);
-        try {
-            return await this.getQueueClient(queueName).delete(updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("QueueServiceClient-deleteQueue", options, async (updatedOptions) => {
+            return this.getQueueClient(queueName).delete(updatedOptions);
+        });
     }
     /**
      * Only available for QueueServiceClient constructed with a shared key credential.
@@ -5805,35 +6084,22 @@ class QueueServiceClient extends StorageClient {
     }
 }
 
-Object.defineProperty(exports, 'BaseRequestPolicy', {
-    enumerable: true,
-    get: function () { return coreHttp.BaseRequestPolicy; }
-});
-Object.defineProperty(exports, 'HttpHeaders', {
-    enumerable: true,
-    get: function () { return coreHttp.HttpHeaders; }
-});
-Object.defineProperty(exports, 'RequestPolicyOptions', {
-    enumerable: true,
-    get: function () { return coreHttp.RequestPolicyOptions; }
-});
+// Copyright (c) Microsoft Corporation.
+/**
+ * The `@azure/logger` configuration for this package.
+ */
+const logger = logger$2.createClientLogger("storage-queue");
+
 Object.defineProperty(exports, 'RestError', {
     enumerable: true,
-    get: function () { return coreHttp.RestError; }
-});
-Object.defineProperty(exports, 'WebResource', {
-    enumerable: true,
-    get: function () { return coreHttp.WebResource; }
-});
-Object.defineProperty(exports, 'deserializationPolicy', {
-    enumerable: true,
-    get: function () { return coreHttp.deserializationPolicy; }
+    get: function () { return coreRestPipeline.RestError; }
 });
 exports.AccountSASPermissions = AccountSASPermissions;
 exports.AccountSASResourceTypes = AccountSASResourceTypes;
 exports.AccountSASServices = AccountSASServices;
 exports.AnonymousCredential = AnonymousCredential;
 exports.AnonymousCredentialPolicy = AnonymousCredentialPolicy;
+exports.BaseRequestPolicy = BaseRequestPolicy;
 exports.Credential = Credential;
 exports.CredentialPolicy = CredentialPolicy;
 exports.Pipeline = Pipeline;
@@ -5843,13 +6109,13 @@ exports.QueueServiceClient = QueueServiceClient;
 exports.SASQueryParameters = SASQueryParameters;
 exports.StorageBrowserPolicy = StorageBrowserPolicy;
 exports.StorageBrowserPolicyFactory = StorageBrowserPolicyFactory;
-exports.StorageOAuthScopes = StorageOAuthScopes;
 exports.StorageRetryPolicy = StorageRetryPolicy;
 exports.StorageRetryPolicyFactory = StorageRetryPolicyFactory;
 exports.StorageSharedKeyCredential = StorageSharedKeyCredential;
 exports.StorageSharedKeyCredentialPolicy = StorageSharedKeyCredentialPolicy;
 exports.generateAccountSASQueryParameters = generateAccountSASQueryParameters;
 exports.generateQueueSASQueryParameters = generateQueueSASQueryParameters;
+exports.isPipelineLike = isPipelineLike;
 exports.logger = logger;
 exports.newPipeline = newPipeline;
 //# sourceMappingURL=index.js.map