@azure/keyvault-keys 4.4.0 → 4.4.1-alpha.20220401.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Release History
 
+## 4.4.1 (Unreleased)
+
+### Features Added
+
+### Breaking Changes
+
+### Bugs Fixed
+
+### Other Changes
+
 ## 4.4.0 (2022-03-24)
 
 ### Features Added

package/dist/index.js

@@ -6,9 +6,9 @@ var tslib = require('tslib');
 var coreHttp = require('@azure/core-http');
 var logger$1 = require('@azure/logger');
 require('@azure/core-paging');
+var coreTracing = require('@azure/core-tracing');
 var url = require('url');
 var coreLro = require('@azure/core-lro');
-var coreTracing = require('@azure/core-tracing');
 var crypto = require('crypto');
 var constants = require('constants');
 
@@ -1344,7 +1344,7 @@ const nextLink = {
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 const packageName = "@azure/keyvault-keys";
-const packageVersion = "4.4.0";
+const packageVersion = "4.4.1";
 class KeyVaultClientContext extends coreHttp__namespace.ServiceClient {
     /**
      * Initializes a new instance of the KeyVaultClientContext class.
@@ -2478,7 +2478,7 @@ const getDeletedKeysNextOperationSpec = {
 
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-const SDK_VERSION = "4.4.0";
+const SDK_VERSION = "4.4.1";
 
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
@@ -2728,45 +2728,11 @@ function parseKeyvaultIdentifier(collection, identifier) {
     };
 }
 
-// Copyright (c) Microsoft Corporation.
-/**
- * Returns a function that can be used for tracing options.
- *
- * @param prefix - The prefix to use, likely the name of the class / client.
- *
- * @example const withTrace = createTraceFunction("Azure.KeyVault.Certificates.CertificateClient")
- *
- * @internal
- */
-function createTraceFunction(prefix) {
-    const createSpan = coreTracing.createSpanFunction({
-        namespace: "Microsoft.KeyVault",
-        packagePrefix: prefix,
-    });
-    return async function (operationName, options, cb) {
-        const { updatedOptions, span } = createSpan(operationName, options);
-        try {
-            // NOTE: we really do need to await on this function here so we can handle any exceptions thrown and properly
-            // close the span.
-            const result = await cb(updatedOptions, span);
-            // otel 0.16+ needs this or else the code ends up being set as UNSET
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.OK,
-            });
-            return result;
-        }
-        catch (err) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: err.message,
-            });
-            throw err;
-        }
-        finally {
-            span.end();
-        }
-    };
-}
+const tracingClient = coreTracing.createTracingClient({
+    namespace: "Microsoft.KeyVault",
+    packageName: "@azure/keyvault-keys",
+    packageVersion: SDK_VERSION,
+});
 
 // Copyright (c) Microsoft Corporation.
 /**
@@ -2971,10 +2937,6 @@ class KeyVaultKeyPollOperation {
 }
 
 // Copyright (c) Microsoft Corporation.
-/**
- * @internal
- */
-const withTrace$4 = createTraceFunction("Azure.KeyVault.Keys.DeleteKeyPoller");
 class DeleteKeyPollOperation extends KeyVaultKeyPollOperation {
     constructor(state, vaultUrl, client, operationOptions = {}) {
         super(state, { cancelMessage: "Canceling the deletion of a key is not supported." });
@@ -2988,7 +2950,7 @@ class DeleteKeyPollOperation extends KeyVaultKeyPollOperation {
      * Since the Key Vault Key won't be immediately deleted, we have {@link beginDeleteKey}.
      */
     deleteKey(name, options = {}) {
-        return withTrace$4("deleteKey", options, async (updatedOptions) => {
+        return tracingClient.withSpan("DeleteKeyPoller.deleteKey", options, async (updatedOptions) => {
             const response = await this.client.deleteKey(this.vaultUrl, name, updatedOptions);
             return getKeyFromKeyBundle(response);
         });
@@ -2998,7 +2960,7 @@ class DeleteKeyPollOperation extends KeyVaultKeyPollOperation {
      * This operation requires the keys/get permission.
      */
     getDeletedKey(name, options = {}) {
-        return withTrace$4("getDeletedKey", options, async (updatedOptions) => {
+        return tracingClient.withSpan("DeleteKeyPoller.getDeletedKey", options, async (updatedOptions) => {
             const response = await this.client.getDeletedKey(this.vaultUrl, name, updatedOptions);
             return getKeyFromKeyBundle(response);
         });
@@ -3059,10 +3021,6 @@ class DeleteKeyPoller extends KeyVaultKeyPoller {
 }
 
 // Copyright (c) Microsoft Corporation.
-/**
- * @internal
- */
-const withTrace$3 = createTraceFunction("Azure.KeyVault.Keys.RecoverDeletedKeyPoller");
 class RecoverDeletedKeyPollOperation extends KeyVaultKeyPollOperation {
     constructor(state, vaultUrl, client, operationOptions = {}) {
         super(state, { cancelMessage: "Canceling the recovery of a deleted key is not supported." });
@@ -3076,7 +3034,7 @@ class RecoverDeletedKeyPollOperation extends KeyVaultKeyPollOperation {
      * This operation requires the keys/get permission.
      */
     getKey(name, options = {}) {
-        return withTrace$3("generatedClient.getKey", options, async (updatedOptions) => {
+        return tracingClient.withSpan("RecoverDeleteKeyPoller.getKey", options, async (updatedOptions) => {
             const response = await this.client.getKey(this.vaultUrl, name, (updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.version) || "", updatedOptions);
             return getKeyFromKeyBundle(response);
         });
@@ -3086,7 +3044,7 @@ class RecoverDeletedKeyPollOperation extends KeyVaultKeyPollOperation {
      * Since the Key Vault Key won't be immediately recover the deleted key, we have {@link beginRecoverDeletedKey}.
      */
     async recoverDeletedKey(name, options = {}) {
-        return withTrace$3("generatedClient.recoverDeleteKey", options, async (updatedOptions) => {
+        return tracingClient.withSpan("RecoverDeletedKeyPoller.recoverDeleteKey", options, async (updatedOptions) => {
             const response = await this.client.recoverDeletedKey(this.vaultUrl, name, updatedOptions);
             return getKeyFromKeyBundle(response);
         });
@@ -3240,7 +3198,6 @@ function randomBytes(length) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const withTrace$2 = createTraceFunction("Azure.KeyVault.Keys.RemoteCryptographyProvider");
 /**
  * The remote cryptography provider is used to run crypto operations against KeyVault.
  * @internal
@@ -3281,7 +3238,7 @@ class RemoteCryptographyProvider {
     encrypt(encryptParameters, options = {}) {
         const { algorithm, plaintext } = encryptParameters, params = tslib.__rest(encryptParameters, ["algorithm", "plaintext"]);
         const requestOptions = Object.assign(Object.assign({}, options), params);
-        return withTrace$2("encrypt", requestOptions, async (updatedOptions) => {
+        return tracingClient.withSpan("RemoteCryptographyProvider.encrypt", requestOptions, async (updatedOptions) => {
             const result = await this.client.encrypt(this.vaultUrl, this.name, this.version, algorithm, plaintext, updatedOptions);
             return {
                 algorithm: encryptParameters.algorithm,
@@ -3296,7 +3253,7 @@ class RemoteCryptographyProvider {
     decrypt(decryptParameters, options = {}) {
         const { algorithm, ciphertext } = decryptParameters, params = tslib.__rest(decryptParameters, ["algorithm", "ciphertext"]);
         const requestOptions = Object.assign(Object.assign({}, options), params);
-        return withTrace$2("decrypt", requestOptions, async (updatedOptions) => {
+        return tracingClient.withSpan("RemoteCryptographyProvider.decrypt", requestOptions, async (updatedOptions) => {
             const result = await this.client.decrypt(this.vaultUrl, this.name, this.version, algorithm, ciphertext, updatedOptions);
             return {
                 result: result.result,
@@ -3306,7 +3263,7 @@ class RemoteCryptographyProvider {
         });
     }
     wrapKey(algorithm, keyToWrap, options = {}) {
-        return withTrace$2("wrapKey", options, async (updatedOptions) => {
+        return tracingClient.withSpan("RemoteCryptographyProvider.wrapKey", options, async (updatedOptions) => {
             const result = await this.client.wrapKey(this.vaultUrl, this.name, this.version, algorithm, keyToWrap, updatedOptions);
             return {
                 result: result.result,
@@ -3316,7 +3273,7 @@ class RemoteCryptographyProvider {
         });
     }
     unwrapKey(algorithm, encryptedKey, options = {}) {
-        return withTrace$2("unwrapKey", options, async (updatedOptions) => {
+        return tracingClient.withSpan("RemoteCryptographyProvider.unwrapKey", options, async (updatedOptions) => {
             const result = await this.client.unwrapKey(this.vaultUrl, this.name, this.version, algorithm, encryptedKey, updatedOptions);
             return {
                 result: result.result,
@@ -3326,19 +3283,19 @@ class RemoteCryptographyProvider {
         });
     }
     sign(algorithm, digest, options = {}) {
-        return withTrace$2("sign", options, async (updatedOptions) => {
+        return tracingClient.withSpan("RemoteCryptographyProvider.sign", options, async (updatedOptions) => {
             const result = await this.client.sign(this.vaultUrl, this.name, this.version, algorithm, digest, updatedOptions);
             return { result: result.result, algorithm, keyID: this.getKeyID() };
         });
     }
     verifyData(algorithm, data, signature, options = {}) {
-        return withTrace$2("verifyData", options, async (updatedOptions) => {
+        return tracingClient.withSpan("RemoteCryptographyProvider.verifyData", options, async (updatedOptions) => {
             const hash = await createHash(algorithm, data);
             return this.verify(algorithm, hash, signature, updatedOptions);
         });
     }
     verify(algorithm, digest, signature, options = {}) {
-        return withTrace$2("verify", options, async (updatedOptions) => {
+        return tracingClient.withSpan("RemoteCryptographyProvider.verify", options, async (updatedOptions) => {
             const response = await this.client.verify(this.vaultUrl, this.name, this.version, algorithm, digest, signature, updatedOptions);
             return {
                 result: response.value ? response.value : false,
@@ -3347,7 +3304,7 @@ class RemoteCryptographyProvider {
         });
     }
     signData(algorithm, data, options = {}) {
-        return withTrace$2("signData", options, async (updatedOptions) => {
+        return tracingClient.withSpan("RemoteCryptographyProvider.signData", options, async (updatedOptions) => {
             const digest = await createHash(algorithm, data);
             const result = await this.client.sign(this.vaultUrl, this.name, this.version, algorithm, digest, updatedOptions);
             return { result: result.result, algorithm, keyID: this.getKeyID() };
@@ -3365,7 +3322,7 @@ class RemoteCryptographyProvider {
      * @param options - Additional options.
      */
     getKey(options = {}) {
-        return withTrace$2("getKey", options, async (updatedOptions) => {
+        return tracingClient.withSpan("RemoteCryptographyProvider.getKey", options, async (updatedOptions) => {
             if (typeof this.key === "string") {
                 if (!this.name || this.name === "") {
                     throw new Error("getKey requires a key with a name");
@@ -3728,7 +3685,6 @@ class AesCryptographyProvider {
 }
 
 // Copyright (c) Microsoft Corporation.
-const withTrace$1 = createTraceFunction("Azure.KeyVault.Keys.CryptographyClient");
 /**
  * A client used to perform cryptographic operations on an Azure Key vault key
  * or a local {@link JsonWebKey}.
@@ -3787,7 +3743,7 @@ class CryptographyClient {
     }
     encrypt(...args) {
         const [parameters, options] = this.disambiguateEncryptArguments(args);
-        return withTrace$1("encrypt", options, async (updatedOptions) => {
+        return tracingClient.withSpan("CryptographyClient.encrypt", options, async (updatedOptions) => {
             this.ensureValid(await this.fetchKey(updatedOptions), exports.KnownKeyOperations.Encrypt);
             this.initializeIV(parameters);
             const provider = await this.getProvider("encrypt", parameters.algorithm, updatedOptions);
@@ -3846,7 +3802,7 @@ class CryptographyClient {
     }
     decrypt(...args) {
         const [parameters, options] = this.disambiguateDecryptArguments(args);
-        return withTrace$1("decrypt", options, async (updatedOptions) => {
+        return tracingClient.withSpan("CryptographyClient.decrypt", options, async (updatedOptions) => {
             this.ensureValid(await this.fetchKey(updatedOptions), exports.KnownKeyOperations.Decrypt);
             const provider = await this.getProvider("decrypt", parameters.algorithm, updatedOptions);
             try {
@@ -3893,7 +3849,7 @@ class CryptographyClient {
      * @param options - Additional options.
      */
     wrapKey(algorithm, key, options = {}) {
-        return withTrace$1("wrapKey", options, async (updatedOptions) => {
+        return tracingClient.withSpan("CryptographyClient.wrapKey", options, async (updatedOptions) => {
             this.ensureValid(await this.fetchKey(updatedOptions), exports.KnownKeyOperations.WrapKey);
             const provider = await this.getProvider("wrapKey", algorithm, updatedOptions);
             try {
@@ -3920,7 +3876,7 @@ class CryptographyClient {
      * @param options - Additional options.
      */
     unwrapKey(algorithm, encryptedKey, options = {}) {
-        return withTrace$1("unwrapKey", options, async (updatedOptions) => {
+        return tracingClient.withSpan("CryptographyClient.unwrapKey", options, async (updatedOptions) => {
             this.ensureValid(await this.fetchKey(updatedOptions), exports.KnownKeyOperations.UnwrapKey);
             const provider = await this.getProvider("unwrapKey", algorithm, updatedOptions);
             try {
@@ -3947,7 +3903,7 @@ class CryptographyClient {
      * @param options - Additional options.
      */
     sign(algorithm, digest, options = {}) {
-        return withTrace$1("sign", options, async (updatedOptions) => {
+        return tracingClient.withSpan("CryptographyClient.sign", options, async (updatedOptions) => {
             this.ensureValid(await this.fetchKey(updatedOptions), exports.KnownKeyOperations.Sign);
             const provider = await this.getProvider("sign", algorithm, updatedOptions);
             try {
@@ -3975,7 +3931,7 @@ class CryptographyClient {
      * @param options - Additional options.
      */
     verify(algorithm, digest, signature, options = {}) {
-        return withTrace$1("verify", options, async (updatedOptions) => {
+        return tracingClient.withSpan("CryptographyClient.verify", options, async (updatedOptions) => {
             this.ensureValid(await this.fetchKey(updatedOptions), exports.KnownKeyOperations.Verify);
             const provider = await this.getProvider("verify", algorithm, updatedOptions);
             try {
@@ -4002,7 +3958,7 @@ class CryptographyClient {
      * @param options - Additional options.
      */
     signData(algorithm, data, options = {}) {
-        return withTrace$1("signData", options, async (updatedOptions) => {
+        return tracingClient.withSpan("CryptographyClient.signData", options, async (updatedOptions) => {
             this.ensureValid(await this.fetchKey(updatedOptions), exports.KnownKeyOperations.Sign);
             const provider = await this.getProvider("signData", algorithm, updatedOptions);
             try {
@@ -4030,7 +3986,7 @@ class CryptographyClient {
      * @param options - Additional options.
      */
     verifyData(algorithm, data, signature, options = {}) {
-        return withTrace$1("verifyData", options, async (updatedOptions) => {
+        return tracingClient.withSpan("CryptographyClient.verifyData", options, async (updatedOptions) => {
             this.ensureValid(await this.fetchKey(updatedOptions), exports.KnownKeyOperations.Verify);
             const provider = await this.getProvider("verifyData", algorithm, updatedOptions);
             try {
@@ -4169,7 +4125,6 @@ exports.KnownEncryptionAlgorithms = void 0;
 })(exports.KnownEncryptionAlgorithms || (exports.KnownEncryptionAlgorithms = {}));
 
 // Copyright (c) Microsoft Corporation.
-const withTrace = createTraceFunction("Azure.KeyVault.Keys.KeyClient");
 /**
  * The KeyClient provides methods to manage {@link KeyVaultKey} in the
  * Azure Key Vault. The client supports creating, retrieving, updating,
@@ -4245,7 +4200,7 @@ class KeyClient {
                     exportable,
                 } });
         }
-        return withTrace("createKey", unflattenedOptions, async (updatedOptions) => {
+        return tracingClient.withSpan("KeyClient.createKey", unflattenedOptions, async (updatedOptions) => {
             const response = await this.client.createKey(this.vaultUrl, name, keyType, updatedOptions);
             return getKeyFromKeyBundle(response);
         });
@@ -4333,7 +4288,7 @@ class KeyClient {
                     exportable,
                 } });
         }
-        return withTrace(`importKey`, unflattenedOptions, async (updatedOptions) => {
+        return tracingClient.withSpan(`KeyClient.importKey`, unflattenedOptions, async (updatedOptions) => {
             const response = await this.client.importKey(this.vaultUrl, name, key, updatedOptions);
             return getKeyFromKeyBundle(response);
         });
@@ -4405,7 +4360,7 @@ class KeyClient {
     }
     updateKeyProperties(...args) {
         const [name, keyVersion, options] = this.disambiguateUpdateKeyPropertiesArgs(args);
-        return withTrace(`updateKeyProperties`, options, async (updatedOptions) => {
+        return tracingClient.withSpan(`KeyClient.updateKeyProperties`, options, async (updatedOptions) => {
             const { enabled, notBefore, expiresOn: expires } = updatedOptions, remainingOptions = tslib.__rest(updatedOptions, ["enabled", "notBefore", "expiresOn"]);
             const unflattenedOptions = Object.assign(Object.assign({}, remainingOptions), { keyAttributes: {
                     enabled,
@@ -4446,7 +4401,7 @@ class KeyClient {
      * @param options - The optional parameters.
      */
     getKey(name, options = {}) {
-        return withTrace(`getKey`, options, async (updatedOptions) => {
+        return tracingClient.withSpan(`KeyClient.getKey`, options, async (updatedOptions) => {
             const response = await this.client.getKey(this.vaultUrl, name, options && options.version ? options.version : "", updatedOptions);
             return getKeyFromKeyBundle(response);
         });
@@ -4465,7 +4420,7 @@ class KeyClient {
      * @param options - The optional parameters.
      */
     getDeletedKey(name, options = {}) {
-        return withTrace(`getDeletedKey`, options, async (updatedOptions) => {
+        return tracingClient.withSpan(`KeyClient.getDeletedKey`, options, async (updatedOptions) => {
             const response = await this.client.getDeletedKey(this.vaultUrl, name, updatedOptions);
             return getKeyFromKeyBundle(response);
         });
@@ -4487,7 +4442,7 @@ class KeyClient {
      * @param options - The optional parameters.
      */
     purgeDeletedKey(name, options = {}) {
-        return withTrace(`purgeDeletedKey`, options, async (updatedOptions) => {
+        return tracingClient.withSpan(`KeyClient.purgeDeletedKey`, options, async (updatedOptions) => {
             await this.client.purgeDeletedKey(this.vaultUrl, name, updatedOptions);
         });
     }
@@ -4547,7 +4502,7 @@ class KeyClient {
      * @param options - The optional parameters.
      */
     backupKey(name, options = {}) {
-        return withTrace(`backupKey`, options, async (updatedOptions) => {
+        return tracingClient.withSpan(`KeyClient.backupKey`, options, async (updatedOptions) => {
             const response = await this.client.backupKey(this.vaultUrl, name, updatedOptions);
             return response.value;
         });
@@ -4568,7 +4523,7 @@ class KeyClient {
      * @param options - The optional parameters.
      */
     async restoreKeyBackup(backup, options = {}) {
-        return withTrace(`restoreKeyBackup`, options, async (updatedOptions) => {
+        return tracingClient.withSpan(`KeyClient.restoreKeyBackup`, options, async (updatedOptions) => {
             const response = await this.client.restoreKey(this.vaultUrl, backup, updatedOptions);
             return getKeyFromKeyBundle(response);
         });
@@ -4586,7 +4541,7 @@ class KeyClient {
      * @param options - The optional parameters.
      */
     getRandomBytes(count, options = {}) {
-        return withTrace("getRandomBytes", options, async (updatedOptions) => {
+        return tracingClient.withSpan("KeyClient.getRandomBytes", options, async (updatedOptions) => {
             const response = await this.client.getRandomBytes(this.vaultUrl, count, updatedOptions);
             return response.value;
         });
@@ -4604,7 +4559,7 @@ class KeyClient {
      * @param options - The optional parameters.
      */
     rotateKey(name, options = {}) {
-        return withTrace("rotateKey", options, async (updatedOptions) => {
+        return tracingClient.withSpan("KeyClient.rotateKey", options, async (updatedOptions) => {
             const key = await this.client.rotateKey(this.vaultUrl, name, updatedOptions);
             return getKeyFromKeyBundle(key);
         });
@@ -4625,7 +4580,7 @@ class KeyClient {
      * @param options - The optional parameters.
      */
     releaseKey(name, targetAttestationToken, options = {}) {
-        return withTrace("releaseKey", options, async (updatedOptions) => {
+        return tracingClient.withSpan("KeyClient.releaseKey", options, async (updatedOptions) => {
             const { nonce, algorithm } = updatedOptions, rest = tslib.__rest(updatedOptions, ["nonce", "algorithm"]);
             const result = await this.client.release(this.vaultUrl, name, (options === null || options === void 0 ? void 0 : options.version) || "", targetAttestationToken, Object.assign({ enc: algorithm, nonce }, rest));
             return { value: result.value };
@@ -4646,7 +4601,7 @@ class KeyClient {
      * @param options - The optional parameters.
      */
     getKeyRotationPolicy(keyName, options = {}) {
-        return withTrace("getKeyRotationPolicy", options, async () => {
+        return tracingClient.withSpan("KeyClient.getKeyRotationPolicy", options, async () => {
             const policy = await this.client.getKeyRotationPolicy(this.vaultUrl, keyName);
             return keyRotationTransformations.generatedToPublic(policy);
         });
@@ -4666,7 +4621,7 @@ class KeyClient {
      * @param options - The optional parameters.
      */
     updateKeyRotationPolicy(keyName, policy, options = {}) {
-        return withTrace("updateKeyRotationPolicy", options, async (updatedOptions) => {
+        return tracingClient.withSpan("KeyClient.updateKeyRotationPolicy", options, async (updatedOptions) => {
             const result = await this.client.updateKeyRotationPolicy(this.vaultUrl, keyName, keyRotationTransformations.propertiesToGenerated(policy), updatedOptions);
             return keyRotationTransformations.generatedToPublic(result);
         });
@@ -4681,14 +4636,14 @@ class KeyClient {
         return tslib.__asyncGenerator(this, arguments, function* listPropertiesOfKeyVersionsPage_1() {
             if (continuationState.continuationToken == null) {
                 const optionsComplete = Object.assign({ maxresults: continuationState.maxPageSize }, options);
-                const currentSetResponse = yield tslib.__await(withTrace("listPropertiesOfKeyVersionsPage", optionsComplete, async (updatedOptions) => this.client.getKeyVersions(this.vaultUrl, name, updatedOptions)));
+                const currentSetResponse = yield tslib.__await(tracingClient.withSpan("KeyClient.listPropertiesOfKeyVersionsPage", optionsComplete, async (updatedOptions) => this.client.getKeyVersions(this.vaultUrl, name, updatedOptions)));
                 continuationState.continuationToken = currentSetResponse.nextLink;
                 if (currentSetResponse.value) {
                     yield yield tslib.__await(currentSetResponse.value.map(getKeyPropertiesFromKeyItem, this));
                 }
             }
             while (continuationState.continuationToken) {
-                const currentSetResponse = yield tslib.__await(withTrace("listPropertiesOfKeyVersionsPage", options || {}, async (updatedOptions) => this.client.getKeyVersions(continuationState.continuationToken, name, updatedOptions)));
+                const currentSetResponse = yield tslib.__await(tracingClient.withSpan("KeyClient.listPropertiesOfKeyVersionsPage", options || {}, async (updatedOptions) => this.client.getKeyVersions(continuationState.continuationToken, name, updatedOptions)));
                 continuationState.continuationToken = currentSetResponse.nextLink;
                 if (currentSetResponse.value) {
                     yield yield tslib.__await(currentSetResponse.value.map(getKeyPropertiesFromKeyItem, this));
@@ -4761,14 +4716,14 @@ class KeyClient {
         return tslib.__asyncGenerator(this, arguments, function* listPropertiesOfKeysPage_1() {
             if (continuationState.continuationToken == null) {
                 const optionsComplete = Object.assign({ maxresults: continuationState.maxPageSize }, options);
-                const currentSetResponse = yield tslib.__await(withTrace("listPropertiesOfKeysPage", optionsComplete, async (updatedOptions) => this.client.getKeys(this.vaultUrl, updatedOptions)));
+                const currentSetResponse = yield tslib.__await(tracingClient.withSpan("KeyClient.listPropertiesOfKeysPage", optionsComplete, async (updatedOptions) => this.client.getKeys(this.vaultUrl, updatedOptions)));
                 continuationState.continuationToken = currentSetResponse.nextLink;
                 if (currentSetResponse.value) {
                     yield yield tslib.__await(currentSetResponse.value.map(getKeyPropertiesFromKeyItem, this));
                 }
             }
             while (continuationState.continuationToken) {
-                const currentSetResponse = yield tslib.__await(withTrace("KeysClient.listPropertiesOfKeysPage", options || {}, async (updatedOptions) => this.client.getKeys(continuationState.continuationToken, updatedOptions)));
+                const currentSetResponse = yield tslib.__await(tracingClient.withSpan("KeyClient.listPropertiesOfKeysPage", options || {}, async (updatedOptions) => this.client.getKeys(continuationState.continuationToken, updatedOptions)));
                 continuationState.continuationToken = currentSetResponse.nextLink;
                 if (currentSetResponse.value) {
                     yield yield tslib.__await(currentSetResponse.value.map(getKeyPropertiesFromKeyItem, this));
@@ -4840,14 +4795,14 @@ class KeyClient {
         return tslib.__asyncGenerator(this, arguments, function* listDeletedKeysPage_1() {
             if (continuationState.continuationToken == null) {
                 const optionsComplete = Object.assign({ maxresults: continuationState.maxPageSize }, options);
-                const currentSetResponse = yield tslib.__await(withTrace("listDeletedKeysPage", optionsComplete, async (updatedOptions) => this.client.getDeletedKeys(this.vaultUrl, updatedOptions)));
+                const currentSetResponse = yield tslib.__await(tracingClient.withSpan("KeyClient.listDeletedKeysPage", optionsComplete, async (updatedOptions) => this.client.getDeletedKeys(this.vaultUrl, updatedOptions)));
                 continuationState.continuationToken = currentSetResponse.nextLink;
                 if (currentSetResponse.value) {
                     yield yield tslib.__await(currentSetResponse.value.map(getDeletedKeyFromDeletedKeyItem, this));
                 }
             }
             while (continuationState.continuationToken) {
-                const currentSetResponse = yield tslib.__await(withTrace("listDeletedKeysPage", options || {}, async (updatedOptions) => this.client.getDeletedKeys(continuationState.continuationToken, updatedOptions)));
+                const currentSetResponse = yield tslib.__await(tracingClient.withSpan("KeyClient.listDeletedKeysPage", options || {}, async (updatedOptions) => this.client.getDeletedKeys(continuationState.continuationToken, updatedOptions)));
                 continuationState.continuationToken = currentSetResponse.nextLink;
                 if (currentSetResponse.value) {
                     yield yield tslib.__await(currentSetResponse.value.map(getDeletedKeyFromDeletedKeyItem, this));