Azure · xirzec · Apr 23, 2020 · Mar 24, 2020 · Mar 24, 2020 · Mar 24, 2020
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/dataplane.code-workspace b/dataplane.code-workspace
@@ -51,6 +51,10 @@
     {
       "path": "sdk\\eventhub\\event-processor-host"
     },
+    {
+      "path": "sdk\\formrecognizer\\ai-form-recognizer",
+      "name": "form-recognizer"
+    },
     {
       "path": "sdk\\eventhub\\testhub"
     },

diff --git a/sdk/appconfiguration/app-configuration/package.json b/sdk/appconfiguration/app-configuration/package.json
@@ -72,10 +72,10 @@
   },
   "dependencies": {
     "@azure/core-asynciterator-polyfill": "^1.0.0",
-    "@azure/core-http": "^1.0.0",
+    "@azure/core-http": "^1.1.1",
     "@azure/core-paging": "^1.1.0",
     "@azure/core-tracing": "1.0.0-preview.8",
-    "@opentelemetry/types": "^0.2.0",
+    "@opentelemetry/api": "^0.6.1",
     "tslib": "^1.10.0"
   },
   "devDependencies": {

diff --git a/sdk/appconfiguration/app-configuration/src/internal/tracingHelpers.ts b/sdk/appconfiguration/app-configuration/src/internal/tracingHelpers.ts
@@ -2,7 +2,8 @@
 // Licensed under the MIT License.
 
 import { getTracer } from "@azure/core-tracing";
-import { Span, SpanOptions, SpanKind, CanonicalCode } from "@opentelemetry/types";
+import { Span, SpanKind, CanonicalCode } from "@opentelemetry/api";
+import { SpanOptions } from "@azure/core-tracing";
 
 import { RestError } from "@azure/core-http";
 
@@ -90,7 +91,7 @@ export class Spanner<TClient> {
       ...options,
       spanOptions: {
         ...spanOptions,
-        parent: span,
+        parent: span.context(),
         attributes: {
           ...spanOptions.attributes,
           "az.namespace": "Microsoft.AppConfiguration"

diff --git a/sdk/appconfiguration/app-configuration/test/tracingHelpers.spec.ts b/sdk/appconfiguration/app-configuration/test/tracingHelpers.spec.ts
@@ -4,7 +4,9 @@
 import { Spanner } from "../src/internal/tracingHelpers";
 import { RestError } from "@azure/core-http";
 import { getTracer } from "@azure/core-tracing";
-import { SpanOptions, SpanKind, CanonicalCode } from "@opentelemetry/types";
+import { SpanKind, CanonicalCode } from "@opentelemetry/api";
+import { SpanOptions } from "@azure/core-tracing";
+
 import * as assert from "assert";
 
 interface FakeOptions {
@@ -17,7 +19,6 @@ describe("tracingHelpers", () => {
     const fakeOptions: FakeOptions = {
       name: "fakeName",
       spanOptions: {
-        kind: SpanKind.PRODUCER,
         attributes: {
           testAttribute: "testAttributeValue"
         }
@@ -31,8 +32,7 @@ describe("tracingHelpers", () => {
     const newOptions = Spanner["addParentToOptions"](fakeOptions, parentSpan);
 
     assert.equal("fakeName", newOptions.name);
-    assert.equal(parentSpan, newOptions.spanOptions.parent);
-    assert.equal(SpanKind.PRODUCER, newOptions.spanOptions.kind);
+    assert.deepEqual(parentSpan.context(), newOptions.spanOptions.parent);
     assert.ok(newOptions.spanOptions.attributes, "Should have attributes set");
     if (newOptions.spanOptions.attributes) {
       assert.equal("Microsoft.AppConfiguration", newOptions.spanOptions.attributes["az.namespace"]);

diff --git a/sdk/core/core-arm/package.json b/sdk/core/core-arm/package.json
@@ -99,7 +99,7 @@
     ]
   },
   "dependencies": {
-    "@azure/core-http": "^1.0.0",
+    "@azure/core-http": "^1.1.1",
     "tslib": "^1.10.0"
   },
   "devDependencies": {

diff --git a/sdk/core/core-auth/package.json b/sdk/core/core-auth/package.json
@@ -66,7 +66,7 @@
   "dependencies": {
     "@azure/abort-controller": "^1.0.0",
     "@azure/core-tracing": "1.0.0-preview.8",
-    "@opentelemetry/types": "^0.2.0",
+    "@opentelemetry/api": "^0.6.1",
     "tslib": "^1.10.0"
   },
   "devDependencies": {

diff --git a/sdk/core/core-auth/review/core-auth.api.md b/sdk/core/core-auth/review/core-auth.api.md
@@ -5,7 +5,7 @@
 ```ts
 
 import { AbortSignalLike } from '@azure/abort-controller';
-import { SpanOptions } from '@opentelemetry/types';
+import { SpanOptions } from '@azure/core-tracing';
 
 // @public
 export interface AccessToken {

diff --git a/sdk/core/core-auth/src/tokenCredential.ts b/sdk/core/core-auth/src/tokenCredential.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { AbortSignalLike } from "@azure/abort-controller";
-import { SpanOptions } from "@opentelemetry/types";
+import { SpanOptions } from "@azure/core-tracing";
 
 /**
  * Represents a credential capable of providing an authentication token.

diff --git a/sdk/core/core-http/package.json b/sdk/core/core-http/package.json
@@ -130,7 +130,7 @@
     "@azure/core-auth": "^1.1.2",
     "@azure/core-tracing": "1.0.0-preview.8",
     "@azure/logger": "^1.0.0",
-    "@opentelemetry/types": "^0.2.0",
+    "@opentelemetry/api": "^0.6.1",
     "@types/node-fetch": "^2.5.0",
     "@types/tunnel": "^0.0.1",
     "cross-env": "^6.0.3",

diff --git a/sdk/core/core-http/rollup.base.config.js b/sdk/core/core-http/rollup.base.config.js
@@ -87,7 +87,7 @@ export function browserConfig(test = false, production = false) {
         namedExports: {
           chai: ["assert", "AssertionError", "should", "expect"],
           events: ["EventEmitter"],
-          "@opentelemetry/types": ["CanonicalCode", "SpanKind", "TraceFlags"]
+          "@opentelemetry/api": ["CanonicalCode", "SpanKind", "TraceFlags"]
         }
       }),
       viz({ filename: "dist-browser/browser-stats.html", sourcemap: false })

diff --git a/sdk/core/core-http/src/policies/tracingPolicy.ts b/sdk/core/core-http/src/policies/tracingPolicy.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { getTracer, getTraceParentHeader } from "@azure/core-tracing";
-import { SpanOptions, SpanKind } from "@opentelemetry/types";
+import { SpanOptions, SpanKind } from "@opentelemetry/api";
 import {
   RequestPolicyFactory,
   RequestPolicy,

diff --git a/sdk/core/core-http/src/webResource.ts b/sdk/core/core-http/src/webResource.ts
@@ -9,7 +9,7 @@ import { HttpOperationResponse } from "./httpOperationResponse";
 import { OperationResponse } from "./operationResponse";
 import { ProxySettings } from "./serviceClient";
 import { AbortSignalLike } from "@azure/abort-controller";
-import { SpanOptions } from "@opentelemetry/types";
+import { SpanOptions } from "@azure/core-tracing";
 
 export type HttpMethods =
   | "GET"

diff --git a/sdk/core/core-http/test/policies/tracingPolicyTests.ts b/sdk/core/core-http/test/policies/tracingPolicyTests.ts
@@ -9,7 +9,7 @@ import {
   HttpHeaders,
   RequestPolicyOptions
 } from "../../src/coreHttp";
-import { SpanOptions, SpanContext, TraceFlags } from "@opentelemetry/types";
+import { SpanOptions, SpanContext, TraceFlags } from "@opentelemetry/api";
 import { setTracer, NoOpTracer, NoOpSpan } from "@azure/core-tracing";
 import { tracingPolicy } from "../../src/policies/tracingPolicy";
 
@@ -60,7 +60,7 @@ class MockTracer extends NoOpTracer {
   constructor(
     private traceId = "",
     private spanId = "",
-    private flags = TraceFlags.UNSAMPLED,
+    private flags = TraceFlags.NONE,
     private state = ""
   ) {
     super();
@@ -114,7 +114,7 @@ describe("tracingPolicy", function() {
     setTracer(mockTracer);
     const request = new WebResource();
     request.spanOptions = {
-      parent: ROOT_SPAN
+      parent: ROOT_SPAN.context()
     };
     const policy = tracingPolicy().create(mockPolicy, new RequestPolicyOptions());
     await policy.sendRequest(request);
@@ -141,7 +141,7 @@ describe("tracingPolicy", function() {
     setTracer(mockTracer);
     const request = new WebResource();
     request.spanOptions = {
-      parent: ROOT_SPAN
+      parent: ROOT_SPAN.context()
     };
     const policy = tracingPolicy().create(mockPolicy, new RequestPolicyOptions());
     await policy.sendRequest(request);
@@ -168,7 +168,7 @@ describe("tracingPolicy", function() {
     setTracer(mockTracer);
     const request = new WebResource();
     request.spanOptions = {
-      parent: ROOT_SPAN
+      parent: ROOT_SPAN.context()
     };
     const policy = tracingPolicy().create(mockPolicy, new RequestPolicyOptions());
     await policy.sendRequest(request);
@@ -195,7 +195,7 @@ describe("tracingPolicy", function() {
     setTracer(mockTracer);
     const request = new WebResource();
     request.spanOptions = {
-      parent: ROOT_SPAN
+      parent: ROOT_SPAN.context()
     };
     const policy = tracingPolicy().create(
       {
@@ -233,7 +233,7 @@ describe("tracingPolicy", function() {
     setTracer(new NoOpTracer());
     const request = new WebResource();
     request.spanOptions = {
-      parent: ROOT_SPAN
+      parent: ROOT_SPAN.context()
     };
     const policy = tracingPolicy().create(mockPolicy, new RequestPolicyOptions());
     await policy.sendRequest(request);

diff --git a/sdk/core/core-lro/package.json b/sdk/core/core-lro/package.json
@@ -95,12 +95,12 @@
   "sideEffects": false,
   "dependencies": {
     "@azure/abort-controller": "^1.0.0",
-    "@azure/core-http": "^1.0.0",
+    "@azure/core-http": "^1.1.1",
     "events": "^3.0.0",
     "tslib": "^1.10.0"
   },
   "devDependencies": {
-    "@opentelemetry/types": "^0.2.0",
+    "@opentelemetry/api": "^0.6.1",
     "@microsoft/api-extractor": "7.7.11",
     "@rollup/plugin-commonjs": "^11.0.1",
     "@rollup/plugin-multi-entry": "^3.0.0",

diff --git a/sdk/core/core-lro/rollup.base.config.js b/sdk/core/core-lro/rollup.base.config.js
@@ -119,7 +119,7 @@ export function browserConfig(test = false) {
       cjs({
         namedExports: {
           assert: ["ok", "equal", "strictEqual"],
-          "@opentelemetry/types": ["CanonicalCode", "SpanKind", "TraceFlags"]
+          "@opentelemetry/api": ["CanonicalCode", "SpanKind", "TraceFlags"]
         }
       })
     ]

diff --git a/sdk/core/core-tracing/CHANGELOG.md b/sdk/core/core-tracing/CHANGELOG.md
@@ -3,6 +3,11 @@
 ## 1.0.0-preview.8 (Unreleased)
 
 - Update `TestSpan` to allow setting span attributes [PR link](https://github.com/Azure/azure-sdk-for-js/pull/6565).
+- [BREAKING] Migrate to OpenTelemetry 0.6 using the new `@opentelemetry/api` package. There were a few breaking changes:
+  - `SpanContext` now requires traceFlags to be set.
+  - `Tracer` has removed `recordSpanData`, `getBinaryFormat`, and `getHttpTextFormat`.
+  - `Tracer.getCurrentSpan` returns `undefined` instead of `null` when unset.
+  - `Link` objects renamed `spanContext` property to `context`.
 
 ## 1.0.0-preview.7 (2019-12-03)
 

diff --git a/sdk/core/core-tracing/package.json b/sdk/core/core-tracing/package.json
@@ -59,7 +59,7 @@
   "sideEffects": false,
   "dependencies": {
     "@opencensus/web-types": "0.0.7",
-    "@opentelemetry/types": "^0.2.0",
+    "@opentelemetry/api": "^0.6.1",
     "tslib": "^1.10.0"
   },
   "devDependencies": {

diff --git a/sdk/core/core-tracing/review/core-tracing.api.md b/sdk/core/core-tracing/review/core-tracing.api.md
@@ -4,18 +4,16 @@
 
 ```ts
 
-import { Attributes } from '@opentelemetry/types';
-import { BinaryFormat } from '@opentelemetry/types';
-import { HttpTextFormat } from '@opentelemetry/types';
+import { Attributes } from '@opentelemetry/api';
 import { Span as OpenCensusSpan } from '@opencensus/web-types';
 import { Tracer as OpenCensusTracer } from '@opencensus/web-types';
-import { Span } from '@opentelemetry/types';
-import { SpanContext } from '@opentelemetry/types';
-import { SpanKind } from '@opentelemetry/types';
-import { SpanOptions } from '@opentelemetry/types';
-import { Status } from '@opentelemetry/types';
-import { TimeInput } from '@opentelemetry/types';
-import { Tracer } from '@opentelemetry/types';
+import { SpanContext as OTSpanContext } from '@opentelemetry/api';
+import { SpanOptions as OTSpanOptions } from '@opentelemetry/api';
+import { Span } from '@opentelemetry/api';
+import { SpanKind } from '@opentelemetry/api';
+import { Status } from '@opentelemetry/api';
+import { TimeInput } from '@opentelemetry/api';
+import { Tracer } from '@opentelemetry/api';
 import { TracerBase } from '@opencensus/web-types';
 
 // @public
@@ -30,7 +28,7 @@ export function getTracer(): Tracer;
 // @public
 export class NoOpSpan implements Span {
     addEvent(_name: string, _attributes?: Attributes): this;
-    context(): SpanContext;
+    context(): OTSpanContext;
     end(_endTime?: number): void;
     isRecording(): boolean;
     setAttribute(_key: string, _value: unknown): this;
@@ -42,11 +40,8 @@ export class NoOpSpan implements Span {
 // @public
 export class NoOpTracer implements Tracer {
     bind<T>(target: T, _span?: Span): T;
-    getBinaryFormat(): BinaryFormat;
     getCurrentSpan(): Span;
-    getHttpTextFormat(): HttpTextFormat;
-    recordSpanData(_span: Span): void;
-    startSpan(_name: string, _options?: SpanOptions): Span;
+    startSpan(_name: string, _options?: OTSpanOptions): Span;
     withSpan<T extends (...args: unknown[]) => ReturnType<T>>(_span: Span, fn: T): ReturnType<T>;
 }
 
@@ -55,9 +50,9 @@ export { OpenCensusSpan }
 // @public
 export class OpenCensusSpanWrapper implements Span {
     constructor(span: OpenCensusSpan);
-    constructor(tracer: OpenCensusTracerWrapper, name: string, options?: SpanOptions);
+    constructor(tracer: OpenCensusTracerWrapper, name: string, options?: OTSpanOptions);
     addEvent(_name: string, _attributes?: Attributes): this;
-    context(): SpanContext;
+    context(): OTSpanContext;
     end(_endTime?: number): void;
     getWrappedSpan(): OpenCensusSpan;
     isRecording(): boolean;
@@ -73,12 +68,9 @@ export { OpenCensusTracer }
 export class OpenCensusTracerWrapper implements Tracer {
     constructor(tracer: TracerBase);
     bind<T>(_target: T, _span?: Span): T;
-    getBinaryFormat(): BinaryFormat;
-    getCurrentSpan(): Span | null;
-    getHttpTextFormat(): HttpTextFormat;
+    getCurrentSpan(): Span | undefined;
     getWrappedTracer(): TracerBase;
-    recordSpanData(_span: Span): void;
-    startSpan(name: string, options?: SpanOptions): Span;
+    startSpan(name: string, options?: OTSpanOptions): Span;
     withSpan<T extends (...args: unknown[]) => unknown>(_span: Span, _fn: T): ReturnType<T>;
 }
 
@@ -87,9 +79,20 @@ export interface OperationTracingOptions {
     spanOptions?: SpanOptions;
 }
 
+export { OTSpanContext }
+
+export { OTSpanOptions }
+
 // @public
 export function setTracer(tracer: Tracer): void;
 
+// @public
+export interface SpanContext {
+    spanId: string;
+    traceFlags: number;
+    traceId: string;
+}
+
 // @public
 export interface SpanGraph {
     roots: SpanGraphNode[];
@@ -101,11 +104,19 @@ export interface SpanGraphNode {
     name: string;
 }
 
+// @public
+export interface SpanOptions {
+    attributes?: {
+        [key: string]: unknown;
+    };
+    parent?: SpanContext | null;
+}
+
 // @public
 export class TestSpan extends NoOpSpan {
-    constructor(parentTracer: TestTracer, name: string, context: SpanContext, kind: SpanKind, parentSpanId?: string, startTime?: TimeInput);
+    constructor(parentTracer: TestTracer, name: string, context: OTSpanContext, kind: SpanKind, parentSpanId?: string, startTime?: TimeInput);
     readonly attributes: Attributes;
-    context(): SpanContext;
+    context(): OTSpanContext;
     end(_endTime?: number): void;
     endCalled: boolean;
     isRecording(): boolean;
@@ -126,9 +137,15 @@ export class TestTracer extends NoOpTracer {
     getKnownSpans(): TestSpan[];
     getRootSpans(): TestSpan[];
     getSpanGraph(traceId: string): SpanGraph;
-    startSpan(name: string, options?: SpanOptions): TestSpan;
+    startSpan(name: string, options?: OTSpanOptions): TestSpan;
     }
 
+// @public
+export const enum TraceFlags {
+    NONE = 0,
+    SAMPLED = 1
+}
+
 
 // (No @packageDocumentation comment for this package)
 

diff --git a/sdk/core/core-tracing/rollup.base.config.js b/sdk/core/core-tracing/rollup.base.config.js
@@ -82,7 +82,7 @@ export function browserConfig(test = false) {
       }),
       cjs({
         namedExports: {
-          "@opentelemetry/types": ["CanonicalCode", "SpanKind", "TraceFlags"],
+          "@opentelemetry/api": ["CanonicalCode", "SpanKind", "TraceFlags"],
           assert: ["ok", "fail", "equal", "deepEqual", "deepStrictEqual", "strictEqual"]
         }
       }),