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

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

@@ -1,11 +1,13 @@
 import { __asyncDelegator, __asyncGenerator, __asyncValues, __await } from "tslib";
-import { generateUuid, getDefaultProxySettings, isNode, isTokenCredential, URLBuilder, } from "@azure/core-http";
+import { getDefaultProxySettings, } from "@azure/core-rest-pipeline";
+import { isTokenCredential } from "@azure/core-auth";
+import { isNode } from "@azure/core-util";
 import { SpanStatusCode } from "@azure/core-tracing";
+import { v4 as generateUuid } from "uuid";
 import { BlobDownloadResponse } from "./BlobDownloadResponse";
 import { BlobQueryResponse } from "./BlobQueryResponse";
 import { AnonymousCredential } from "./credentials/AnonymousCredential";
 import { StorageSharedKeyCredential } from "./credentials/StorageSharedKeyCredential";
-import { AppendBlob, Blob as StorageBlob, BlockBlob, PageBlob } from "./generated/src/operations";
 import { ensureCpkIfSpecified, toAccessTier, } from "./models";
 import { rangeResponseFromModel, } from "./PageBlobRangeResponse";
 import { newPipeline, isPipelineLike } from "./Pipeline";
@@ -15,8 +17,8 @@ import { StorageClient } from "./StorageClient";
 import { Batch } from "./utils/Batch";
 import { BufferScheduler } from "../../storage-common/src";
 import { BlobDoesNotUseCustomerSpecifiedEncryption, BlobUsesCustomerSpecifiedEncryptionMsg, BLOCK_BLOB_MAX_BLOCKS, BLOCK_BLOB_MAX_STAGE_BLOCK_BYTES, BLOCK_BLOB_MAX_UPLOAD_BLOB_BYTES, DEFAULT_BLOB_DOWNLOAD_BLOCK_BYTES, DEFAULT_BLOCK_BUFFER_SIZE_BYTES, DEFAULT_MAX_DOWNLOAD_RETRY_REQUESTS, ETagAny, URLConstants, } from "./utils/constants";
-import { createSpan, convertTracingToRequestOptionsBase } from "./utils/tracing";
-import { appendToURLPath, appendToURLQuery, extractConnectionStringParts, ExtractPageRangeInfoItems, generateBlockID, getURLParameter, httpAuthorizationToString, isIpEndpointStyle, parseObjectReplicationRecord, setURLParameter, toBlobTags, toBlobTagsString, toQuerySerialization, toTags, } from "./utils/utils.common";
+import { createSpan } from "./utils/tracing";
+import { appendToURLPath, appendToURLQuery, assertResponse, extractConnectionStringParts, ExtractPageRangeInfoItems, generateBlockID, getURLParameter, httpAuthorizationToString, isIpEndpointStyle, parseObjectReplicationRecord, setURLParameter, toBlobTags, toBlobTagsString, toQuerySerialization, toTags, } from "./utils/utils.common";
 import { fsCreateReadStream, fsStat, readStreamToLocalFile, streamToBuffer, } from "./utils/utils.node";
 import { generateBlobSASQueryParameters } from "./sas/BlobSASSignatureValues";
 import { BlobLeaseClient } from "./BlobLeaseClient";
@@ -90,7 +92,7 @@ export class BlobClient extends StorageClient {
         super(url, pipeline);
         ({ blobName: this._name, containerName: this._containerName } =
             this.getBlobAndContainerNamesFromUrl());
-        this.blobContext = new StorageBlob(this.storageClientContext);
+        this.blobContext = this.storageClientContext.blob;
         this._snapshot = getURLParameter(this.url, URLConstants.Parameters.SNAPSHOT);
         this._versionId = getURLParameter(this.url, URLConstants.Parameters.VERSIONID);
     }
@@ -213,9 +215,20 @@ export class BlobClient extends StorageClient {
         ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
         const { span, updatedOptions } = createSpan("BlobClient-download", options);
         try {
-            const res = await this.blobContext.download(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), requestOptions: {
+            const res = assertResponse(await this.blobContext.download({
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                requestOptions: {
                     onDownloadProgress: isNode ? undefined : options.onProgress, // for Node.js, progress is reported by RetriableReadableStream
-                }, range: offset === 0 && !count ? undefined : rangeToString({ offset, count }), rangeGetContentMD5: options.rangeGetContentMD5, rangeGetContentCRC64: options.rangeGetContentCrc64, snapshot: options.snapshot, cpkInfo: options.customerProvidedKey }, convertTracingToRequestOptionsBase(updatedOptions)));
+                },
+                range: offset === 0 && !count ? undefined : rangeToString({ offset, count }),
+                rangeGetContentMD5: options.rangeGetContentMD5,
+                rangeGetContentCRC64: options.rangeGetContentCrc64,
+                snapshot: options.snapshot,
+                cpkInfo: options.customerProvidedKey,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
             const wrappedRes = Object.assign(Object.assign({}, res), { _response: res._response, objectReplicationDestinationPolicyId: res.objectReplicationPolicyId, objectReplicationSourceProperties: parseObjectReplicationRecord(res.objectReplicationRules) });
             // Return browser response immediately
             if (!isNode) {
@@ -339,7 +352,13 @@ export class BlobClient extends StorageClient {
         try {
             options.conditions = options.conditions || {};
             ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            const res = await this.blobContext.getProperties(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), cpkInfo: options.customerProvidedKey }, convertTracingToRequestOptionsBase(updatedOptions)));
+            const res = assertResponse(await this.blobContext.getProperties({
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                cpkInfo: options.customerProvidedKey,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
             return Object.assign(Object.assign({}, res), { _response: res._response, objectReplicationDestinationPolicyId: res.objectReplicationPolicyId, objectReplicationSourceProperties: parseObjectReplicationRecord(res.objectReplicationRules) });
         }
         catch (e) {
@@ -367,7 +386,13 @@ export class BlobClient extends StorageClient {
         const { span, updatedOptions } = createSpan("BlobClient-delete", options);
         options.conditions = options.conditions || {};
         try {
-            return await this.blobContext.delete(Object.assign({ abortSignal: options.abortSignal, deleteSnapshots: options.deleteSnapshots, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }) }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.blobContext.delete({
+                abortSignal: options.abortSignal,
+                deleteSnapshots: options.deleteSnapshots,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -393,7 +418,7 @@ export class BlobClient extends StorageClient {
         var _a, _b;
         const { span, updatedOptions } = createSpan("BlobClient-deleteIfExists", options);
         try {
-            const res = await this.delete(updatedOptions);
+            const res = assertResponse(await this.delete(updatedOptions));
             return Object.assign(Object.assign({ succeeded: true }, res), { _response: res._response });
         }
         catch (e) {
@@ -425,7 +450,10 @@ export class BlobClient extends StorageClient {
     async undelete(options = {}) {
         const { span, updatedOptions } = createSpan("BlobClient-undelete", options);
         try {
-            return await this.blobContext.undelete(Object.assign({ abortSignal: options.abortSignal }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.blobContext.undelete({
+                abortSignal: options.abortSignal,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -459,7 +487,14 @@ export class BlobClient extends StorageClient {
         options.conditions = options.conditions || {};
         try {
             ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            return await this.blobContext.setHttpHeaders(Object.assign({ abortSignal: options.abortSignal, blobHttpHeaders: blobHTTPHeaders, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }) }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.blobContext.setHttpHeaders({
+                abortSignal: options.abortSignal,
+                blobHttpHeaders: blobHTTPHeaders,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                // cpkInfo: options.customerProvidedKey, // CPK is not included in Swagger, should change this back when this issue is fixed in Swagger.
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -489,7 +524,15 @@ export class BlobClient extends StorageClient {
         options.conditions = options.conditions || {};
         try {
             ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            return await this.blobContext.setMetadata(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, metadata, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), cpkInfo: options.customerProvidedKey, encryptionScope: options.encryptionScope }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.blobContext.setMetadata({
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                metadata,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                cpkInfo: options.customerProvidedKey,
+                encryptionScope: options.encryptionScope,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -515,7 +558,13 @@ export class BlobClient extends StorageClient {
         var _a;
         const { span, updatedOptions } = createSpan("BlobClient-setTags", options);
         try {
-            return await this.blobContext.setTags(Object.assign(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }) }, convertTracingToRequestOptionsBase(updatedOptions)), { tags: toBlobTags(tags) }));
+            return assertResponse(await this.blobContext.setTags({
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                tracingOptions: updatedOptions.tracingOptions,
+                tags: toBlobTags(tags),
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -537,7 +586,12 @@ export class BlobClient extends StorageClient {
         var _a;
         const { span, updatedOptions } = createSpan("BlobClient-getTags", options);
         try {
-            const response = await this.blobContext.getTags(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }) }, convertTracingToRequestOptionsBase(updatedOptions)));
+            const response = assertResponse(await this.blobContext.getTags({
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
             const wrappedResponse = Object.assign(Object.assign({}, response), { _response: response._response, tags: toTags({ blobTagSet: response.blobTagSet }) || {} });
             return wrappedResponse;
         }
@@ -573,7 +627,15 @@ export class BlobClient extends StorageClient {
         options.conditions = options.conditions || {};
         try {
             ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            return await this.blobContext.createSnapshot(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, metadata: options.metadata, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), cpkInfo: options.customerProvidedKey, encryptionScope: options.encryptionScope }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.blobContext.createSnapshot({
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                metadata: options.metadata,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                cpkInfo: options.customerProvidedKey,
+                encryptionScope: options.encryptionScope,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -688,7 +750,11 @@ export class BlobClient extends StorageClient {
     async abortCopyFromURL(copyId, options = {}) {
         const { span, updatedOptions } = createSpan("BlobClient-abortCopyFromURL", options);
         try {
-            return await this.blobContext.abortCopyFromURL(copyId, Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.blobContext.abortCopyFromURL(copyId, {
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -715,12 +781,28 @@ export class BlobClient extends StorageClient {
         options.conditions = options.conditions || {};
         options.sourceConditions = options.sourceConditions || {};
         try {
-            return await this.blobContext.copyFromURL(copySource, Object.assign({ abortSignal: options.abortSignal, metadata: options.metadata, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), sourceModifiedAccessConditions: {
+            return assertResponse(await this.blobContext.copyFromURL(copySource, {
+                abortSignal: options.abortSignal,
+                metadata: options.metadata,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                sourceModifiedAccessConditions: {
                     sourceIfMatch: options.sourceConditions.ifMatch,
                     sourceIfModifiedSince: options.sourceConditions.ifModifiedSince,
                     sourceIfNoneMatch: options.sourceConditions.ifNoneMatch,
                     sourceIfUnmodifiedSince: options.sourceConditions.ifUnmodifiedSince,
-                }, sourceContentMD5: options.sourceContentMD5, copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization), tier: toAccessTier(options.tier), blobTagsString: toBlobTagsString(options.tags), immutabilityPolicyExpiry: (_b = options.immutabilityPolicy) === null || _b === void 0 ? void 0 : _b.expiriesOn, immutabilityPolicyMode: (_c = options.immutabilityPolicy) === null || _c === void 0 ? void 0 : _c.policyMode, legalHold: options.legalHold, encryptionScope: options.encryptionScope, copySourceTags: options.copySourceTags }, convertTracingToRequestOptionsBase(updatedOptions)));
+                },
+                sourceContentMD5: options.sourceContentMD5,
+                copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization),
+                tier: toAccessTier(options.tier),
+                blobTagsString: toBlobTagsString(options.tags),
+                immutabilityPolicyExpiry: (_b = options.immutabilityPolicy) === null || _b === void 0 ? void 0 : _b.expiriesOn,
+                immutabilityPolicyMode: (_c = options.immutabilityPolicy) === null || _c === void 0 ? void 0 : _c.policyMode,
+                legalHold: options.legalHold,
+                encryptionScope: options.encryptionScope,
+                copySourceTags: options.copySourceTags,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -748,7 +830,13 @@ export class BlobClient extends StorageClient {
         var _a;
         const { span, updatedOptions } = createSpan("BlobClient-setAccessTier", options);
         try {
-            return await this.blobContext.setTier(toAccessTier(tier), Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), rehydratePriority: options.rehydratePriority }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.blobContext.setTier(toAccessTier(tier), {
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                rehydratePriority: options.rehydratePriority,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -798,7 +886,7 @@ export class BlobClient extends StorageClient {
             }
             // Customer doesn't specify length, get it
             if (!count) {
-                const response = await this.getProperties(Object.assign(Object.assign({}, options), { tracingOptions: Object.assign(Object.assign({}, options.tracingOptions), convertTracingToRequestOptionsBase(updatedOptions)) }));
+                const response = await this.getProperties(Object.assign(Object.assign({}, options), { tracingOptions: updatedOptions.tracingOptions }));
                 count = response.contentLength - offset;
                 if (count < 0) {
                     throw new RangeError(`offset ${offset} shouldn't be larger than blob size ${response.contentLength}`);
@@ -830,7 +918,7 @@ export class BlobClient extends StorageClient {
                         conditions: options.conditions,
                         maxRetryRequests: options.maxRetryRequestsPerBlock,
                         customerProvidedKey: options.customerProvidedKey,
-                        tracingOptions: Object.assign(Object.assign({}, options.tracingOptions), convertTracingToRequestOptionsBase(updatedOptions)),
+                        tracingOptions: updatedOptions.tracingOptions,
                     });
                     const stream = response.readableStreamBody;
                     await streamToBuffer(stream, buffer, off - offset, chunkEnd - offset);
@@ -876,7 +964,7 @@ export class BlobClient extends StorageClient {
     async downloadToFile(filePath, offset = 0, count, options = {}) {
         const { span, updatedOptions } = createSpan("BlobClient-downloadToFile", options);
         try {
-            const response = await this.download(offset, count, Object.assign(Object.assign({}, options), { tracingOptions: Object.assign(Object.assign({}, options.tracingOptions), convertTracingToRequestOptionsBase(updatedOptions)) }));
+            const response = await this.download(offset, count, Object.assign(Object.assign({}, options), { tracingOptions: updatedOptions.tracingOptions }));
             if (response.readableStreamBody) {
                 await readStreamToLocalFile(response.readableStreamBody, filePath);
             }
@@ -906,11 +994,11 @@ export class BlobClient extends StorageClient {
             // "https://myaccount.blob.core.windows.net/mycontainer/blob/a.txt";
             // IPv4/IPv6 address hosts, Endpoints - `http://127.0.0.1:10000/devstoreaccount1/containername/blob`
             // http://localhost:10001/devstoreaccount1/containername/blob
-            const parsedUrl = URLBuilder.parse(this.url);
-            if (parsedUrl.getHost().split(".")[1] === "blob") {
+            const parsedUrl = new URL(this.url);
+            if (parsedUrl.host.split(".")[1] === "blob") {
                 // "https://myaccount.blob.core.windows.net/containername/blob".
                 // .getPath() -> /containername/blob
-                const pathComponents = parsedUrl.getPath().match("/([^/]*)(/(.*))?");
+                const pathComponents = parsedUrl.pathname.match("/([^/]*)(/(.*))?");
                 containerName = pathComponents[1];
                 blobName = pathComponents[3];
             }
@@ -918,14 +1006,14 @@ export class BlobClient extends StorageClient {
                 // IPv4/IPv6 address hosts... Example - http://192.0.0.10:10001/devstoreaccount1/containername/blob
                 // Single word domain without a [dot] in the endpoint... Example - http://localhost:10001/devstoreaccount1/containername/blob
                 // .getPath() -> /devstoreaccount1/containername/blob
-                const pathComponents = parsedUrl.getPath().match("/([^/]*)/([^/]*)(/(.*))?");
+                const pathComponents = parsedUrl.pathname.match("/([^/]*)/([^/]*)(/(.*))?");
                 containerName = pathComponents[2];
                 blobName = pathComponents[4];
             }
             else {
                 // "https://customdomain.com/containername/blob".
                 // .getPath() -> /containername/blob
-                const pathComponents = parsedUrl.getPath().match("/([^/]*)(/(.*))?");
+                const pathComponents = parsedUrl.pathname.match("/([^/]*)(/(.*))?");
                 containerName = pathComponents[1];
                 blobName = pathComponents[3];
             }
@@ -963,13 +1051,27 @@ export class BlobClient extends StorageClient {
         options.conditions = options.conditions || {};
         options.sourceConditions = options.sourceConditions || {};
         try {
-            return await this.blobContext.startCopyFromURL(copySource, Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, metadata: options.metadata, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), sourceModifiedAccessConditions: {
+            return assertResponse(await this.blobContext.startCopyFromURL(copySource, {
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                metadata: options.metadata,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                sourceModifiedAccessConditions: {
                     sourceIfMatch: options.sourceConditions.ifMatch,
                     sourceIfModifiedSince: options.sourceConditions.ifModifiedSince,
                     sourceIfNoneMatch: options.sourceConditions.ifNoneMatch,
                     sourceIfUnmodifiedSince: options.sourceConditions.ifUnmodifiedSince,
                     sourceIfTags: options.sourceConditions.tagConditions,
-                }, immutabilityPolicyExpiry: (_b = options.immutabilityPolicy) === null || _b === void 0 ? void 0 : _b.expiriesOn, immutabilityPolicyMode: (_c = options.immutabilityPolicy) === null || _c === void 0 ? void 0 : _c.policyMode, legalHold: options.legalHold, rehydratePriority: options.rehydratePriority, tier: toAccessTier(options.tier), blobTagsString: toBlobTagsString(options.tags), sealBlob: options.sealBlob }, convertTracingToRequestOptionsBase(updatedOptions)));
+                },
+                immutabilityPolicyExpiry: (_b = options.immutabilityPolicy) === null || _b === void 0 ? void 0 : _b.expiriesOn,
+                immutabilityPolicyMode: (_c = options.immutabilityPolicy) === null || _c === void 0 ? void 0 : _c.policyMode,
+                legalHold: options.legalHold,
+                rehydratePriority: options.rehydratePriority,
+                tier: toAccessTier(options.tier),
+                blobTagsString: toBlobTagsString(options.tags),
+                sealBlob: options.sealBlob,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -1010,7 +1112,9 @@ export class BlobClient extends StorageClient {
     async deleteImmutabilityPolicy(options) {
         const { span, updatedOptions } = createSpan("BlobClient-deleteImmutabilityPolicy", options);
         try {
-            return await this.blobContext.deleteImmutabilityPolicy(Object.assign({ abortSignal: options === null || options === void 0 ? void 0 : options.abortSignal }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.blobContext.deleteImmutabilityPolicy({
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -1031,7 +1135,11 @@ export class BlobClient extends StorageClient {
     async setImmutabilityPolicy(immutabilityPolicy, options) {
         const { span, updatedOptions } = createSpan("BlobClient-setImmutabilityPolicy", options);
         try {
-            return await this.blobContext.setImmutabilityPolicy(Object.assign({ abortSignal: options === null || options === void 0 ? void 0 : options.abortSignal, immutabilityPolicyExpiry: immutabilityPolicy.expiriesOn, immutabilityPolicyMode: immutabilityPolicy.policyMode, modifiedAccessConditions: options === null || options === void 0 ? void 0 : options.modifiedAccessCondition }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.blobContext.setImmutabilityPolicy({
+                immutabilityPolicyExpiry: immutabilityPolicy.expiriesOn,
+                immutabilityPolicyMode: immutabilityPolicy.policyMode,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -1052,7 +1160,9 @@ export class BlobClient extends StorageClient {
     async setLegalHold(legalHoldEnabled, options) {
         const { span, updatedOptions } = createSpan("BlobClient-setLegalHold", options);
         try {
-            return await this.blobContext.setLegalHold(legalHoldEnabled, Object.assign({ abortSignal: options === null || options === void 0 ? void 0 : options.abortSignal }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.blobContext.setLegalHold(legalHoldEnabled, {
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -1135,7 +1245,7 @@ export class AppendBlobClient extends BlobClient {
             throw new Error("Expecting non-empty strings for containerName and blobName parameters");
         }
         super(url, pipeline);
-        this.appendBlobContext = new AppendBlob(this.storageClientContext);
+        this.appendBlobContext = this.storageClientContext.appendBlob;
     }
     /**
      * Creates a new AppendBlobClient object identical to the source but with the
@@ -1168,7 +1278,20 @@ export class AppendBlobClient extends BlobClient {
         options.conditions = options.conditions || {};
         try {
             ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            return await this.appendBlobContext.create(0, Object.assign({ abortSignal: options.abortSignal, blobHttpHeaders: options.blobHTTPHeaders, leaseAccessConditions: options.conditions, metadata: options.metadata, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), cpkInfo: options.customerProvidedKey, encryptionScope: options.encryptionScope, immutabilityPolicyExpiry: (_b = options.immutabilityPolicy) === null || _b === void 0 ? void 0 : _b.expiriesOn, immutabilityPolicyMode: (_c = options.immutabilityPolicy) === null || _c === void 0 ? void 0 : _c.policyMode, legalHold: options.legalHold, blobTagsString: toBlobTagsString(options.tags) }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.appendBlobContext.create(0, {
+                abortSignal: options.abortSignal,
+                blobHttpHeaders: options.blobHTTPHeaders,
+                leaseAccessConditions: options.conditions,
+                metadata: options.metadata,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                cpkInfo: options.customerProvidedKey,
+                encryptionScope: options.encryptionScope,
+                immutabilityPolicyExpiry: (_b = options.immutabilityPolicy) === null || _b === void 0 ? void 0 : _b.expiriesOn,
+                immutabilityPolicyMode: (_c = options.immutabilityPolicy) === null || _c === void 0 ? void 0 : _c.policyMode,
+                legalHold: options.legalHold,
+                blobTagsString: toBlobTagsString(options.tags),
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -1193,7 +1316,7 @@ export class AppendBlobClient extends BlobClient {
         const { span, updatedOptions } = createSpan("AppendBlobClient-createIfNotExists", options);
         const conditions = { ifNoneMatch: ETagAny };
         try {
-            const res = await this.create(Object.assign(Object.assign({}, updatedOptions), { conditions }));
+            const res = assertResponse(await this.create(Object.assign(Object.assign({}, updatedOptions), { conditions })));
             return Object.assign(Object.assign({ succeeded: true }, res), { _response: res._response });
         }
         catch (e) {
@@ -1224,7 +1347,13 @@ export class AppendBlobClient extends BlobClient {
         const { span, updatedOptions } = createSpan("AppendBlobClient-seal", options);
         options.conditions = options.conditions || {};
         try {
-            return await this.appendBlobContext.seal(Object.assign({ abortSignal: options.abortSignal, appendPositionAccessConditions: options.conditions, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }) }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.appendBlobContext.seal({
+                abortSignal: options.abortSignal,
+                appendPositionAccessConditions: options.conditions,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -1267,9 +1396,20 @@ export class AppendBlobClient extends BlobClient {
         options.conditions = options.conditions || {};
         try {
             ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            return await this.appendBlobContext.appendBlock(contentLength, body, Object.assign({ abortSignal: options.abortSignal, appendPositionAccessConditions: options.conditions, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), requestOptions: {
+            return assertResponse(await this.appendBlobContext.appendBlock(contentLength, body, {
+                abortSignal: options.abortSignal,
+                appendPositionAccessConditions: options.conditions,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                requestOptions: {
                     onUploadProgress: options.onProgress,
-                }, transactionalContentMD5: options.transactionalContentMD5, transactionalContentCrc64: options.transactionalContentCrc64, cpkInfo: options.customerProvidedKey, encryptionScope: options.encryptionScope }, convertTracingToRequestOptionsBase(updatedOptions)));
+                },
+                transactionalContentMD5: options.transactionalContentMD5,
+                transactionalContentCrc64: options.transactionalContentCrc64,
+                cpkInfo: options.customerProvidedKey,
+                encryptionScope: options.encryptionScope,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -1303,12 +1443,25 @@ export class AppendBlobClient extends BlobClient {
         options.sourceConditions = options.sourceConditions || {};
         try {
             ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            return await this.appendBlobContext.appendBlockFromUrl(sourceURL, 0, Object.assign({ abortSignal: options.abortSignal, sourceRange: rangeToString({ offset: sourceOffset, count }), sourceContentMD5: options.sourceContentMD5, sourceContentCrc64: options.sourceContentCrc64, leaseAccessConditions: options.conditions, appendPositionAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), sourceModifiedAccessConditions: {
+            return assertResponse(await this.appendBlobContext.appendBlockFromUrl(sourceURL, 0, {
+                abortSignal: options.abortSignal,
+                sourceRange: rangeToString({ offset: sourceOffset, count }),
+                sourceContentMD5: options.sourceContentMD5,
+                sourceContentCrc64: options.sourceContentCrc64,
+                leaseAccessConditions: options.conditions,
+                appendPositionAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                sourceModifiedAccessConditions: {
                     sourceIfMatch: options.sourceConditions.ifMatch,
                     sourceIfModifiedSince: options.sourceConditions.ifModifiedSince,
                     sourceIfNoneMatch: options.sourceConditions.ifNoneMatch,
                     sourceIfUnmodifiedSince: options.sourceConditions.ifUnmodifiedSince,
-                }, copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization), cpkInfo: options.customerProvidedKey, encryptionScope: options.encryptionScope }, convertTracingToRequestOptionsBase(updatedOptions)));
+                },
+                copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization),
+                cpkInfo: options.customerProvidedKey,
+                encryptionScope: options.encryptionScope,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -1391,8 +1544,8 @@ export class BlockBlobClient extends BlobClient {
             throw new Error("Expecting non-empty strings for containerName and blobName parameters");
         }
         super(url, pipeline);
-        this.blockBlobContext = new BlockBlob(this.storageClientContext);
-        this._blobContext = new StorageBlob(this.storageClientContext);
+        this.blockBlobContext = this.storageClientContext.blockBlob;
+        this._blobContext = this.storageClientContext.blob;
     }
     /**
      * Creates a new BlockBlobClient object identical to the source but with the
@@ -1444,12 +1597,19 @@ export class BlockBlobClient extends BlobClient {
                 throw new Error("This operation currently is only supported in Node.js.");
             }
             ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            const response = await this._blobContext.query(Object.assign({ abortSignal: options.abortSignal, queryRequest: {
+            const response = assertResponse(await this._blobContext.query({
+                abortSignal: options.abortSignal,
+                queryRequest: {
                     queryType: "SQL",
                     expression: query,
                     inputSerialization: toQuerySerialization(options.inputTextConfiguration),
                     outputSerialization: toQuerySerialization(options.outputTextConfiguration),
-                }, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), cpkInfo: options.customerProvidedKey }, convertTracingToRequestOptionsBase(updatedOptions)));
+                },
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                cpkInfo: options.customerProvidedKey,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
             return new BlobQueryResponse(response, {
                 abortSignal: options.abortSignal,
                 onProgress: options.onProgress,
@@ -1500,9 +1660,24 @@ export class BlockBlobClient extends BlobClient {
         const { span, updatedOptions } = createSpan("BlockBlobClient-upload", options);
         try {
             ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            return await this.blockBlobContext.upload(contentLength, body, Object.assign({ abortSignal: options.abortSignal, blobHttpHeaders: options.blobHTTPHeaders, leaseAccessConditions: options.conditions, metadata: options.metadata, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), requestOptions: {
+            return assertResponse(await this.blockBlobContext.upload(contentLength, body, {
+                abortSignal: options.abortSignal,
+                blobHttpHeaders: options.blobHTTPHeaders,
+                leaseAccessConditions: options.conditions,
+                metadata: options.metadata,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                requestOptions: {
                     onUploadProgress: options.onProgress,
-                }, cpkInfo: options.customerProvidedKey, encryptionScope: options.encryptionScope, immutabilityPolicyExpiry: (_b = options.immutabilityPolicy) === null || _b === void 0 ? void 0 : _b.expiriesOn, immutabilityPolicyMode: (_c = options.immutabilityPolicy) === null || _c === void 0 ? void 0 : _c.policyMode, legalHold: options.legalHold, tier: toAccessTier(options.tier), blobTagsString: toBlobTagsString(options.tags) }, convertTracingToRequestOptionsBase(updatedOptions)));
+                },
+                cpkInfo: options.customerProvidedKey,
+                encryptionScope: options.encryptionScope,
+                immutabilityPolicyExpiry: (_b = options.immutabilityPolicy) === null || _b === void 0 ? void 0 : _b.expiriesOn,
+                immutabilityPolicyMode: (_c = options.immutabilityPolicy) === null || _c === void 0 ? void 0 : _c.policyMode,
+                legalHold: options.legalHold,
+                tier: toAccessTier(options.tier),
+                blobTagsString: toBlobTagsString(options.tags),
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -1539,13 +1714,13 @@ export class BlockBlobClient extends BlobClient {
         const { span, updatedOptions } = createSpan("BlockBlobClient-syncUploadFromURL", options);
         try {
             ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            return await this.blockBlobContext.putBlobFromUrl(0, sourceURL, Object.assign(Object.assign(Object.assign({}, options), { blobHttpHeaders: options.blobHTTPHeaders, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: options.conditions.tagConditions }), sourceModifiedAccessConditions: {
+            return assertResponse(await this.blockBlobContext.putBlobFromUrl(0, sourceURL, Object.assign(Object.assign({}, options), { blobHttpHeaders: options.blobHTTPHeaders, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: options.conditions.tagConditions }), sourceModifiedAccessConditions: {
                     sourceIfMatch: (_a = options.sourceConditions) === null || _a === void 0 ? void 0 : _a.ifMatch,
                     sourceIfModifiedSince: (_b = options.sourceConditions) === null || _b === void 0 ? void 0 : _b.ifModifiedSince,
                     sourceIfNoneMatch: (_c = options.sourceConditions) === null || _c === void 0 ? void 0 : _c.ifNoneMatch,
                     sourceIfUnmodifiedSince: (_d = options.sourceConditions) === null || _d === void 0 ? void 0 : _d.ifUnmodifiedSince,
                     sourceIfTags: (_e = options.sourceConditions) === null || _e === void 0 ? void 0 : _e.tagConditions,
-                }, cpkInfo: options.customerProvidedKey, copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization), tier: toAccessTier(options.tier), blobTagsString: toBlobTagsString(options.tags), copySourceTags: options.copySourceTags }), convertTracingToRequestOptionsBase(updatedOptions)));
+                }, cpkInfo: options.customerProvidedKey, copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization), tier: toAccessTier(options.tier), blobTagsString: toBlobTagsString(options.tags), copySourceTags: options.copySourceTags, tracingOptions: updatedOptions.tracingOptions })));
         }
         catch (e) {
             span.setStatus({
@@ -1573,9 +1748,18 @@ export class BlockBlobClient extends BlobClient {
         const { span, updatedOptions } = createSpan("BlockBlobClient-stageBlock", options);
         try {
             ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            return await this.blockBlobContext.stageBlock(blockId, contentLength, body, Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, requestOptions: {
+            return assertResponse(await this.blockBlobContext.stageBlock(blockId, contentLength, body, {
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                requestOptions: {
                     onUploadProgress: options.onProgress,
-                }, transactionalContentMD5: options.transactionalContentMD5, transactionalContentCrc64: options.transactionalContentCrc64, cpkInfo: options.customerProvidedKey, encryptionScope: options.encryptionScope }, convertTracingToRequestOptionsBase(updatedOptions)));
+                },
+                transactionalContentMD5: options.transactionalContentMD5,
+                transactionalContentCrc64: options.transactionalContentCrc64,
+                cpkInfo: options.customerProvidedKey,
+                encryptionScope: options.encryptionScope,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -1613,7 +1797,17 @@ export class BlockBlobClient extends BlobClient {
         const { span, updatedOptions } = createSpan("BlockBlobClient-stageBlockFromURL", options);
         try {
             ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            return await this.blockBlobContext.stageBlockFromURL(blockId, 0, sourceURL, Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, sourceContentMD5: options.sourceContentMD5, sourceContentCrc64: options.sourceContentCrc64, sourceRange: offset === 0 && !count ? undefined : rangeToString({ offset, count }), cpkInfo: options.customerProvidedKey, encryptionScope: options.encryptionScope, copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization) }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.blockBlobContext.stageBlockFromURL(blockId, 0, sourceURL, {
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                sourceContentMD5: options.sourceContentMD5,
+                sourceContentCrc64: options.sourceContentCrc64,
+                sourceRange: offset === 0 && !count ? undefined : rangeToString({ offset, count }),
+                cpkInfo: options.customerProvidedKey,
+                encryptionScope: options.encryptionScope,
+                copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization),
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -1644,7 +1838,21 @@ export class BlockBlobClient extends BlobClient {
         const { span, updatedOptions } = createSpan("BlockBlobClient-commitBlockList", options);
         try {
             ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            return await this.blockBlobContext.commitBlockList({ latest: blocks }, Object.assign({ abortSignal: options.abortSignal, blobHttpHeaders: options.blobHTTPHeaders, leaseAccessConditions: options.conditions, metadata: options.metadata, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), cpkInfo: options.customerProvidedKey, encryptionScope: options.encryptionScope, immutabilityPolicyExpiry: (_b = options.immutabilityPolicy) === null || _b === void 0 ? void 0 : _b.expiriesOn, immutabilityPolicyMode: (_c = options.immutabilityPolicy) === null || _c === void 0 ? void 0 : _c.policyMode, legalHold: options.legalHold, tier: toAccessTier(options.tier), blobTagsString: toBlobTagsString(options.tags) }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.blockBlobContext.commitBlockList({ latest: blocks }, {
+                abortSignal: options.abortSignal,
+                blobHttpHeaders: options.blobHTTPHeaders,
+                leaseAccessConditions: options.conditions,
+                metadata: options.metadata,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                cpkInfo: options.customerProvidedKey,
+                encryptionScope: options.encryptionScope,
+                immutabilityPolicyExpiry: (_b = options.immutabilityPolicy) === null || _b === void 0 ? void 0 : _b.expiriesOn,
+                immutabilityPolicyMode: (_c = options.immutabilityPolicy) === null || _c === void 0 ? void 0 : _c.policyMode,
+                legalHold: options.legalHold,
+                tier: toAccessTier(options.tier),
+                blobTagsString: toBlobTagsString(options.tags),
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -1671,7 +1879,12 @@ export class BlockBlobClient extends BlobClient {
         var _a;
         const { span, updatedOptions } = createSpan("BlockBlobClient-getBlockList", options);
         try {
-            const res = await this.blockBlobContext.getBlockList(listType, Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }) }, convertTracingToRequestOptionsBase(updatedOptions)));
+            const res = assertResponse(await this.blockBlobContext.getBlockList(listType, {
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
             if (!res.committedBlocks) {
                 res.committedBlocks = [];
             }
@@ -1825,7 +2038,7 @@ export class BlockBlobClient extends BlobClient {
         const { span, updatedOptions } = createSpan("BlockBlobClient-uploadSeekableInternal", options);
         try {
             if (size <= options.maxSingleShotSize) {
-                return await this.upload(bodyFactory(0, size), size, updatedOptions);
+                return assertResponse(await this.upload(bodyFactory(0, size), size, updatedOptions));
             }
             const numBlocks = Math.floor((size - 1) / options.blockSize) + 1;
             if (numBlocks > BLOCK_BLOB_MAX_BLOCKS) {
@@ -1896,7 +2109,7 @@ export class BlockBlobClient extends BlobClient {
                     end: count ? offset + count - 1 : Infinity,
                     start: offset,
                 });
-            }, size, Object.assign(Object.assign({}, options), { tracingOptions: Object.assign(Object.assign({}, options.tracingOptions), convertTracingToRequestOptionsBase(updatedOptions)) }));
+            }, size, Object.assign(Object.assign({}, options), { tracingOptions: updatedOptions.tracingOptions }));
         }
         catch (e) {
             span.setStatus({
@@ -1959,7 +2172,7 @@ export class BlockBlobClient extends BlobClient {
             // Outgoing queue shouldn't be empty.
             Math.ceil((maxConcurrency / 4) * 3));
             await scheduler.do();
-            return await this.commitBlockList(blockList, Object.assign(Object.assign({}, options), { tracingOptions: Object.assign(Object.assign({}, options.tracingOptions), convertTracingToRequestOptionsBase(updatedOptions)) }));
+            return assertResponse(await this.commitBlockList(blockList, Object.assign(Object.assign({}, options), { tracingOptions: updatedOptions.tracingOptions })));
         }
         catch (e) {
             span.setStatus({
@@ -2042,7 +2255,7 @@ export class PageBlobClient extends BlobClient {
             throw new Error("Expecting non-empty strings for containerName and blobName parameters");
         }
         super(url, pipeline);
-        this.pageBlobContext = new PageBlob(this.storageClientContext);
+        this.pageBlobContext = this.storageClientContext.pageBlob;
     }
     /**
      * Creates a new PageBlobClient object identical to the source but with the
@@ -2070,7 +2283,22 @@ export class PageBlobClient extends BlobClient {
         const { span, updatedOptions } = createSpan("PageBlobClient-create", options);
         try {
             ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            return await this.pageBlobContext.create(0, size, Object.assign({ abortSignal: options.abortSignal, blobHttpHeaders: options.blobHTTPHeaders, blobSequenceNumber: options.blobSequenceNumber, leaseAccessConditions: options.conditions, metadata: options.metadata, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), cpkInfo: options.customerProvidedKey, encryptionScope: options.encryptionScope, immutabilityPolicyExpiry: (_b = options.immutabilityPolicy) === null || _b === void 0 ? void 0 : _b.expiriesOn, immutabilityPolicyMode: (_c = options.immutabilityPolicy) === null || _c === void 0 ? void 0 : _c.policyMode, legalHold: options.legalHold, tier: toAccessTier(options.tier), blobTagsString: toBlobTagsString(options.tags) }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.pageBlobContext.create(0, size, {
+                abortSignal: options.abortSignal,
+                blobHttpHeaders: options.blobHTTPHeaders,
+                blobSequenceNumber: options.blobSequenceNumber,
+                leaseAccessConditions: options.conditions,
+                metadata: options.metadata,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                cpkInfo: options.customerProvidedKey,
+                encryptionScope: options.encryptionScope,
+                immutabilityPolicyExpiry: (_b = options.immutabilityPolicy) === null || _b === void 0 ? void 0 : _b.expiriesOn,
+                immutabilityPolicyMode: (_c = options.immutabilityPolicy) === null || _c === void 0 ? void 0 : _c.policyMode,
+                legalHold: options.legalHold,
+                tier: toAccessTier(options.tier),
+                blobTagsString: toBlobTagsString(options.tags),
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -2097,7 +2325,7 @@ export class PageBlobClient extends BlobClient {
         const { span, updatedOptions } = createSpan("PageBlobClient-createIfNotExists", options);
         try {
             const conditions = { ifNoneMatch: ETagAny };
-            const res = await this.create(size, Object.assign(Object.assign({}, options), { conditions, tracingOptions: updatedOptions.tracingOptions }));
+            const res = assertResponse(await this.create(size, Object.assign(Object.assign({}, options), { conditions, tracingOptions: updatedOptions.tracingOptions })));
             return Object.assign(Object.assign({ succeeded: true }, res), { _response: res._response });
         }
         catch (e) {
@@ -2134,9 +2362,21 @@ export class PageBlobClient extends BlobClient {
         const { span, updatedOptions } = createSpan("PageBlobClient-uploadPages", options);
         try {
             ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            return await this.pageBlobContext.uploadPages(count, body, Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), requestOptions: {
+            return assertResponse(await this.pageBlobContext.uploadPages(count, body, {
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                requestOptions: {
                     onUploadProgress: options.onProgress,
-                }, range: rangeToString({ offset, count }), sequenceNumberAccessConditions: options.conditions, transactionalContentMD5: options.transactionalContentMD5, transactionalContentCrc64: options.transactionalContentCrc64, cpkInfo: options.customerProvidedKey, encryptionScope: options.encryptionScope }, convertTracingToRequestOptionsBase(updatedOptions)));
+                },
+                range: rangeToString({ offset, count }),
+                sequenceNumberAccessConditions: options.conditions,
+                transactionalContentMD5: options.transactionalContentMD5,
+                transactionalContentCrc64: options.transactionalContentCrc64,
+                cpkInfo: options.customerProvidedKey,
+                encryptionScope: options.encryptionScope,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -2167,12 +2407,24 @@ export class PageBlobClient extends BlobClient {
         const { span, updatedOptions } = createSpan("PageBlobClient-uploadPagesFromURL", options);
         try {
             ensureCpkIfSpecified(options.customerProvidedKey, this.isHttps);
-            return await this.pageBlobContext.uploadPagesFromURL(sourceURL, rangeToString({ offset: sourceOffset, count }), 0, rangeToString({ offset: destOffset, count }), Object.assign({ abortSignal: options.abortSignal, sourceContentMD5: options.sourceContentMD5, sourceContentCrc64: options.sourceContentCrc64, leaseAccessConditions: options.conditions, sequenceNumberAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), sourceModifiedAccessConditions: {
+            return assertResponse(await this.pageBlobContext.uploadPagesFromURL(sourceURL, rangeToString({ offset: sourceOffset, count }), 0, rangeToString({ offset: destOffset, count }), {
+                abortSignal: options.abortSignal,
+                sourceContentMD5: options.sourceContentMD5,
+                sourceContentCrc64: options.sourceContentCrc64,
+                leaseAccessConditions: options.conditions,
+                sequenceNumberAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                sourceModifiedAccessConditions: {
                     sourceIfMatch: options.sourceConditions.ifMatch,
                     sourceIfModifiedSince: options.sourceConditions.ifModifiedSince,
                     sourceIfNoneMatch: options.sourceConditions.ifNoneMatch,
                     sourceIfUnmodifiedSince: options.sourceConditions.ifUnmodifiedSince,
-                }, cpkInfo: options.customerProvidedKey, encryptionScope: options.encryptionScope, copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization) }, convertTracingToRequestOptionsBase(updatedOptions)));
+                },
+                cpkInfo: options.customerProvidedKey,
+                encryptionScope: options.encryptionScope,
+                copySourceAuthorization: httpAuthorizationToString(options.sourceAuthorization),
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -2199,7 +2451,16 @@ export class PageBlobClient extends BlobClient {
         options.conditions = options.conditions || {};
         const { span, updatedOptions } = createSpan("PageBlobClient-clearPages", options);
         try {
-            return await this.pageBlobContext.clearPages(0, Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), range: rangeToString({ offset, count }), sequenceNumberAccessConditions: options.conditions, cpkInfo: options.customerProvidedKey, encryptionScope: options.encryptionScope }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.pageBlobContext.clearPages(0, {
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                range: rangeToString({ offset, count }),
+                sequenceNumberAccessConditions: options.conditions,
+                cpkInfo: options.customerProvidedKey,
+                encryptionScope: options.encryptionScope,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -2226,9 +2487,14 @@ export class PageBlobClient extends BlobClient {
         options.conditions = options.conditions || {};
         const { span, updatedOptions } = createSpan("PageBlobClient-getPageRanges", options);
         try {
-            return await this.pageBlobContext
-                .getPageRanges(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), range: rangeToString({ offset, count }) }, convertTracingToRequestOptionsBase(updatedOptions)))
-                .then(rangeResponseFromModel);
+            const response = assertResponse(await this.pageBlobContext.getPageRanges({
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                range: rangeToString({ offset, count }),
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
+            return rangeResponseFromModel(response);
         }
         catch (e) {
             span.setStatus({
@@ -2257,7 +2523,15 @@ export class PageBlobClient extends BlobClient {
         var _a;
         const { span, updatedOptions } = createSpan("PageBlobClient-getPageRangesSegment", options);
         try {
-            return await this.pageBlobContext.getPageRanges(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), range: rangeToString({ offset, count }), marker: marker, maxPageSize: options.maxPageSize }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.pageBlobContext.getPageRanges({
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                range: rangeToString({ offset, count }),
+                marker: marker,
+                maxPageSize: options.maxPageSize,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -2433,9 +2707,15 @@ export class PageBlobClient extends BlobClient {
         options.conditions = options.conditions || {};
         const { span, updatedOptions } = createSpan("PageBlobClient-getPageRangesDiff", options);
         try {
-            return await this.pageBlobContext
-                .getPageRangesDiff(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), prevsnapshot: prevSnapshot, range: rangeToString({ offset, count }) }, convertTracingToRequestOptionsBase(updatedOptions)))
-                .then(rangeResponseFromModel);
+            const result = assertResponse(await this.pageBlobContext.getPageRangesDiff({
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                prevsnapshot: prevSnapshot,
+                range: rangeToString({ offset, count }),
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
+            return rangeResponseFromModel(result);
         }
         catch (e) {
             span.setStatus({
@@ -2466,10 +2746,19 @@ export class PageBlobClient extends BlobClient {
         var _a;
         const { span, updatedOptions } = createSpan("PageBlobClient-getPageRangesDiffSegment", options);
         try {
-            return await this.pageBlobContext.getPageRangesDiff(Object.assign({ abortSignal: options === null || options === void 0 ? void 0 : options.abortSignal, leaseAccessConditions: options === null || options === void 0 ? void 0 : options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.conditions), { ifTags: (_a = options === null || options === void 0 ? void 0 : options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), prevsnapshot: prevSnapshotOrUrl, range: rangeToString({
+            return assertResponse(await this.pageBlobContext.getPageRangesDiff({
+                abortSignal: options === null || options === void 0 ? void 0 : options.abortSignal,
+                leaseAccessConditions: options === null || options === void 0 ? void 0 : options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.conditions), { ifTags: (_a = options === null || options === void 0 ? void 0 : options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                prevsnapshot: prevSnapshotOrUrl,
+                range: rangeToString({
                     offset: offset,
                     count: count,
-                }), marker: marker, maxPageSize: options === null || options === void 0 ? void 0 : options.maxPageSize }, convertTracingToRequestOptionsBase(updatedOptions)));
+                }),
+                marker: marker,
+                maxPageSize: options === null || options === void 0 ? void 0 : options.maxPageSize,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -2649,9 +2938,15 @@ export class PageBlobClient extends BlobClient {
         options.conditions = options.conditions || {};
         const { span, updatedOptions } = createSpan("PageBlobClient-GetPageRangesDiffForManagedDisks", options);
         try {
-            return await this.pageBlobContext
-                .getPageRangesDiff(Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), prevSnapshotUrl, range: rangeToString({ offset, count }) }, convertTracingToRequestOptionsBase(updatedOptions)))
-                .then(rangeResponseFromModel);
+            const response = assertResponse(await this.pageBlobContext.getPageRangesDiff({
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                prevSnapshotUrl,
+                range: rangeToString({ offset, count }),
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
+            return rangeResponseFromModel(response);
         }
         catch (e) {
             span.setStatus({
@@ -2677,7 +2972,13 @@ export class PageBlobClient extends BlobClient {
         options.conditions = options.conditions || {};
         const { span, updatedOptions } = createSpan("PageBlobClient-resize", options);
         try {
-            return await this.pageBlobContext.resize(size, Object.assign({ abortSignal: options.abortSignal, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }), encryptionScope: options.encryptionScope }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.pageBlobContext.resize(size, {
+                abortSignal: options.abortSignal,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                encryptionScope: options.encryptionScope,
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -2704,7 +3005,13 @@ export class PageBlobClient extends BlobClient {
         options.conditions = options.conditions || {};
         const { span, updatedOptions } = createSpan("PageBlobClient-updateSequenceNumber", options);
         try {
-            return await this.pageBlobContext.updateSequenceNumber(sequenceNumberAction, Object.assign({ abortSignal: options.abortSignal, blobSequenceNumber: sequenceNumber, leaseAccessConditions: options.conditions, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }) }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.pageBlobContext.updateSequenceNumber(sequenceNumberAction, {
+                abortSignal: options.abortSignal,
+                blobSequenceNumber: sequenceNumber,
+                leaseAccessConditions: options.conditions,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({
@@ -2734,7 +3041,11 @@ export class PageBlobClient extends BlobClient {
         var _a;
         const { span, updatedOptions } = createSpan("PageBlobClient-startCopyIncremental", options);
         try {
-            return await this.pageBlobContext.copyIncremental(copySource, Object.assign({ abortSignal: options.abortSignal, modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }) }, convertTracingToRequestOptionsBase(updatedOptions)));
+            return assertResponse(await this.pageBlobContext.copyIncremental(copySource, {
+                abortSignal: options.abortSignal,
+                modifiedAccessConditions: Object.assign(Object.assign({}, options.conditions), { ifTags: (_a = options.conditions) === null || _a === void 0 ? void 0 : _a.tagConditions }),
+                tracingOptions: updatedOptions.tracingOptions,
+            }));
         }
         catch (e) {
             span.setStatus({