diff --git a/sdk/core/ts-http-runtime/review/azure-core-comparison.diff b/sdk/core/ts-http-runtime/review/azure-core-comparison.diff index 23331a211cd6..c7e7746c55b4 100644 --- a/sdk/core/ts-http-runtime/review/azure-core-comparison.diff +++ b/sdk/core/ts-http-runtime/review/azure-core-comparison.diff @@ -300,10 +300,10 @@ index 9db25cf..df8291c 100644 /** * Represents a credential defined by a static API key. diff --git a/src/auth/tokenCredential.ts b/src/auth/tokenCredential.ts -index 395b112..6a42777 100644 +index 395b112..19d080b 100644 --- a/src/auth/tokenCredential.ts +++ b/src/auth/tokenCredential.ts -@@ -1,9 +1,8 @@ +@@ -1,9 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. @@ -311,11 +311,26 @@ index 395b112..6a42777 100644 -import type { TracingContext } from "./tracing.js"; -import type { HttpMethods } from "@azure/core-util"; +import type { AbortSignalLike } from "../abort-controller/AbortSignalLike.js"; -+import type { TracingContext } from "../tracing/interfaces.js"; /** * Represents a credential capable of providing an authentication token. -@@ -60,28 +59,6 @@ export interface GetTokenOptions { +@@ -39,15 +37,6 @@ export interface GetTokenOptions { + */ + timeout?: number; + }; +- /** +- * Options used when tracing is enabled. +- */ +- tracingOptions?: { +- /** +- * Tracing Context for the current request. +- */ +- tracingContext?: TracingContext; +- }; + /** + * Claim details to perform the Continuous Access Evaluation authentication flow + */ +@@ -60,28 +49,6 @@ export interface GetTokenOptions { * Allows specifying a tenantId. Useful to handle challenges that provide tenant Id hints. */ tenantId?: string; @@ -344,7 +359,7 @@ index 395b112..6a42777 100644 } /** -@@ -103,26 +80,7 @@ export interface AccessToken { +@@ -103,26 +70,7 @@ export interface AccessToken { */ refreshAfterTimestamp?: number; @@ -464,10 +479,10 @@ index 30dac33..66ea99c 100644 if (!cachedHttpClient) { cachedHttpClient = createDefaultHttpClient(); diff --git a/src/client/common.ts b/src/client/common.ts -index 4e49dde..f43f7c1 100644 +index 4e49dde..484be12 100644 --- a/src/client/common.ts +++ b/src/client/common.ts -@@ -3,19 +3,18 @@ +@@ -3,19 +3,17 @@ import type { HttpClient, @@ -488,13 +503,24 @@ index 4e49dde..f43f7c1 100644 +} from "../interfaces.js"; +import type { Pipeline, PipelinePolicy } from "../pipeline.js"; +import type { AbortSignalLike } from "../abort-controller/AbortSignalLike.js"; -+import type { OperationTracingOptions } from "../tracing/interfaces.js"; +import type { PipelineOptions } from "../createPipelineFromOptions.js"; +import type { LogPolicyOptions } from "../policies/logPolicy.js"; /** * Shape of the default request parameters, this may be overridden by the specific -@@ -91,16 +90,9 @@ export type RequestParameters = { +@@ -74,11 +72,6 @@ export type RequestParameters = { + */ + abortSignal?: AbortSignalLike; + +- /** +- * Options used when tracing is enabled. +- */ +- tracingOptions?: OperationTracingOptions; +- + /** + * A function to be called each time a response is received from the server + * while performing the requested operation. +@@ -91,16 +84,9 @@ export type RequestParameters = { * A function to be called each time a response is received from the server * while performing the requested operation. * May be called multiple times. @@ -513,7 +539,19 @@ index 4e49dde..f43f7c1 100644 /** * Wrapper object for http request and response. Deserialized object is stored in -@@ -202,7 +194,7 @@ export interface Client { +@@ -135,11 +121,6 @@ export interface OperationOptions { + * Options used when creating and sending HTTP requests for this operation. + */ + requestOptions?: OperationRequestOptions; +- /** +- * Options used when tracing is enabled. +- */ +- tracingOptions?: OperationTracingOptions; +- + /** + * A function to be called each time a response is received from the server + * while performing the requested operation. +@@ -202,7 +183,7 @@ export interface Client { * strong types. When used by the codegen this type gets overridden with the generated * types. For example: * ```typescript snippet:path_example @@ -522,7 +560,7 @@ index 4e49dde..f43f7c1 100644 * * export type MyClient = Client & { * path: Routes; -@@ -326,11 +318,9 @@ export type ClientOptions = PipelineOptions & { +@@ -326,11 +307,9 @@ export type ClientOptions = PipelineOptions & { */ apiKeyHeaderName?: string; }; @@ -722,6 +760,18 @@ index e34a065..2bc3df1 100644 /** * Describes a single part in a multipart body. +diff --git a/src/client/operationOptionHelpers.ts b/src/client/operationOptionHelpers.ts +index c7c1eb6..15bdc45 100644 +--- a/src/client/operationOptionHelpers.ts ++++ b/src/client/operationOptionHelpers.ts +@@ -16,7 +16,6 @@ export function operationOptionsToRequestParameters(options: OperationOptions): + abortSignal: options.abortSignal, + onUploadProgress: options.requestOptions?.onUploadProgress, + onDownloadProgress: options.requestOptions?.onDownloadProgress, +- tracingOptions: options.tracingOptions, + headers: { ...options.requestOptions?.headers }, + onResponse: options.onResponse, + }; diff --git a/src/client/restError.ts b/src/client/restError.ts index 1ecc969..9b98b21 100644 --- a/src/client/restError.ts @@ -739,7 +789,7 @@ index 1ecc969..9b98b21 100644 /** diff --git a/src/client/sendRequest.ts b/src/client/sendRequest.ts -index 9e947e6..2f30ba0 100644 +index 9e947e6..f2a1cac 100644 --- a/src/client/sendRequest.ts +++ b/src/client/sendRequest.ts @@ -5,19 +5,16 @@ import type { @@ -778,6 +828,14 @@ index 9e947e6..2f30ba0 100644 } throw e; +@@ -136,7 +134,6 @@ function buildPipelineRequest( + multipartBody, + headers, + allowInsecureConnection: options.allowInsecureConnection, +- tracingOptions: options.tracingOptions, + abortSignal: options.abortSignal, + onUploadProgress: options.onUploadProgress, + onDownloadProgress: options.onDownloadProgress, diff --git a/src/constants.ts b/src/constants.ts index 8e49c6b..60da499 100644 --- a/src/constants.ts @@ -791,19 +849,18 @@ index 8e49c6b..60da499 100644 export const DEFAULT_RETRY_POLICY_COUNT = 3; diff --git a/src/createPipelineFromOptions.ts b/src/createPipelineFromOptions.ts -index 2a2bd41..ede8855 100644 +index 2a2bd41..f4797cd 100644 --- a/src/createPipelineFromOptions.ts +++ b/src/createPipelineFromOptions.ts -@@ -3,18 +3,18 @@ +@@ -3,18 +3,17 @@ import { type LogPolicyOptions, logPolicy } from "./policies/logPolicy.js"; import { type Pipeline, createEmptyPipeline } from "./pipeline.js"; -import type { PipelineRetryOptions, TlsSettings, ProxySettings } from "./interfaces.js"; -+import type { PipelineRetryOptions, TlsSettings } from "./interfaces.js"; ++import type { PipelineRetryOptions, ProxySettings, TlsSettings } from "./interfaces.js"; import { type RedirectPolicyOptions, redirectPolicy } from "./policies/redirectPolicy.js"; import { type UserAgentPolicyOptions, userAgentPolicy } from "./policies/userAgentPolicy.js"; -import { multipartPolicy, multipartPolicyName } from "./policies/multipartPolicy.js"; -+import type { ProxySettings } from "./index.js"; import { decompressResponsePolicy } from "./policies/decompressResponsePolicy.js"; import { defaultRetryPolicy } from "./policies/defaultRetryPolicy.js"; import { formDataPolicy } from "./policies/formDataPolicy.js"; @@ -817,7 +874,7 @@ index 2a2bd41..ede8855 100644 /** * Defines options that are used to configure the HTTP pipeline for -@@ -88,7 +88,6 @@ export function createPipelineFromOptions(options: InternalPipelineOptions): Pip +@@ -88,7 +87,6 @@ export function createPipelineFromOptions(options: InternalPipelineOptions): Pip pipeline.addPolicy(formDataPolicy(), { beforePolicies: [multipartPolicyName] }); pipeline.addPolicy(userAgentPolicy(options.userAgentOptions)); @@ -839,62 +896,79 @@ index e9751e2..e4f8769 100644 HttpClient, HttpHeaders as PipelineHeaders, diff --git a/src/index.ts b/src/index.ts -index 688a7ea..76ca028 100644 +index 688a7ea..f261855 100644 --- a/src/index.ts +++ b/src/index.ts -@@ -9,16 +9,16 @@ declare global { +@@ -9,117 +9,68 @@ declare global { interface ReadableStream {} interface TransformStream {} } - /* eslint-enable @typescript-eslint/no-unused-vars */ -export type { HttpMethods } from "@azure/core-util"; --export type { + ++export { AbortSignalLike } from "./abort-controller/AbortSignalLike.js"; +export { - Agent, ++ createClientLogger, ++ TypeSpecRuntimeLogger, ++ type TypeSpecRuntimeClientLogger, ++ type Debugger, ++} from "./logger/logger.js"; + export type { +- Agent, BodyPart, - FormDataMap, +- FormDataMap, FormDataValue, - HttpClient, - HttpHeaders, -+ HttpMethods, +- HttpClient, +- HttpHeaders, ++ RawHttpHeaders, KeyObject, - MultipartRequestBody, +- MultipartRequestBody, ++ PxfObject, ++ HttpClient, PipelineRequest, -@@ -34,92 +34,125 @@ export type { + PipelineResponse, +- PipelineRetryOptions, +- ProxySettings, +- PxfObject, +- RawHttpHeaders, +- RawHttpHeadersInput, +- RequestBodyType, + SendRequest, + TlsSettings, ++ Agent, ++ RequestBodyType, ++ FormDataMap, ++ HttpHeaders, ++ HttpMethods, ++ MultipartRequestBody, TransferProgressEvent, ++ ProxySettings, ++ RawHttpHeadersInput, ++ PipelineRetryOptions, } from "./interfaces.js"; ++export { isKeyCredential, type KeyCredential } from "./auth/keyCredential.js"; export { - type AddPolicyOptions as AddPipelineOptions, - type PipelinePhase, - type PipelinePolicy, - type Pipeline, -+ AddPolicyOptions as AddPipelineOptions, -+ PipelinePhase, -+ PipelinePolicy, -+ Pipeline, - createEmptyPipeline, - } from "./pipeline.js"; - export { - createPipelineFromOptions, +- createEmptyPipeline, +-} from "./pipeline.js"; +-export { +- createPipelineFromOptions, - type TelemetryOptions, - type InternalPipelineOptions, - type PipelineOptions, -+ TelemetryOptions, -+ InternalPipelineOptions, -+ PipelineOptions, - } from "./createPipelineFromOptions.js"; - export { createDefaultHttpClient } from "./defaultHttpClient.js"; - export { createHttpHeaders } from "./httpHeaders.js"; +-} from "./createPipelineFromOptions.js"; +-export { createDefaultHttpClient } from "./defaultHttpClient.js"; +-export { createHttpHeaders } from "./httpHeaders.js"; -export { createPipelineRequest, type PipelineRequestOptions } from "./pipelineRequest.js"; -export { RestError, type RestErrorOptions, isRestError } from "./restError.js"; -+export { createPipelineRequest, PipelineRequestOptions } from "./pipelineRequest.js"; -+export { RestError, RestErrorOptions, isRestError } from "./restError.js"; - export { - decompressResponsePolicy, - decompressResponsePolicyName, - } from "./policies/decompressResponsePolicy.js"; +-export { +- decompressResponsePolicy, +- decompressResponsePolicyName, +-} from "./policies/decompressResponsePolicy.js"; -export { - exponentialRetryPolicy, - type ExponentialRetryPolicyOptions, @@ -905,15 +979,13 @@ index 688a7ea..76ca028 100644 - setClientRequestIdPolicyName, -} from "./policies/setClientRequestIdPolicy.js"; -export { logPolicy, logPolicyName, type LogPolicyOptions } from "./policies/logPolicy.js"; -+export { logPolicy, logPolicyName, LogPolicyOptions } from "./policies/logPolicy.js"; - export { multipartPolicy, multipartPolicyName } from "./policies/multipartPolicy.js"; - export { proxyPolicy, proxyPolicyName, getDefaultProxySettings } from "./policies/proxyPolicy.js"; - export { - redirectPolicy, - redirectPolicyName, +-export { multipartPolicy, multipartPolicyName } from "./policies/multipartPolicy.js"; +-export { proxyPolicy, proxyPolicyName, getDefaultProxySettings } from "./policies/proxyPolicy.js"; +-export { +- redirectPolicy, +- redirectPolicyName, - type RedirectPolicyOptions, -+ RedirectPolicyOptions, - } from "./policies/redirectPolicy.js"; +-} from "./policies/redirectPolicy.js"; -export { - systemErrorRetryPolicy, - type SystemErrorRetryPolicyOptions, @@ -925,122 +997,78 @@ index 688a7ea..76ca028 100644 - type ThrottlingRetryPolicyOptions, -} from "./policies/throttlingRetryPolicy.js"; -export { retryPolicy, type RetryPolicyOptions } from "./policies/retryPolicy.js"; --export type { ++ isTokenCredential, ++ type TokenCredential, ++ type GetTokenOptions, ++ type AccessToken, ++} from "./auth/tokenCredential.js"; ++export type { Pipeline, PipelinePolicy, AddPolicyOptions, PipelinePhase } from "./pipeline.js"; ++export { RestError, isRestError, type RestErrorOptions } from "./restError.js"; ++export { stringToUint8Array, uint8ArrayToString, type EncodingType } from "./util/bytesEncoding.js"; ++export { getClient } from "./client/getClient.js"; + export type { - RetryStrategy, - RetryInformation, - RetryModifiers, -} from "./retryStrategies/retryStrategy.js"; - export { - tracingPolicy, - tracingPolicyName, +-export { +- tracingPolicy, +- tracingPolicyName, - type TracingPolicyOptions, -+ TracingPolicyOptions, - } from "./policies/tracingPolicy.js"; +-} from "./policies/tracingPolicy.js"; -export { - defaultRetryPolicy, - type DefaultRetryPolicyOptions, -} from "./policies/defaultRetryPolicy.js"; -+export { defaultRetryPolicy, DefaultRetryPolicyOptions } from "./policies/defaultRetryPolicy.js"; - export { - userAgentPolicy, - userAgentPolicyName, +-export { +- userAgentPolicy, +- userAgentPolicyName, - type UserAgentPolicyOptions, -+ UserAgentPolicyOptions, - } from "./policies/userAgentPolicy.js"; - export { tlsPolicy, tlsPolicyName } from "./policies/tlsPolicy.js"; - export { formDataPolicy, formDataPolicyName } from "./policies/formDataPolicy.js"; - export { - bearerTokenAuthenticationPolicy, +-} from "./policies/userAgentPolicy.js"; +-export { tlsPolicy, tlsPolicyName } from "./policies/tlsPolicy.js"; +-export { formDataPolicy, formDataPolicyName } from "./policies/formDataPolicy.js"; +-export { +- bearerTokenAuthenticationPolicy, - type BearerTokenAuthenticationPolicyOptions, -+ BearerTokenAuthenticationPolicyOptions, - bearerTokenAuthenticationPolicyName, +- bearerTokenAuthenticationPolicyName, - type ChallengeCallbacks, - type AuthorizeRequestOptions, - type AuthorizeRequestOnChallengeOptions, -+ ChallengeCallbacks, -+ AuthorizeRequestOptions, -+ AuthorizeRequestOnChallengeOptions, - } from "./policies/bearerTokenAuthenticationPolicy.js"; +-} from "./policies/bearerTokenAuthenticationPolicy.js"; -export { ndJsonPolicy, ndJsonPolicyName } from "./policies/ndJsonPolicy.js"; -+export { AbortSignalLike } from "./abort-controller/AbortSignalLike.js"; -+export { AbortError } from "./abort-controller/AbortError.js"; -+export { AccessToken, GetTokenOptions, TokenCredential } from "./auth/tokenCredential.js"; -+export { KeyCredential, isKeyCredential } from "./auth/keyCredential.js"; -+export { -+ AddEventOptions, -+ Instrumenter, -+ InstrumenterSpanOptions, -+ OperationTracingOptions, -+ OptionsWithTracingContext, -+ Resolved, -+ SpanStatus, -+ SpanStatusError, -+ SpanStatusSuccess, -+ TracingClient, -+ TracingClientOptions, -+ TracingContext, -+ TracingSpan, -+ TracingSpanKind, -+ TracingSpanLink, -+ TracingSpanOptions, -+} from "./tracing/interfaces.js"; -+export { useInstrumenter } from "./tracing/instrumenter.js"; -+export { createTracingClient } from "./tracing/tracingClient.js"; -+// from core-util -+export { delay, DelayOptions, calculateRetryDelay } from "./util/delay.js"; -+export { -+ AbortOptions, -+ cancelablePromiseRace, -+ AbortablePromiseBuilder, -+} from "./util/aborterUtils.js"; - export { +-export { - auxiliaryAuthenticationHeaderPolicy, - type AuxiliaryAuthenticationHeaderPolicyOptions, - auxiliaryAuthenticationHeaderPolicyName, -} from "./policies/auxiliaryAuthenticationHeaderPolicy.js"; -+ createAbortablePromise, -+ CreateAbortablePromiseOptions, -+} from "./util/createAbortablePromise.js"; -+export { getRandomIntegerInclusive } from "./util/random.js"; -+export { isObject, UnknownObject } from "./util/object.js"; -+export { isError, getErrorMessage } from "./util/error.js"; - export { - createFile, - createFileFromStream, +-export { +- createFile, +- createFileFromStream, - type CreateFileOptions, - type CreateFileFromStreamOptions, -+ CreateFileOptions, -+ CreateFileFromStreamOptions, - } from "./util/file.js"; -+export { computeSha256Hash, computeSha256Hmac } from "./util/sha256.js"; -+export { isDefined, isObjectWithProperties, objectHasProperty } from "./util/typeGuards.js"; -+export { randomUUID } from "./util/uuidUtils.js"; -+export { -+ isBrowser, -+ isBun, -+ isNode, -+ isNodeLike, -+ isNodeRuntime, -+ isDeno, -+ isReactNative, -+ isWebWorker, -+} from "./util/checkEnvironment.js"; -+export { uint8ArrayToString, stringToUint8Array, EncodingType } from "./util/bytesEncoding.js"; -+export { -+ Debugger, -+ TypeSpecRuntimeLogger, -+ TypeSpecRuntimeLogLevel, -+ TypeSpecRuntimeClientLogger, -+} from "./logger/logger.js"; -+// client -+export { createRestError } from "./client/restError.js"; -+export { -+ addCredentialPipelinePolicy, -+ AddCredentialPipelinePolicyOptions, -+} from "./client/clientHelpers.js"; -+export { operationOptionsToRequestParameters } from "./client/operationOptionHelpers.js"; -+export * from "./client/getClient.js"; -+export * from "./client/common.js"; +-} from "./util/file.js"; ++ Client, ++ ClientOptions, ++ OperationOptions, ++ AdditionalPolicyConfig, ++ PathUnchecked, ++ PathUncheckedResponse, ++ HttpResponse, ++ RawResponseCallback, ++ OperationRequestOptions, ++ PathParameters, ++ ResourceMethods, ++ PathParameterWithOptions, ++ StreamableMethod, ++ RequestParameters, ++ HttpNodeStreamResponse, ++ HttpBrowserStreamResponse, ++ FullOperationResponse, ++} from "./client/common.js"; ++export type { PipelineOptions, TelemetryOptions } from "./createPipelineFromOptions.js"; ++export type { LogPolicyOptions as LogOptions } from "./policies/logPolicy.js"; ++export type { RedirectPolicyOptions as RedirectOptions } from "./policies/redirectPolicy.js"; ++export type { UserAgentPolicyOptions as UserAgentOptions } from "./policies/userAgentPolicy.js"; diff --git a/src/interfaces.ts b/src/interfaces.ts index 26b806d..3e3ca58 100644 --- a/src/interfaces.ts @@ -1428,7 +1456,7 @@ index 55110a0..0000000 - }; -} diff --git a/src/policies/bearerTokenAuthenticationPolicy.ts b/src/policies/bearerTokenAuthenticationPolicy.ts -index 8398172..87e8f5e 100644 +index 8398172..1cd3978 100644 --- a/src/policies/bearerTokenAuthenticationPolicy.ts +++ b/src/policies/bearerTokenAuthenticationPolicy.ts @@ -1,8 +1,8 @@ @@ -1469,6 +1497,14 @@ index 8398172..87e8f5e 100644 } /** +@@ -109,7 +109,6 @@ async function defaultAuthorizeRequest(options: AuthorizeRequestOptions): Promis + const { scopes, getAccessToken, request } = options; + const getTokenOptions: GetTokenOptions = { + abortSignal: request.abortSignal, +- tracingOptions: request.tracingOptions, + }; + const accessToken = await getAccessToken(scopes, getTokenOptions); + diff --git a/src/policies/formDataPolicy.ts b/src/policies/formDataPolicy.ts index 86d7e12..4265f06 100644 --- a/src/policies/formDataPolicy.ts @@ -1697,10 +1733,16 @@ index a8b94fc..bc11b52 100644 * Function that determines how to proceed with the subsequent requests. * @param state - Retry state diff --git a/src/retryStrategies/throttlingRetryStrategy.ts b/src/retryStrategies/throttlingRetryStrategy.ts -index 2d4f87f..5c8d4ed 100644 +index 2d4f87f..d0f7298 100644 --- a/src/retryStrategies/throttlingRetryStrategy.ts +++ b/src/retryStrategies/throttlingRetryStrategy.ts -@@ -6,12 +6,12 @@ import { parseHeaderValueAsNumber } from "../util/helpers.js"; +@@ -1,17 +1,17 @@ + // Copyright (c) Microsoft Corporation. + // Licensed under the MIT License. + +-import type { PipelineResponse } from "../index.js"; ++import type { PipelineResponse } from "../interfaces.js"; + import { parseHeaderValueAsNumber } from "../util/helpers.js"; import type { RetryStrategy } from "./retryStrategy.js"; /** diff --git a/sdk/core/ts-http-runtime/review/ts-http-runtime.api.md b/sdk/core/ts-http-runtime/review/ts-http-runtime.api.md index 491e8ec062ac..b0d15994b9a3 100644 --- a/sdk/core/ts-http-runtime/review/ts-http-runtime.api.md +++ b/sdk/core/ts-http-runtime/review/ts-http-runtime.api.md @@ -4,22 +4,6 @@ ```ts -// @public -export type AbortablePromiseBuilder = (abortOptions: { - abortSignal?: AbortSignalLike; -}) => Promise; - -// @public -export class AbortError extends Error { - constructor(message?: string); -} - -// @public -export interface AbortOptions { - abortErrorMsg?: string; - abortSignal?: AbortSignalLike; -} - // @public export interface AbortSignalLike { readonly aborted: boolean; @@ -34,21 +18,6 @@ export interface AccessToken { token: string; } -// @public -export function addCredentialPipelinePolicy(pipeline: Pipeline, endpoint: string, options?: AddCredentialPipelinePolicyOptions): void; - -// @public -export interface AddCredentialPipelinePolicyOptions { - clientOptions?: ClientOptions; - credential?: TokenCredential | KeyCredential; -} - -// @public -export interface AddEventOptions { - attributes?: Record; - startTime?: Date; -} - // @public export interface AdditionalPolicyConfig { policy: PipelinePolicy; @@ -56,7 +25,7 @@ export interface AdditionalPolicyConfig { } // @public -export interface AddPipelineOptions { +export interface AddPolicyOptions { afterPhase?: PipelinePhase; afterPolicies?: string[]; beforePolicies?: string[]; @@ -72,62 +41,12 @@ export interface Agent { sockets: unknown; } -// @public -export interface AuthorizeRequestOnChallengeOptions { - getAccessToken: (scopes: string[], options: GetTokenOptions) => Promise; - logger?: TypeSpecRuntimeLogger; - request: PipelineRequest; - response: PipelineResponse; - scopes: string[]; -} - -// @public -export interface AuthorizeRequestOptions { - getAccessToken: (scopes: string[], options: GetTokenOptions) => Promise; - logger?: TypeSpecRuntimeLogger; - request: PipelineRequest; - scopes: string[]; -} - -// @public -export function bearerTokenAuthenticationPolicy(options: BearerTokenAuthenticationPolicyOptions): PipelinePolicy; - -// @public -export const bearerTokenAuthenticationPolicyName = "bearerTokenAuthenticationPolicy"; - -// @public -export interface BearerTokenAuthenticationPolicyOptions { - challengeCallbacks?: ChallengeCallbacks; - credential?: TokenCredential; - logger?: TypeSpecRuntimeLogger; - scopes: string | string[]; -} - // @public export interface BodyPart { body: ((() => ReadableStream) | (() => NodeJS.ReadableStream)) | ReadableStream | NodeJS.ReadableStream | Uint8Array | Blob; headers: HttpHeaders; } -// @public -export function calculateRetryDelay(retryAttempt: number, config: { - retryDelayInMs: number; - maxRetryDelayInMs: number; -}): { - retryAfterInMs: number; -}; - -// @public -export function cancelablePromiseRace(abortablePromiseBuilders: AbortablePromiseBuilder[], options?: { - abortSignal?: AbortSignalLike; -}): Promise; - -// @public -export interface ChallengeCallbacks { - authorizeRequest?(options: AuthorizeRequestOptions): Promise; - authorizeRequestOnChallenge?(options: AuthorizeRequestOnChallengeOptions): Promise; -} - // @public export interface Client { path: Function; @@ -146,64 +65,11 @@ export type ClientOptions = PipelineOptions & { allowInsecureConnection?: boolean; additionalPolicies?: AdditionalPolicyConfig[]; httpClient?: HttpClient; - loggingOptions?: LogPolicyOptions; + loggingOptions?: LogOptions; }; // @public -export function computeSha256Hash(content: string, encoding: "base64" | "hex"): Promise; - -// @public -export function computeSha256Hmac(key: string, stringToSign: string, encoding: "base64" | "hex"): Promise; - -// @public -export function createAbortablePromise(buildPromise: (resolve: (value: T | PromiseLike) => void, reject: (reason?: any) => void) => void, options?: CreateAbortablePromiseOptions): Promise; - -// @public -export interface CreateAbortablePromiseOptions extends AbortOptions { - cleanupBeforeAbort?: () => void; -} - -// @public -export function createDefaultHttpClient(): HttpClient; - -// @public -export function createEmptyPipeline(): Pipeline; - -// @public -export function createFile(content: Uint8Array, name: string, options?: CreateFileOptions): File; - -// @public -export function createFileFromStream(stream: () => ReadableStream | NodeJS.ReadableStream, name: string, options?: CreateFileFromStreamOptions): File; - -// @public -export interface CreateFileFromStreamOptions extends CreateFileOptions { - size?: number; -} - -// @public -export interface CreateFileOptions { - lastModified?: number; - type?: string; - webkitRelativePath?: string; -} - -// @public -export function createHttpHeaders(rawHeaders?: RawHttpHeadersInput): HttpHeaders; - -// @public -export function createPipelineFromOptions(options: InternalPipelineOptions): Pipeline; - -// @public -export function createPipelineRequest(options: PipelineRequestOptions): PipelineRequest; - -// @public -export function createRestError(response: PathUncheckedResponse): RestError; - -// @public -export function createRestError(message: string, response: PathUncheckedResponse): RestError; - -// @public -export function createTracingClient(options: TracingClientOptions): TracingClient; +export function createClientLogger(namespace: string): TypeSpecRuntimeLogger; // @public export interface Debugger { @@ -215,55 +81,14 @@ export interface Debugger { namespace: string; } -// @public -export function decompressResponsePolicy(): PipelinePolicy; - -// @public -export const decompressResponsePolicyName = "decompressResponsePolicy"; - -// @public -export function defaultRetryPolicy(options?: DefaultRetryPolicyOptions): PipelinePolicy; - -// @public -export interface DefaultRetryPolicyOptions extends PipelineRetryOptions { -} - -// @public -export function delay(timeInMs: number, options?: DelayOptions_2): Promise; - -// @public -interface DelayOptions_2 extends AbortOptions { -} -export { DelayOptions_2 as DelayOptions } - // @public export type EncodingType = "utf-8" | "base64" | "base64url" | "hex"; -// @public -export interface ErrorModel { - code: string; - details: Array; - innererror?: InnerError; - message: string; - target?: string; -} - -// @public -export interface ErrorResponse { - error: ErrorModel; -} - // @public export type FormDataMap = { [key: string]: FormDataValue | FormDataValue[]; }; -// @public -export function formDataPolicy(): PipelinePolicy; - -// @public -export const formDataPolicyName = "formDataPolicy"; - // @public export type FormDataValue = string | Blob | File; @@ -280,15 +105,6 @@ export function getClient(endpoint: string, options?: ClientOptions): Client; // @public export function getClient(endpoint: string, credentials?: TokenCredential | KeyCredential, options?: ClientOptions): Client; -// @public @deprecated -export function getDefaultProxySettings(proxyUrl?: string): ProxySettings | undefined; - -// @public -export function getErrorMessage(e: unknown): string; - -// @public -export function getRandomIntegerInclusive(min: number, max: number): number; - // @public export interface GetTokenOptions { abortSignal?: AbortSignalLike; @@ -298,9 +114,6 @@ export interface GetTokenOptions { timeout?: number; }; tenantId?: string; - tracingOptions?: { - tracingContext?: TracingContext; - }; } // @public @@ -340,76 +153,14 @@ export type HttpResponse = { status: string; }; -// @public -export interface InnerError { - code: string; - innererror?: InnerError; -} - -// @public -export interface Instrumenter { - createRequestHeaders(tracingContext?: TracingContext): Record; - parseTraceparentHeader(traceparentHeader: string): TracingContext | undefined; - startSpan(name: string, spanOptions: InstrumenterSpanOptions): { - span: TracingSpan; - tracingContext: TracingContext; - }; - withContext ReturnType>(context: TracingContext, callback: Callback, ...callbackArgs: CallbackArgs): ReturnType; -} - -// @public -export interface InstrumenterSpanOptions extends TracingSpanOptions { - packageName: string; - packageVersion?: string; - tracingContext?: TracingContext; -} - -// @public -export interface InternalPipelineOptions extends PipelineOptions { - loggingOptions?: LogPolicyOptions; -} - -// @public -export const isBrowser: boolean; - -// @public -export const isBun: boolean; - -// @public -export function isDefined(thing: T | undefined | null): thing is T; - -// @public -export const isDeno: boolean; - -// @public -export function isError(e: unknown): e is Error; - // @public export function isKeyCredential(credential: unknown): credential is KeyCredential; -// @public @deprecated -export const isNode: boolean; - -// @public -export const isNodeLike: boolean; - -// @public -export const isNodeRuntime: boolean; - -// @public -export function isObject(input: unknown): input is UnknownObject; - -// @public -export function isObjectWithProperties(thing: Thing, properties: PropertyName[]): thing is Thing & Record; - -// @public -export const isReactNative: boolean; - // @public export function isRestError(e: unknown): e is RestError; // @public -export const isWebWorker: boolean; +export function isTokenCredential(credential: unknown): credential is TokenCredential; // @public export interface KeyCredential { @@ -423,44 +174,25 @@ export interface KeyObject { } // @public -export function logPolicy(options?: LogPolicyOptions): PipelinePolicy; - -// @public -export const logPolicyName = "logPolicy"; - -// @public -export interface LogPolicyOptions { +export interface LogOptions { additionalAllowedHeaderNames?: string[]; additionalAllowedQueryParameters?: string[]; logger?: Debugger; } -// @public -export function multipartPolicy(): PipelinePolicy; - -// @public -export const multipartPolicyName = "multipartPolicy"; - // @public export interface MultipartRequestBody { boundary?: string; parts: BodyPart[]; } -// @public -export function objectHasProperty(thing: Thing, property: PropertyName): thing is Thing & Record; - // @public export interface OperationOptions { abortSignal?: AbortSignalLike; onResponse?: RawResponseCallback; requestOptions?: OperationRequestOptions; - tracingOptions?: OperationTracingOptions; } -// @public -export function operationOptionsToRequestParameters(options: OperationOptions): RequestParameters; - // @public export interface OperationRequestOptions { allowInsecureConnection?: boolean; @@ -471,20 +203,6 @@ export interface OperationRequestOptions { timeout?: number; } -// @public -export interface OperationTracingOptions { - tracingContext?: TracingContext; -} - -// @public -export type OptionsWithTracingContext = Options & { - tracingOptions: { - tracingContext: TracingContext; - }; -}; - // @public export type PathParameters = TRoute extends `${infer _Head}/{${infer _Param}}${infer Tail}` ? [ pathParameter: string | number | PathParameterWithOptions, @@ -508,7 +226,7 @@ export type PathUncheckedResponse = HttpResponse & { // @public export interface Pipeline { - addPolicy(policy: PipelinePolicy, options?: AddPipelineOptions): void; + addPolicy(policy: PipelinePolicy, options?: AddPolicyOptions): void; clone(): Pipeline; getOrderedPolicies(): PipelinePolicy[]; removePolicy(options: { @@ -521,11 +239,11 @@ export interface Pipeline { // @public export interface PipelineOptions { proxyOptions?: ProxySettings; - redirectOptions?: RedirectPolicyOptions; + redirectOptions?: RedirectOptions; retryOptions?: PipelineRetryOptions; telemetryOptions?: TelemetryOptions; tlsOptions?: TlsSettings; - userAgentOptions?: UserAgentPolicyOptions; + userAgentOptions?: UserAgentOptions; } // @public @@ -556,33 +274,12 @@ export interface PipelineRequest { streamResponseStatusCodes?: Set; timeout: number; tlsSettings?: TlsSettings; + // Warning: (ae-forgotten-export) The symbol "OperationTracingOptions" needs to be exported by the entry point index.d.ts tracingOptions?: OperationTracingOptions; url: string; withCredentials: boolean; } -// @public -export interface PipelineRequestOptions { - abortSignal?: AbortSignalLike; - allowInsecureConnection?: boolean; - body?: RequestBodyType; - disableKeepAlive?: boolean; - enableBrowserStreams?: boolean; - formData?: FormDataMap; - headers?: HttpHeaders; - method?: HttpMethods; - multipartBody?: MultipartRequestBody; - onDownloadProgress?: (progress: TransferProgressEvent) => void; - onUploadProgress?: (progress: TransferProgressEvent) => void; - proxySettings?: ProxySettings; - requestId?: string; - streamResponseStatusCodes?: Set; - timeout?: number; - tracingOptions?: OperationTracingOptions; - url: string; - withCredentials?: boolean; -} - // @public export interface PipelineResponse { blobBody?: Promise; @@ -601,14 +298,6 @@ export interface PipelineRetryOptions { retryDelayInMs?: number; } -// @public -export function proxyPolicy(proxySettings?: ProxySettings, options?: { - customNoProxyList?: string[]; -}): PipelinePolicy; - -// @public -export const proxyPolicyName = "proxyPolicy"; - // @public export interface ProxySettings { host: string; @@ -623,9 +312,6 @@ export interface PxfObject { passphrase?: string | undefined; } -// @public -export function randomUUID(): string; - // @public export type RawHttpHeaders = { [headerName: string]: string; @@ -638,13 +324,7 @@ export type RawHttpHeadersInput = Record; export type RawResponseCallback = (rawResponse: FullOperationResponse, error?: unknown) => void; // @public -export function redirectPolicy(options?: RedirectPolicyOptions): PipelinePolicy; - -// @public -export const redirectPolicyName = "redirectPolicy"; - -// @public -export interface RedirectPolicyOptions { +export interface RedirectOptions { maxRetries?: number; } @@ -665,15 +345,9 @@ export type RequestParameters = { onUploadProgress?: (progress: TransferProgressEvent) => void; onDownloadProgress?: (progress: TransferProgressEvent) => void; abortSignal?: AbortSignalLike; - tracingOptions?: OperationTracingOptions; onResponse?: RawResponseCallback; }; -// @public -export type Resolved = T extends { - then(onfulfilled: infer F): any; -} ? F extends (value: infer V) => any ? Resolved : never : T; - // @public export interface ResourceMethods> { delete: (options?: RequestParameters) => TResponse; @@ -709,20 +383,6 @@ export interface RestErrorOptions { // @public export type SendRequest = (request: PipelineRequest) => Promise; -// @public -export type SpanStatus = SpanStatusSuccess | SpanStatusError; - -// @public -export type SpanStatusError = { - status: "error"; - error?: Error | string; -}; - -// @public -export type SpanStatusSuccess = { - status: "success"; -}; - // @public export type StreamableMethod = PromiseLike & { asNodeStream: () => Promise; @@ -737,12 +397,6 @@ export interface TelemetryOptions { clientRequestIdHeaderName?: string; } -// @public -export function tlsPolicy(tlsSettings?: TlsSettings): PipelinePolicy; - -// @public -export const tlsPolicyName = "tlsPolicy"; - // @public export interface TlsSettings { ca?: string | Buffer | Array | undefined; @@ -757,78 +411,6 @@ export interface TokenCredential { getToken(scopes: string | string[], options?: GetTokenOptions): Promise; } -// @public -export interface TracingClient { - createRequestHeaders(tracingContext?: TracingContext): Record; - parseTraceparentHeader(traceparentHeader: string): TracingContext | undefined; - startSpan(name: string, operationOptions?: Options, spanOptions?: TracingSpanOptions): { - span: TracingSpan; - updatedOptions: OptionsWithTracingContext; - }; - withContext ReturnType>(context: TracingContext, callback: Callback, ...callbackArgs: CallbackArgs): ReturnType; - withSpan) => ReturnType>(name: string, operationOptions: Options, callback: Callback, spanOptions?: TracingSpanOptions): Promise>>; -} - -// @public -export interface TracingClientOptions { - namespace: string; - packageName: string; - packageVersion?: string; -} - -// @public -export interface TracingContext { - deleteValue(key: symbol): TracingContext; - getValue(key: symbol): unknown; - setValue(key: symbol, value: unknown): TracingContext; -} - -// @public -export function tracingPolicy(options?: TracingPolicyOptions): PipelinePolicy; - -// @public -export const tracingPolicyName = "tracingPolicy"; - -// @public -export interface TracingPolicyOptions { - additionalAllowedQueryParameters?: string[]; - userAgentPrefix?: string; -} - -// @public -export interface TracingSpan { - addEvent?(name: string, options?: AddEventOptions): void; - end(): void; - isRecording(): boolean; - recordException(exception: Error | string): void; - setAttribute(name: string, value: unknown): void; - setStatus(status: SpanStatus): void; -} - -// @public -export type TracingSpanKind = "client" | "server" | "producer" | "consumer" | "internal"; - -// @public -export interface TracingSpanLink { - attributes?: { - [key: string]: unknown; - }; - tracingContext: TracingContext; -} - -// @public -export interface TracingSpanOptions { - spanAttributes?: { - [key: string]: unknown; - }; - spanKind?: TracingSpanKind; - spanLinks?: TracingSpanLink[]; -} - // @public export type TransferProgressEvent = { loadedBytes: number; @@ -848,28 +430,11 @@ export interface TypeSpecRuntimeLogger { warning: Debugger; } -// @public -export type TypeSpecRuntimeLogLevel = "verbose" | "info" | "warning" | "error"; - // @public export function uint8ArrayToString(bytes: Uint8Array, format: EncodingType): string; // @public -export type UnknownObject = { - [s: string]: unknown; -}; - -// @public -export function useInstrumenter(instrumenter: Instrumenter): void; - -// @public -export function userAgentPolicy(options?: UserAgentPolicyOptions): PipelinePolicy; - -// @public -export const userAgentPolicyName = "userAgentPolicy"; - -// @public -export interface UserAgentPolicyOptions { +export interface UserAgentOptions { userAgentPrefix?: string; } diff --git a/sdk/core/ts-http-runtime/src/auth/tokenCredential.ts b/sdk/core/ts-http-runtime/src/auth/tokenCredential.ts index 6a42777aeb4a..19d080b4e97f 100644 --- a/sdk/core/ts-http-runtime/src/auth/tokenCredential.ts +++ b/sdk/core/ts-http-runtime/src/auth/tokenCredential.ts @@ -2,7 +2,6 @@ // Licensed under the MIT License. import type { AbortSignalLike } from "../abort-controller/AbortSignalLike.js"; -import type { TracingContext } from "../tracing/interfaces.js"; /** * Represents a credential capable of providing an authentication token. @@ -38,15 +37,6 @@ export interface GetTokenOptions { */ timeout?: number; }; - /** - * Options used when tracing is enabled. - */ - tracingOptions?: { - /** - * Tracing Context for the current request. - */ - tracingContext?: TracingContext; - }; /** * Claim details to perform the Continuous Access Evaluation authentication flow */ diff --git a/sdk/core/ts-http-runtime/src/client/common.ts b/sdk/core/ts-http-runtime/src/client/common.ts index f43f7c109466..484be124ca82 100644 --- a/sdk/core/ts-http-runtime/src/client/common.ts +++ b/sdk/core/ts-http-runtime/src/client/common.ts @@ -12,7 +12,6 @@ import type { } from "../interfaces.js"; import type { Pipeline, PipelinePolicy } from "../pipeline.js"; import type { AbortSignalLike } from "../abort-controller/AbortSignalLike.js"; -import type { OperationTracingOptions } from "../tracing/interfaces.js"; import type { PipelineOptions } from "../createPipelineFromOptions.js"; import type { LogPolicyOptions } from "../policies/logPolicy.js"; @@ -73,11 +72,6 @@ export type RequestParameters = { */ abortSignal?: AbortSignalLike; - /** - * Options used when tracing is enabled. - */ - tracingOptions?: OperationTracingOptions; - /** * A function to be called each time a response is received from the server * while performing the requested operation. @@ -127,11 +121,6 @@ export interface OperationOptions { * Options used when creating and sending HTTP requests for this operation. */ requestOptions?: OperationRequestOptions; - /** - * Options used when tracing is enabled. - */ - tracingOptions?: OperationTracingOptions; - /** * A function to be called each time a response is received from the server * while performing the requested operation. diff --git a/sdk/core/ts-http-runtime/src/client/operationOptionHelpers.ts b/sdk/core/ts-http-runtime/src/client/operationOptionHelpers.ts index c7c1eb625ada..15bdc452b5f6 100644 --- a/sdk/core/ts-http-runtime/src/client/operationOptionHelpers.ts +++ b/sdk/core/ts-http-runtime/src/client/operationOptionHelpers.ts @@ -16,7 +16,6 @@ export function operationOptionsToRequestParameters(options: OperationOptions): abortSignal: options.abortSignal, onUploadProgress: options.requestOptions?.onUploadProgress, onDownloadProgress: options.requestOptions?.onDownloadProgress, - tracingOptions: options.tracingOptions, headers: { ...options.requestOptions?.headers }, onResponse: options.onResponse, }; diff --git a/sdk/core/ts-http-runtime/src/client/sendRequest.ts b/sdk/core/ts-http-runtime/src/client/sendRequest.ts index 2f30ba080626..f2a1cacc80bf 100644 --- a/sdk/core/ts-http-runtime/src/client/sendRequest.ts +++ b/sdk/core/ts-http-runtime/src/client/sendRequest.ts @@ -134,7 +134,6 @@ function buildPipelineRequest( multipartBody, headers, allowInsecureConnection: options.allowInsecureConnection, - tracingOptions: options.tracingOptions, abortSignal: options.abortSignal, onUploadProgress: options.onUploadProgress, onDownloadProgress: options.onDownloadProgress, diff --git a/sdk/core/ts-http-runtime/src/createPipelineFromOptions.ts b/sdk/core/ts-http-runtime/src/createPipelineFromOptions.ts index ede8855e0df5..f4797cd60b3a 100644 --- a/sdk/core/ts-http-runtime/src/createPipelineFromOptions.ts +++ b/sdk/core/ts-http-runtime/src/createPipelineFromOptions.ts @@ -3,10 +3,9 @@ import { type LogPolicyOptions, logPolicy } from "./policies/logPolicy.js"; import { type Pipeline, createEmptyPipeline } from "./pipeline.js"; -import type { PipelineRetryOptions, TlsSettings } from "./interfaces.js"; +import type { PipelineRetryOptions, ProxySettings, TlsSettings } from "./interfaces.js"; import { type RedirectPolicyOptions, redirectPolicy } from "./policies/redirectPolicy.js"; import { type UserAgentPolicyOptions, userAgentPolicy } from "./policies/userAgentPolicy.js"; -import type { ProxySettings } from "./index.js"; import { decompressResponsePolicy } from "./policies/decompressResponsePolicy.js"; import { defaultRetryPolicy } from "./policies/defaultRetryPolicy.js"; import { formDataPolicy } from "./policies/formDataPolicy.js"; diff --git a/sdk/core/ts-http-runtime/src/index.ts b/sdk/core/ts-http-runtime/src/index.ts index 76ca028579cf..f261855f05a8 100644 --- a/sdk/core/ts-http-runtime/src/index.ts +++ b/sdk/core/ts-http-runtime/src/index.ts @@ -11,148 +11,66 @@ declare global { } /* eslint-enable @typescript-eslint/no-unused-vars */ +export { AbortSignalLike } from "./abort-controller/AbortSignalLike.js"; export { - Agent, + createClientLogger, + TypeSpecRuntimeLogger, + type TypeSpecRuntimeClientLogger, + type Debugger, +} from "./logger/logger.js"; +export type { BodyPart, - FormDataMap, FormDataValue, - HttpClient, - HttpHeaders, - HttpMethods, + RawHttpHeaders, KeyObject, - MultipartRequestBody, + PxfObject, + HttpClient, PipelineRequest, PipelineResponse, - PipelineRetryOptions, - ProxySettings, - PxfObject, - RawHttpHeaders, - RawHttpHeadersInput, - RequestBodyType, SendRequest, TlsSettings, + Agent, + RequestBodyType, + FormDataMap, + HttpHeaders, + HttpMethods, + MultipartRequestBody, TransferProgressEvent, + ProxySettings, + RawHttpHeadersInput, + PipelineRetryOptions, } from "./interfaces.js"; +export { isKeyCredential, type KeyCredential } from "./auth/keyCredential.js"; export { - AddPolicyOptions as AddPipelineOptions, - PipelinePhase, - PipelinePolicy, - Pipeline, - createEmptyPipeline, -} from "./pipeline.js"; -export { - createPipelineFromOptions, - TelemetryOptions, - InternalPipelineOptions, - PipelineOptions, -} from "./createPipelineFromOptions.js"; -export { createDefaultHttpClient } from "./defaultHttpClient.js"; -export { createHttpHeaders } from "./httpHeaders.js"; -export { createPipelineRequest, PipelineRequestOptions } from "./pipelineRequest.js"; -export { RestError, RestErrorOptions, isRestError } from "./restError.js"; -export { - decompressResponsePolicy, - decompressResponsePolicyName, -} from "./policies/decompressResponsePolicy.js"; -export { logPolicy, logPolicyName, LogPolicyOptions } from "./policies/logPolicy.js"; -export { multipartPolicy, multipartPolicyName } from "./policies/multipartPolicy.js"; -export { proxyPolicy, proxyPolicyName, getDefaultProxySettings } from "./policies/proxyPolicy.js"; -export { - redirectPolicy, - redirectPolicyName, - RedirectPolicyOptions, -} from "./policies/redirectPolicy.js"; -export { - tracingPolicy, - tracingPolicyName, - TracingPolicyOptions, -} from "./policies/tracingPolicy.js"; -export { defaultRetryPolicy, DefaultRetryPolicyOptions } from "./policies/defaultRetryPolicy.js"; -export { - userAgentPolicy, - userAgentPolicyName, - UserAgentPolicyOptions, -} from "./policies/userAgentPolicy.js"; -export { tlsPolicy, tlsPolicyName } from "./policies/tlsPolicy.js"; -export { formDataPolicy, formDataPolicyName } from "./policies/formDataPolicy.js"; -export { - bearerTokenAuthenticationPolicy, - BearerTokenAuthenticationPolicyOptions, - bearerTokenAuthenticationPolicyName, - ChallengeCallbacks, - AuthorizeRequestOptions, - AuthorizeRequestOnChallengeOptions, -} from "./policies/bearerTokenAuthenticationPolicy.js"; -export { AbortSignalLike } from "./abort-controller/AbortSignalLike.js"; -export { AbortError } from "./abort-controller/AbortError.js"; -export { AccessToken, GetTokenOptions, TokenCredential } from "./auth/tokenCredential.js"; -export { KeyCredential, isKeyCredential } from "./auth/keyCredential.js"; -export { - AddEventOptions, - Instrumenter, - InstrumenterSpanOptions, - OperationTracingOptions, - OptionsWithTracingContext, - Resolved, - SpanStatus, - SpanStatusError, - SpanStatusSuccess, - TracingClient, - TracingClientOptions, - TracingContext, - TracingSpan, - TracingSpanKind, - TracingSpanLink, - TracingSpanOptions, -} from "./tracing/interfaces.js"; -export { useInstrumenter } from "./tracing/instrumenter.js"; -export { createTracingClient } from "./tracing/tracingClient.js"; -// from core-util -export { delay, DelayOptions, calculateRetryDelay } from "./util/delay.js"; -export { - AbortOptions, - cancelablePromiseRace, - AbortablePromiseBuilder, -} from "./util/aborterUtils.js"; -export { - createAbortablePromise, - CreateAbortablePromiseOptions, -} from "./util/createAbortablePromise.js"; -export { getRandomIntegerInclusive } from "./util/random.js"; -export { isObject, UnknownObject } from "./util/object.js"; -export { isError, getErrorMessage } from "./util/error.js"; -export { - createFile, - createFileFromStream, - CreateFileOptions, - CreateFileFromStreamOptions, -} from "./util/file.js"; -export { computeSha256Hash, computeSha256Hmac } from "./util/sha256.js"; -export { isDefined, isObjectWithProperties, objectHasProperty } from "./util/typeGuards.js"; -export { randomUUID } from "./util/uuidUtils.js"; -export { - isBrowser, - isBun, - isNode, - isNodeLike, - isNodeRuntime, - isDeno, - isReactNative, - isWebWorker, -} from "./util/checkEnvironment.js"; -export { uint8ArrayToString, stringToUint8Array, EncodingType } from "./util/bytesEncoding.js"; -export { - Debugger, - TypeSpecRuntimeLogger, - TypeSpecRuntimeLogLevel, - TypeSpecRuntimeClientLogger, -} from "./logger/logger.js"; -// client -export { createRestError } from "./client/restError.js"; -export { - addCredentialPipelinePolicy, - AddCredentialPipelinePolicyOptions, -} from "./client/clientHelpers.js"; -export { operationOptionsToRequestParameters } from "./client/operationOptionHelpers.js"; -export * from "./client/getClient.js"; -export * from "./client/common.js"; + isTokenCredential, + type TokenCredential, + type GetTokenOptions, + type AccessToken, +} from "./auth/tokenCredential.js"; +export type { Pipeline, PipelinePolicy, AddPolicyOptions, PipelinePhase } from "./pipeline.js"; +export { RestError, isRestError, type RestErrorOptions } from "./restError.js"; +export { stringToUint8Array, uint8ArrayToString, type EncodingType } from "./util/bytesEncoding.js"; +export { getClient } from "./client/getClient.js"; +export type { + Client, + ClientOptions, + OperationOptions, + AdditionalPolicyConfig, + PathUnchecked, + PathUncheckedResponse, + HttpResponse, + RawResponseCallback, + OperationRequestOptions, + PathParameters, + ResourceMethods, + PathParameterWithOptions, + StreamableMethod, + RequestParameters, + HttpNodeStreamResponse, + HttpBrowserStreamResponse, + FullOperationResponse, +} from "./client/common.js"; +export type { PipelineOptions, TelemetryOptions } from "./createPipelineFromOptions.js"; +export type { LogPolicyOptions as LogOptions } from "./policies/logPolicy.js"; +export type { RedirectPolicyOptions as RedirectOptions } from "./policies/redirectPolicy.js"; +export type { UserAgentPolicyOptions as UserAgentOptions } from "./policies/userAgentPolicy.js"; diff --git a/sdk/core/ts-http-runtime/src/policies/bearerTokenAuthenticationPolicy.ts b/sdk/core/ts-http-runtime/src/policies/bearerTokenAuthenticationPolicy.ts index 87e8f5e705d3..1cd3978b3a3a 100644 --- a/sdk/core/ts-http-runtime/src/policies/bearerTokenAuthenticationPolicy.ts +++ b/sdk/core/ts-http-runtime/src/policies/bearerTokenAuthenticationPolicy.ts @@ -109,7 +109,6 @@ async function defaultAuthorizeRequest(options: AuthorizeRequestOptions): Promis const { scopes, getAccessToken, request } = options; const getTokenOptions: GetTokenOptions = { abortSignal: request.abortSignal, - tracingOptions: request.tracingOptions, }; const accessToken = await getAccessToken(scopes, getTokenOptions); diff --git a/sdk/core/ts-http-runtime/src/retryStrategies/throttlingRetryStrategy.ts b/sdk/core/ts-http-runtime/src/retryStrategies/throttlingRetryStrategy.ts index 5c8d4ed7232b..d0f729855056 100644 --- a/sdk/core/ts-http-runtime/src/retryStrategies/throttlingRetryStrategy.ts +++ b/sdk/core/ts-http-runtime/src/retryStrategies/throttlingRetryStrategy.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -import type { PipelineResponse } from "../index.js"; +import type { PipelineResponse } from "../interfaces.js"; import { parseHeaderValueAsNumber } from "../util/helpers.js"; import type { RetryStrategy } from "./retryStrategy.js";