[core] core-http and core-client should re-export core-tracing interfaces

sdk/core/core-client/review/core-client.api.md

@@ -5,6 +5,7 @@
 ```ts
 
 import { AbortSignalLike } from '@azure/abort-controller';
+import { createSpanFunction } from '@azure/core-tracing';
 import { HttpClient } from '@azure/core-rest-pipeline';
 import { HttpMethods } from '@azure/core-rest-pipeline';
 import { InternalPipelineOptions } from '@azure/core-rest-pipeline';
@@ -14,6 +15,9 @@ import { PipelineOptions } from '@azure/core-rest-pipeline';
 import { PipelinePolicy } from '@azure/core-rest-pipeline';
 import { PipelineRequest } from '@azure/core-rest-pipeline';
 import { PipelineResponse } from '@azure/core-rest-pipeline';
+import { Span } from '@azure/core-tracing';
+import { SpanKind } from '@azure/core-tracing';
+import { SpanStatusCode } from '@azure/core-tracing';
 import { TokenCredential } from '@azure/core-auth';
 import { TransferProgressEvent } from '@azure/core-rest-pipeline';
 
@@ -73,6 +77,8 @@ export function createSerializer(modelMappers?: {
     [key: string]: any;
 }, isXML?: boolean): Serializer;
 
+export { createSpanFunction }
+
 // @public
 export interface DeserializationContentTypes {
     json?: string[];
@@ -269,6 +275,8 @@ export interface OperationSpec {
     readonly urlParameters?: ReadonlyArray<OperationURLParameter>;
 }
 
+export { OperationTracingOptions }
+
 // @public
 export interface OperationURLParameter extends OperationParameter {
     skipEncoding?: boolean;
@@ -365,12 +373,18 @@ export interface SimpleMapperType {
     name: "Base64Url" | "Boolean" | "ByteArray" | "Date" | "DateTime" | "DateTimeRfc1123" | "Object" | "Stream" | "String" | "TimeSpan" | "UnixTime" | "Uuid" | "Number" | "any";
 }
 
+export { Span }
+
 // @public
 export interface SpanConfig {
     namespace: string;
     packagePrefix: string;
 }
 
+export { SpanKind }
+
+export { SpanStatusCode }
+
 // @public
 export const XML_ATTRKEY = "$";
 

sdk/core/core-client/src/index.ts

@@ -39,7 +39,12 @@ export {
   XmlOptions,
   SerializerOptions,
   RawResponseCallback,
-  CommonClientOptions
+  CommonClientOptions,
+  Span,
+  SpanKind,
+  OperationTracingOptions,
+  SpanStatusCode,
+  createSpanFunction
 } from "./interfaces";
 export {
   deserializationPolicy,

sdk/core/core-client/src/interfaces.ts

@@ -3,6 +3,7 @@
 
 import { AbortSignalLike } from "@azure/abort-controller";
 import { OperationTracingOptions } from "@azure/core-tracing";
+import { createSpanFunction, Span, SpanKind, SpanStatusCode } from "@azure/core-tracing";
 import {
   HttpMethods,
   PipelineResponse,
@@ -559,3 +560,5 @@ export interface CommonClientOptions extends PipelineOptions {
    */
   allowInsecureConnection?: boolean;
 }
+
+export { createSpanFunction, Span, SpanKind, SpanStatusCode, OperationTracingOptions };

sdk/core/core-http/review/core-http.api.md

@@ -7,12 +7,16 @@
 import { AbortSignalLike } from '@azure/abort-controller';
 import { AccessToken } from '@azure/core-auth';
 import { Context } from '@azure/core-tracing';
+import { createSpanFunction } from '@azure/core-tracing';
+import { CreateSpanFunctionArgs } from '@azure/core-tracing';
 import { Debugger } from '@azure/logger';
 import { GetTokenOptions } from '@azure/core-auth';
 import { isTokenCredential } from '@azure/core-auth';
 import { OperationTracingOptions } from '@azure/core-tracing';
 import { Span } from '@azure/core-tracing';
+import { SpanKind } from '@azure/core-tracing';
 import { SpanOptions } from '@azure/core-tracing';
+import { SpanStatusCode } from '@azure/core-tracing';
 import { TokenCredential } from '@azure/core-auth';
 
 export { AbortSignalLike }
@@ -159,11 +163,11 @@ export const Constants: {
 // @public (undocumented)
 export function createPipelineFromOptions(pipelineOptions: InternalPipelineOptions, authPolicyFactory?: RequestPolicyFactory): ServiceClientOptions;
 
-// @public @deprecated
-export function createSpanFunction(args: SpanConfig): <T extends OperationOptions>(operationName: string, operationOptions: T) => {
-    span: Span;
-    updatedOptions: T;
-};
+export { createSpanFunction }
+
+export { CreateSpanFunctionArgs }
+
+export { CreateSpanFunctionArgs as SpanConfig }
 
 // Warning: (ae-forgotten-export) The symbol "FetchHttpClient" needs to be exported by the entry point coreHttp.d.ts
 //
@@ -505,6 +509,8 @@ export interface OperationSpec {
     readonly urlParameters?: ReadonlyArray<OperationURLParameter>;
 }
 
+export { OperationTracingOptions }
+
 // @public
 export interface OperationURLParameter extends OperationParameter {
     skipEncoding?: boolean;
@@ -806,11 +812,11 @@ export interface SimpleMapperType {
     name: "Base64Url" | "Boolean" | "ByteArray" | "Date" | "DateTime" | "DateTimeRfc1123" | "Object" | "Stream" | "String" | "TimeSpan" | "UnixTime" | "Uuid" | "Number" | "any";
 }
 
-// @public @deprecated
-export interface SpanConfig {
-    namespace: string;
-    packagePrefix: string;
-}
+export { Span }
+
+export { SpanKind }
+
+export { SpanStatusCode }
 
 // @public
 export function stringifyXML(obj: unknown, opts?: SerializerOptions): string;

sdk/core/core-http/src/coreHttp.ts

@@ -113,8 +113,15 @@ export {
 export { URLBuilder, URLQuery } from "./url";
 export { AbortSignalLike } from "@azure/abort-controller";
 export { delay } from "./util/delay";
-// legacy exports. Use core-tracing instead (and remove on next major version update of core-http).
-export { createSpanFunction, SpanConfig } from "./createSpanLegacy";
+export {
+  Span,
+  SpanConfig,
+  SpanStatusCode,
+  createSpanFunction,
+  SpanKind,
+  CreateSpanFunctionArgs,
+  OperationTracingOptions
+} from "./util/tracing";
 
 // Credentials
 export { TokenCredential, GetTokenOptions, AccessToken, isTokenCredential } from "@azure/core-auth";

sdk/core/core-http/src/util/tracing.ts

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+export {
+  createSpanFunction,
+  CreateSpanFunctionArgs,
+  CreateSpanFunctionArgs as SpanConfig, // for backwards compatibility
+  Span,
+  SpanStatusCode,
+  SpanKind,
+  OperationTracingOptions
+} from "@azure/core-tracing";

sdk/core/core-lro/package.json

@@ -91,7 +91,6 @@
   "sideEffects": false,
   "dependencies": {
     "@azure/abort-controller": "^1.0.0",
-    "@azure/core-tracing": "1.0.0-preview.13",
     "@azure/logger": "^1.0.0",
     "tslib": "^2.2.0"
   },