@azure/identity 2.1.0-alpha.20220404.1 → 2.1.0-alpha.20220412.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Release History
 
+## 2.1.0-beta.3 (Unknown)
+
+### Features Added
+
+### Breaking Changes
+
+### Bugs Fixed
+
+### Other Changes
+
+- Upgraded to `@azure/core-tracing` version `^1.0.0`.
+
 ## 2.1.0-beta.2 (2022-03-22)
 
 ### Features Added

package/dist/index.js

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var msalNode = require('@azure/msal-node');
-var coreTracing = require('@azure/core-tracing');
 var coreClient = require('@azure/core-client');
 var coreUtil = require('@azure/core-util');
 var coreRestPipeline = require('@azure/core-rest-pipeline');
 var abortController = require('@azure/abort-controller');
+var coreTracing = require('@azure/core-tracing');
 var logger$l = require('@azure/logger');
 var msalCommon = require('@azure/msal-common');
 var uuid = require('uuid');
@@ -186,6 +186,10 @@ function getIdentityTokenEndpointSuffix(tenantId) {
 
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
+/**
+ * Current version of the `@azure/identity` package.
+ */
+const SDK_VERSION = `2.1.0-beta.3`;
 /**
  * The default client ID for authentication
  * @internal
@@ -231,43 +235,11 @@ const DefaultAuthorityHost = exports.AzureAuthorityHosts.AzurePublicCloud;
  * Creates a span using the global tracer.
  * @internal
  */
-const createSpan = coreTracing.createSpanFunction({
-    packagePrefix: "",
+const tracingClient = coreTracing.createTracingClient({
     namespace: "Microsoft.AAD",
+    packageName: "@azure/identity",
+    packageVersion: SDK_VERSION,
 });
-/**
- * From: https://github.com/Azure/azure-sdk-for-js/blob/46139daa3317a0d12e8b55b02b9d9cdf1b2e762a/sdk/appconfiguration/app-configuration/src/internal/tracingHelpers.ts
- * Traces an operation and properly handles reporting start, end and errors for a given span
- *
- * @param operationName - Name of a method in the TClient type
- * @param options - An options class, typically derived from \@azure/core-rest-pipeline/RequestOptionsBase
- * @param fn - The function to call with an options class that properly propagates the span context
- *
- * @internal
- */
-async function trace(operationName, options, fn, createSpanFn = createSpan) {
-    const { updatedOptions, span } = createSpanFn(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 fn(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();
-    }
-}
 
 // Copyright (c) Microsoft Corporation.
 /**
@@ -368,7 +340,7 @@ function getIdentityClientAuthorityHost(options) {
 class IdentityClient extends coreClient.ServiceClient {
     constructor(options) {
         var _a, _b;
-        const packageDetails = `azsdk-js-identity/2.1.0-beta.2`;
+        const packageDetails = `azsdk-js-identity/${SDK_VERSION}`;
         const userAgentPrefix = ((_a = options === null || options === void 0 ? void 0 : options.userAgentOptions) === null || _a === void 0 ? void 0 : _a.userAgentPrefix)
             ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
             : `${packageDetails}`;
@@ -415,12 +387,11 @@ class IdentityClient extends coreClient.ServiceClient {
             throw error;
         }
     }
-    async refreshAccessToken(tenantId, clientId, scopes, refreshToken, clientSecret, expiresOnParser, options) {
+    async refreshAccessToken(tenantId, clientId, scopes, refreshToken, clientSecret, expiresOnParser, options = {}) {
         if (refreshToken === undefined) {
             return null;
         }
         logger$k.info(`IdentityClient: refreshing access token with client ID: ${clientId}, scopes: ${scopes} started`);
-        const { span, updatedOptions } = createSpan("IdentityClient-refreshAccessToken", options);
         const refreshParams = {
             grant_type: "refresh_token",
             client_id: clientId,
@@ -431,48 +402,39 @@ class IdentityClient extends coreClient.ServiceClient {
             refreshParams.client_secret = clientSecret;
         }
         const query = new URLSearchParams(refreshParams);
-        try {
-            const urlSuffix = getIdentityTokenEndpointSuffix(tenantId);
-            const request = coreRestPipeline.createPipelineRequest({
-                url: `${this.authorityHost}/${tenantId}/${urlSuffix}`,
-                method: "POST",
-                body: query.toString(),
-                abortSignal: options && options.abortSignal,
-                headers: coreRestPipeline.createHttpHeaders({
-                    Accept: "application/json",
-                    "Content-Type": "application/x-www-form-urlencoded",
-                }),
-                tracingOptions: updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.tracingOptions,
-            });
-            const response = await this.sendTokenRequest(request, expiresOnParser);
-            logger$k.info(`IdentityClient: refreshed token for client ID: ${clientId}`);
-            return response;
-        }
-        catch (err) {
-            if (err.name === AuthenticationErrorName &&
-                err.errorResponse.error === "interaction_required") {
-                // It's likely that the refresh token has expired, so
-                // return null so that the credential implementation will
-                // initiate the authentication flow again.
-                logger$k.info(`IdentityClient: interaction required for client ID: ${clientId}`);
-                span.setStatus({
-                    code: coreTracing.SpanStatusCode.ERROR,
-                    message: err.message,
+        return tracingClient.withSpan("IdentityClient.refreshAccessToken", options, async (updatedOptions) => {
+            try {
+                const urlSuffix = getIdentityTokenEndpointSuffix(tenantId);
+                const request = coreRestPipeline.createPipelineRequest({
+                    url: `${this.authorityHost}/${tenantId}/${urlSuffix}`,
+                    method: "POST",
+                    body: query.toString(),
+                    abortSignal: options.abortSignal,
+                    headers: coreRestPipeline.createHttpHeaders({
+                        Accept: "application/json",
+                        "Content-Type": "application/x-www-form-urlencoded",
+                    }),
+                    tracingOptions: updatedOptions.tracingOptions,
                 });
-                return null;
+                const response = await this.sendTokenRequest(request, expiresOnParser);
+                logger$k.info(`IdentityClient: refreshed token for client ID: ${clientId}`);
+                return response;
             }
-            else {
-                logger$k.warning(`IdentityClient: failed refreshing token for client ID: ${clientId}: ${err}`);
-                span.setStatus({
-                    code: coreTracing.SpanStatusCode.ERROR,
-                    message: err.message,
-                });
-                throw err;
+            catch (err) {
+                if (err.name === AuthenticationErrorName &&
+                    err.errorResponse.error === "interaction_required") {
+                    // It's likely that the refresh token has expired, so
+                    // return null so that the credential implementation will
+                    // initiate the authentication flow again.
+                    logger$k.info(`IdentityClient: interaction required for client ID: ${clientId}`);
+                    return null;
+                }
+                else {
+                    logger$k.warning(`IdentityClient: failed refreshing token for client ID: ${clientId}: ${err}`);
+                    throw err;
+                }
             }
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     // Here is a custom layer that allows us to abort requests that go through MSAL,
     // since MSAL doesn't allow us to pass options all the way through.
@@ -1438,42 +1400,38 @@ class ChainedTokenCredential {
      * @param options - The options used to configure any requests this
      *                `TokenCredential` implementation might make.
      */
-    async getToken(scopes, options) {
+    async getToken(scopes, options = {}) {
         let token = null;
         let successfulCredentialName = "";
         const errors = [];
-        const { span, updatedOptions } = createSpan("ChainedTokenCredential.getToken", options);
-        for (let i = 0; i < this._sources.length && token === null; i++) {
-            try {
-                token = await this._sources[i].getToken(scopes, updatedOptions);
-                successfulCredentialName = this._sources[i].constructor.name;
-            }
-            catch (err) {
-                if (err.name === "CredentialUnavailableError" ||
-                    err.name === "AuthenticationRequiredError") {
-                    errors.push(err);
+        return tracingClient.withSpan("ChainedTokenCredential.getToken", options, async (updatedOptions) => {
+            for (let i = 0; i < this._sources.length && token === null; i++) {
+                try {
+                    token = await this._sources[i].getToken(scopes, updatedOptions);
+                    successfulCredentialName = this._sources[i].constructor.name;
                 }
-                else {
-                    logger$i.getToken.info(formatError(scopes, err));
-                    throw err;
+                catch (err) {
+                    if (err.name === "CredentialUnavailableError" ||
+                        err.name === "AuthenticationRequiredError") {
+                        errors.push(err);
+                    }
+                    else {
+                        logger$i.getToken.info(formatError(scopes, err));
+                        throw err;
+                    }
                 }
             }
-        }
-        if (!token && errors.length > 0) {
-            const err = new AggregateAuthenticationError(errors, "ChainedTokenCredential authentication failed.");
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: err.message,
-            });
-            logger$i.getToken.info(formatError(scopes, err));
-            throw err;
-        }
-        span.end();
-        logger$i.getToken.info(`Result for ${successfulCredentialName}: ${formatSuccess(scopes)}`);
-        if (token === null) {
-            throw new CredentialUnavailableError("Failed to retrieve a valid token");
-        }
-        return token;
+            if (!token && errors.length > 0) {
+                const err = new AggregateAuthenticationError(errors, "ChainedTokenCredential authentication failed.");
+                logger$i.getToken.info(formatError(scopes, err));
+                throw err;
+            }
+            logger$i.getToken.info(`Result for ${successfulCredentialName}: ${formatSuccess(scopes)}`);
+            if (token === null) {
+                throw new CredentialUnavailableError("Failed to retrieve a valid token");
+            }
+            return token;
+        });
     }
 }
 
@@ -1574,7 +1532,7 @@ class AzureCliCredential {
      * @param options - The options used to configure any requests this
      *                TokenCredential implementation might make.
      */
-    async getToken(scopes, options) {
+    async getToken(scopes, options = {}) {
         const tenantId = processMultiTenantRequest(this.tenantId, options);
         if (tenantId) {
             checkTenantId(logger$h, tenantId);
@@ -1584,46 +1542,43 @@ class AzureCliCredential {
         ensureValidScope(scope, logger$h);
         const resource = getScopeResource(scope);
         let responseData = "";
-        const { span } = createSpan(`${this.constructor.name}.getToken`, options);
-        try {
-            const obj = await cliCredentialInternals.getAzureCliAccessToken(resource, tenantId);
-            if (obj.stderr) {
-                const isLoginError = obj.stderr.match("(.*)az login(.*)");
-                const isNotInstallError = obj.stderr.match("az:(.*)not found") || obj.stderr.startsWith("'az' is not recognized");
-                if (isNotInstallError) {
-                    const error = new CredentialUnavailableError("Azure CLI could not be found.  Please visit https://aka.ms/azure-cli for installation instructions and then, once installed, authenticate to your Azure account using 'az login'.");
+        return tracingClient.withSpan(`${this.constructor.name}.getToken`, options, async () => {
+            try {
+                const obj = await cliCredentialInternals.getAzureCliAccessToken(resource, tenantId);
+                if (obj.stderr) {
+                    const isLoginError = obj.stderr.match("(.*)az login(.*)");
+                    const isNotInstallError = obj.stderr.match("az:(.*)not found") || obj.stderr.startsWith("'az' is not recognized");
+                    if (isNotInstallError) {
+                        const error = new CredentialUnavailableError("Azure CLI could not be found.  Please visit https://aka.ms/azure-cli for installation instructions and then, once installed, authenticate to your Azure account using 'az login'.");
+                        logger$h.getToken.info(formatError(scopes, error));
+                        throw error;
+                    }
+                    else if (isLoginError) {
+                        const error = new CredentialUnavailableError("Please run 'az login' from a command prompt to authenticate before using this credential.");
+                        logger$h.getToken.info(formatError(scopes, error));
+                        throw error;
+                    }
+                    const error = new CredentialUnavailableError(obj.stderr);
                     logger$h.getToken.info(formatError(scopes, error));
                     throw error;
                 }
-                else if (isLoginError) {
-                    const error = new CredentialUnavailableError("Please run 'az login' from a command prompt to authenticate before using this credential.");
-                    logger$h.getToken.info(formatError(scopes, error));
-                    throw error;
+                else {
+                    responseData = obj.stdout;
+                    const response = JSON.parse(responseData);
+                    logger$h.getToken.info(formatSuccess(scopes));
+                    const returnValue = {
+                        token: response.accessToken,
+                        expiresOnTimestamp: new Date(response.expiresOn).getTime(),
+                    };
+                    return returnValue;
                 }
-                const error = new CredentialUnavailableError(obj.stderr);
+            }
+            catch (err) {
+                const error = new Error(err.message || "Unknown error while trying to retrieve the access token");
                 logger$h.getToken.info(formatError(scopes, error));
                 throw error;
             }
-            else {
-                responseData = obj.stdout;
-                const response = JSON.parse(responseData);
-                logger$h.getToken.info(formatSuccess(scopes));
-                const returnValue = {
-                    token: response.accessToken,
-                    expiresOnTimestamp: new Date(response.expiresOn).getTime(),
-                };
-                return returnValue;
-            }
-        }
-        catch (err) {
-            const error = new Error(err.message || "Unknown error while trying to retrieve the access token");
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: error.message,
-            });
-            logger$h.getToken.info(formatError(scopes, error));
-            throw error;
-        }
+        });
     }
 }
 
@@ -1786,7 +1741,7 @@ class AzurePowerShellCredential {
      * @param options - The options used to configure any requests this TokenCredential implementation might make.
      */
     async getToken(scopes, options = {}) {
-        return trace(`${this.constructor.name}.getToken`, options, async () => {
+        return tracingClient.withSpan(`${this.constructor.name}.getToken`, options, async () => {
             const tenantId = processMultiTenantRequest(this.tenantId, options);
             if (tenantId) {
                 checkTenantId(logger$g, tenantId);
@@ -1891,7 +1846,7 @@ class ClientSecretCredential {
      *                TokenCredential implementation might make.
      */
     async getToken(scopes, options = {}) {
-        return trace(`${this.constructor.name}.getToken`, options, async (newOptions) => {
+        return tracingClient.withSpan(`${this.constructor.name}.getToken`, options, async (newOptions) => {
             const arrayScopes = Array.isArray(scopes) ? scopes : [scopes];
             return this.msalFlow.getToken(arrayScopes, newOptions);
         });
@@ -2029,7 +1984,7 @@ class ClientCertificateCredential {
      *                TokenCredential implementation might make.
      */
     async getToken(scopes, options = {}) {
-        return trace(`${credentialName$2}.getToken`, options, async (newOptions) => {
+        return tracingClient.withSpan(`${credentialName$2}.getToken`, options, async (newOptions) => {
             const arrayScopes = Array.isArray(scopes) ? scopes : [scopes];
             return this.msalFlow.getToken(arrayScopes, newOptions);
         });
@@ -2109,7 +2064,7 @@ class UsernamePasswordCredential {
      *                TokenCredential implementation might make.
      */
     async getToken(scopes, options = {}) {
-        return trace(`${this.constructor.name}.getToken`, options, async (newOptions) => {
+        return tracingClient.withSpan(`${this.constructor.name}.getToken`, options, async (newOptions) => {
             const arrayScopes = Array.isArray(scopes) ? scopes : [scopes];
             return this.msalFlow.getToken(arrayScopes, newOptions);
         });
@@ -2193,7 +2148,7 @@ class EnvironmentCredential {
      * @param options - Optional parameters. See {@link GetTokenOptions}.
      */
     async getToken(scopes, options = {}) {
-        return trace(`${credentialName$1}.getToken`, options, async (newOptions) => {
+        return tracingClient.withSpan(`${credentialName$1}.getToken`, options, async (newOptions) => {
             if (this._credential) {
                 try {
                     const result = await this._credential.getToken(scopes, newOptions);
@@ -2466,14 +2421,12 @@ const imdsMsiRetryConfig = {
  * Defines how to determine whether the Azure IMDS MSI is available, and also how to retrieve a token from the Azure IMDS MSI.
  */
 const imdsMsi = {
-    async isAvailable({ scopes, identityClient, clientId, resourceId, getTokenOptions, }) {
-        var _a, _b;
+    async isAvailable({ scopes, identityClient, clientId, resourceId, getTokenOptions = {}, }) {
         const resource = mapScopesToResource(scopes);
         if (!resource) {
             logger$9.info(`${msiName$4}: Unavailable. Multiple scopes are not supported.`);
             return false;
         }
-        const { span, updatedOptions: options } = createSpan("ManagedIdentityCredential-pingImdsEndpoint", getTokenOptions);
         // if the PodIdentityEndpoint environment variable was set no need to probe the endpoint, it can be assumed to exist
         if (process.env.AZURE_POD_IDENTITY_AUTHORITY_HOST) {
             return true;
@@ -2485,53 +2438,45 @@ const imdsMsi = {
             skipMetadataHeader: true,
             skipQuery: true,
         });
-        requestOptions.tracingOptions = options.tracingOptions;
-        try {
-            // Create a request with a timeout since we expect that
-            // not having a "Metadata" header should cause an error to be
-            // returned quickly from the endpoint, proving its availability.
-            const request = coreRestPipeline.createPipelineRequest(requestOptions);
-            request.timeout = (_b = (_a = options.requestOptions) === null || _a === void 0 ? void 0 : _a.timeout) !== null && _b !== void 0 ? _b : 300;
-            // This MSI uses the imdsEndpoint to get the token, which only uses http://
-            request.allowInsecureConnection = true;
+        return tracingClient.withSpan("ManagedIdentityCredential-pingImdsEndpoint", getTokenOptions, async (options) => {
+            var _a, _b;
+            requestOptions.tracingOptions = options.tracingOptions;
             try {
-                logger$9.info(`${msiName$4}: Pinging the Azure IMDS endpoint`);
-                await identityClient.sendRequest(request);
+                // Create a request with a timeout since we expect that
+                // not having a "Metadata" header should cause an error to be
+                // returned quickly from the endpoint, proving its availability.
+                const request = coreRestPipeline.createPipelineRequest(requestOptions);
+                request.timeout = (_b = (_a = options.requestOptions) === null || _a === void 0 ? void 0 : _a.timeout) !== null && _b !== void 0 ? _b : 300;
+                // This MSI uses the imdsEndpoint to get the token, which only uses http://
+                request.allowInsecureConnection = true;
+                try {
+                    logger$9.info(`${msiName$4}: Pinging the Azure IMDS endpoint`);
+                    await identityClient.sendRequest(request);
+                }
+                catch (err) {
+                    if ((err.name === "RestError" && err.code === coreRestPipeline.RestError.REQUEST_SEND_ERROR) ||
+                        err.name === "AbortError" ||
+                        err.code === "ENETUNREACH" || // Network unreachable
+                        err.code === "ECONNREFUSED" || // connection refused
+                        err.code === "EHOSTDOWN" // host is down
+                    ) {
+                        // If the request failed, or Node.js was unable to establish a connection,
+                        // or the host was down, we'll assume the IMDS endpoint isn't available.
+                        logger$9.info(`${msiName$4}: The Azure IMDS endpoint is unavailable`);
+                        return false;
+                    }
+                }
+                // If we received any response, the endpoint is available
+                logger$9.info(`${msiName$4}: The Azure IMDS endpoint is available`);
+                return true;
             }
             catch (err) {
-                if ((err.name === "RestError" && err.code === coreRestPipeline.RestError.REQUEST_SEND_ERROR) ||
-                    err.name === "AbortError" ||
-                    err.code === "ENETUNREACH" || // Network unreachable
-                    err.code === "ECONNREFUSED" || // connection refused
-                    err.code === "EHOSTDOWN" // host is down
-                ) {
-                    // If the request failed, or Node.js was unable to establish a connection,
-                    // or the host was down, we'll assume the IMDS endpoint isn't available.
-                    logger$9.info(`${msiName$4}: The Azure IMDS endpoint is unavailable`);
-                    span.setStatus({
-                        code: coreTracing.SpanStatusCode.ERROR,
-                        message: err.message,
-                    });
-                    return false;
-                }
+                // createWebResource failed.
+                // This error should bubble up to the user.
+                logger$9.info(`${msiName$4}: Error when creating the WebResource for the Azure IMDS endpoint: ${err.message}`);
+                throw err;
             }
-            // If we received any response, the endpoint is available
-            logger$9.info(`${msiName$4}: The Azure IMDS endpoint is available`);
-            return true;
-        }
-        catch (err) {
-            // createWebResource failed.
-            // This error should bubble up to the user.
-            logger$9.info(`${msiName$4}: Error when creating the WebResource for the Azure IMDS endpoint: ${err.message}`);
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: err.message,
-            });
-            throw err;
-        }
-        finally {
-            span.end();
-        }
+        });
     },
     async getToken(configuration, getTokenOptions = {}) {
         const { identityClient, scopes, clientId, resourceId } = configuration;
@@ -2979,7 +2924,7 @@ class ManagedIdentityCredential {
         throw new CredentialUnavailableError(`${ManagedIdentityCredential.name} - No MSI credential available`);
     }
     async authenticateManagedIdentity(scopes, getTokenOptions) {
-        const { span, updatedOptions } = createSpan(`${ManagedIdentityCredential.name}.authenticateManagedIdentity`, getTokenOptions);
+        const { span, updatedOptions } = tracingClient.startSpan(`${ManagedIdentityCredential.name}.authenticateManagedIdentity`, getTokenOptions);
         try {
             // Determining the available MSI, and avoiding checking for other MSIs while the program is running.
             const availableMSI = await this.cachedAvailableMSI(scopes, updatedOptions);
@@ -2992,8 +2937,8 @@ class ManagedIdentityCredential {
         }
         catch (err) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: err.message,
+                status: "error",
+                error: err,
             });
             throw err;
         }
@@ -3012,7 +2957,7 @@ class ManagedIdentityCredential {
      */
     async getToken(scopes, options) {
         let result = null;
-        const { span, updatedOptions } = createSpan(`${ManagedIdentityCredential.name}.getToken`, options);
+        const { span, updatedOptions } = tracingClient.startSpan(`${ManagedIdentityCredential.name}.getToken`, options);
         try {
             // isEndpointAvailable can be true, false, or null,
             // If it's null, it means we don't yet know whether
@@ -3057,8 +3002,8 @@ class ManagedIdentityCredential {
             //   if the status code was 400, it means that the endpoint is working,
             //   but no identity is available.
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: err.message,
+                status: "error",
+                error: err,
             });
             // If either the network is unreachable,
             // we can safely assume the credential is unavailable.
@@ -3343,7 +3288,7 @@ class InteractiveBrowserCredential {
      *                TokenCredential implementation might make.
      */
     async getToken(scopes, options = {}) {
-        return trace(`${this.constructor.name}.getToken`, options, async (newOptions) => {
+        return tracingClient.withSpan(`${this.constructor.name}.getToken`, options, async (newOptions) => {
             const arrayScopes = Array.isArray(scopes) ? scopes : [scopes];
             return this.msalFlow.getToken(arrayScopes, Object.assign(Object.assign({}, newOptions), { disableAutomaticAuthentication: this.disableAutomaticAuthentication }));
         });
@@ -3362,7 +3307,7 @@ class InteractiveBrowserCredential {
      *                  TokenCredential implementation might make.
      */
     async authenticate(scopes, options = {}) {
-        return trace(`${this.constructor.name}.authenticate`, options, async (newOptions) => {
+        return tracingClient.withSpan(`${this.constructor.name}.authenticate`, options, async (newOptions) => {
             const arrayScopes = Array.isArray(scopes) ? scopes : [scopes];
             await this.msalFlow.getToken(arrayScopes, newOptions);
             return this.msalFlow.getActiveAccount();
@@ -3453,7 +3398,7 @@ class DeviceCodeCredential {
      *                TokenCredential implementation might make.
      */
     async getToken(scopes, options = {}) {
-        return trace(`${this.constructor.name}.getToken`, options, async (newOptions) => {
+        return tracingClient.withSpan(`${this.constructor.name}.getToken`, options, async (newOptions) => {
             const arrayScopes = Array.isArray(scopes) ? scopes : [scopes];
             return this.msalFlow.getToken(arrayScopes, Object.assign(Object.assign({}, newOptions), { disableAutomaticAuthentication: this.disableAutomaticAuthentication }));
         });
@@ -3469,7 +3414,7 @@ class DeviceCodeCredential {
      *                  TokenCredential implementation might make.
      */
     async authenticate(scopes, options = {}) {
-        return trace(`${this.constructor.name}.authenticate`, options, async (newOptions) => {
+        return tracingClient.withSpan(`${this.constructor.name}.authenticate`, options, async (newOptions) => {
             const arrayScopes = Array.isArray(scopes) ? scopes : [scopes];
             await this.msalFlow.getToken(arrayScopes, newOptions);
             return this.msalFlow.getActiveAccount();
@@ -3560,7 +3505,7 @@ class AuthorizationCodeCredential {
      *                TokenCredential implementation might make.
      */
     async getToken(scopes, options = {}) {
-        return trace(`${this.constructor.name}.getToken`, options, async (newOptions) => {
+        return tracingClient.withSpan(`${this.constructor.name}.getToken`, options, async (newOptions) => {
             const arrayScopes = Array.isArray(scopes) ? scopes : [scopes];
             return this.msalFlow.getToken(arrayScopes, Object.assign(Object.assign({}, newOptions), { disableAutomaticAuthentication: this.disableAutomaticAuthentication }));
         });
@@ -3645,7 +3590,7 @@ class OnBehalfOfCredential {
      * @param options - The options used to configure the underlying network requests.
      */
     async getToken(scopes, options = {}) {
-        return trace(`${credentialName}.getToken`, options, async (newOptions) => {
+        return tracingClient.withSpan(`${credentialName}.getToken`, options, async (newOptions) => {
             const arrayScopes = Array.isArray(scopes) ? scopes : [scopes];
             return this.msalFlow.getToken(arrayScopes, newOptions);
         });