[core-tracing] Update to OpenTelemetry 0.6

sdk/appconfiguration/app-configuration/package.json

@@ -74,12 +74,12 @@
     "@azure/core-asynciterator-polyfill": "^1.0.0",
     "@azure/core-http": "^1.0.0",
     "@azure/core-paging": "^1.1.0",
-    "@azure/core-tracing": "1.0.0-preview.7",
-    "@opentelemetry/types": "^0.2.0",
+    "@azure/core-tracing": "1.0.0-preview.8",
+    "@opentelemetry/api": "^0.5.1",
     "tslib": "^1.10.0"
   },
   "devDependencies": {
-    "@azure/identity": "1.1.0-preview1",
+    "@azure/identity": "1.1.0-preview.2",
     "@microsoft/api-extractor": "^7.5.4",
     "@rollup/plugin-commonjs": "^11.0.1",
     "@rollup/plugin-multi-entry": "^3.0.0",

sdk/appconfiguration/app-configuration/src/internal/tracingHelpers.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { getTracer } from "@azure/core-tracing";
-import { Span, SpanOptions, SpanKind, CanonicalCode } from "@opentelemetry/types";
+import { Span, SpanOptions, SpanKind, CanonicalCode } from "@opentelemetry/api";
 
 import { RestError } from "@azure/core-http";
 

sdk/appconfiguration/app-configuration/test/tracingHelpers.spec.ts

@@ -4,7 +4,7 @@
 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 { SpanOptions, SpanKind, CanonicalCode } from "@opentelemetry/api";
 import * as assert from "assert";
 
 interface FakeOptions {

sdk/core/core-amqp/package.json

@@ -76,7 +76,7 @@
   },
   "devDependencies": {
     "@azure/eslint-plugin-azure-sdk": "^2.0.1",
-    "@azure/identity": "1.1.0-preview1",
+    "@azure/identity": "1.1.0-preview.2",
     "@rollup/plugin-commonjs": "^11.0.1",
     "@rollup/plugin-inject": "^4.0.0",
     "@rollup/plugin-json": "^4.0.0",

sdk/core/core-auth/package.json

@@ -56,8 +56,8 @@
   "sideEffects": false,
   "dependencies": {
     "@azure/abort-controller": "^1.0.0",
-    "@azure/core-tracing": "1.0.0-preview.7",
-    "@opentelemetry/types": "^0.2.0",
+    "@azure/core-tracing": "1.0.0-preview.8",
+    "@opentelemetry/api": "^0.5.1",
     "tslib": "^1.10.0"
   },
   "devDependencies": {

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 '@opentelemetry/api';
 
 export { AbortSignalLike }
 

sdk/core/core-auth/src/operationOptions.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { AbortSignalLike } from "@azure/abort-controller";
-import { SpanOptions } from "@opentelemetry/types";
+import { SpanOptions } from "@opentelemetry/api";
 
 /**
  * The base options type for all operations.

sdk/core/core-http/package.json

@@ -128,9 +128,9 @@
   "dependencies": {
     "@azure/abort-controller": "^1.0.0",
     "@azure/core-auth": "^1.0.0",
-    "@azure/core-tracing": "1.0.0-preview.7",
+    "@azure/core-tracing": "1.0.0-preview.8",
     "@azure/logger": "^1.0.0",
-    "@opentelemetry/types": "^0.2.0",
+    "@opentelemetry/api": "^0.5.1",
     "@types/node-fetch": "^2.5.0",
     "@types/tunnel": "^0.0.1",
     "cross-env": "^6.0.3",

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 })

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

@@ -1,5 +1,5 @@
 import { AbortSignalLike } from "@azure/abort-controller";
-import { SpanOptions } from "@opentelemetry/types";
+import { SpanOptions } from "@opentelemetry/api";
 import { TransferProgressEvent, RequestOptionsBase } from "./webResource";
 
 /**

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,

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 "@opentelemetry/api";
 
 export type HttpMethods =
   | "GET"

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();

sdk/core/core-lro/package.json

@@ -96,13 +96,13 @@
   "dependencies": {
     "@azure/abort-controller": "^1.0.0",
     "@azure/core-http": "^1.0.0",
-    "@opentelemetry/types": "^0.2.0",
+    "@opentelemetry/api": "^0.5.1",
     "events": "^3.0.0",
     "tslib": "^1.10.0"
   },
   "devDependencies": {
     "@azure/core-arm": "1.0.0-preview.7",
-    "@azure/identity": "1.1.0-preview1",
+    "@azure/identity": "1.1.0-preview.2",
     "@microsoft/api-extractor": "^7.5.4",
     "@rollup/plugin-commonjs": "^11.0.1",
     "@rollup/plugin-multi-entry": "^3.0.0",

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"]
         }
       })
     ]

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.5 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)
 

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.5.1",
     "tslib": "^1.10.0"
   },
   "devDependencies": {

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 { Span } from '@opentelemetry/api';
+import { SpanContext } from '@opentelemetry/api';
+import { SpanKind } from '@opentelemetry/api';
+import { SpanOptions } 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
@@ -42,10 +40,7 @@ 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;
     withSpan<T extends (...args: unknown[]) => ReturnType<T>>(_span: Span, fn: T): ReturnType<T>;
 }
@@ -73,11 +68,8 @@ 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;
     withSpan<T extends (...args: unknown[]) => unknown>(_span: Span, _fn: T): ReturnType<T>;
 }

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"]
         }
       }),

sdk/core/core-tracing/src/tracerProxy.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { NoOpTracer } from "./tracers/noop/noOpTracer";
-import { Tracer } from "@opentelemetry/types";
+import { Tracer } from "@opentelemetry/api";
 import { getCache } from "./utils/cache";
 
 let defaultTracer: Tracer;

sdk/core/core-tracing/src/tracers/noop/noOpSpan.ts

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import { Span, SpanContext, Attributes, Status } from "@opentelemetry/types";
+import { Span, SpanContext, Attributes, Status, TraceFlags } from "@opentelemetry/api";
 
 /**
  * A no-op implementation of Span that can safely be used without side-effects.
@@ -12,7 +12,8 @@ export class NoOpSpan implements Span {
   context(): SpanContext {
     return {
       spanId: "",
-      traceId: ""
+      traceId: "",
+      traceFlags: TraceFlags.NONE
     };
   }
 

sdk/core/core-tracing/src/tracers/noop/noOpTracer.ts

@@ -1,9 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import { NoOpSpan } from "./noOpSpan";
-import { BinaryFormat, HttpTextFormat, Tracer, Span, SpanOptions } from "@opentelemetry/types";
-import { NoOpBinaryFormat } from "./noOpBinaryFormat";
-import { NoOpHttpTextFormat } from "./noOpHttpTextFormat";
+import { Tracer, Span, SpanOptions } from "@opentelemetry/api";
 
 /**
  * A no-op implementation of Tracer that can be used when tracing
@@ -43,26 +41,4 @@ export class NoOpTracer implements Tracer {
   bind<T>(target: T, _span?: Span): T {
     return target;
   }
-
-  /**
-   * Send a pre-populated Span object to the exporter.
-   * @param _span The span to pass along.
-   */
-  recordSpanData(_span: Span): void {
-    /* NOOP */
-  }
-
-  /**
-   * Returns the BinaryFormat interface for serializing/deserializing Spans.
-   */
-  getBinaryFormat(): BinaryFormat {
-    return new NoOpBinaryFormat();
-  }
-
-  /**
-   * Returns the HttpTextFormat interface for injecting/extracting Spans.
-   */
-  getHttpTextFormat(): HttpTextFormat {
-    return new NoOpHttpTextFormat();
-  }
 }

sdk/core/core-tracing/src/tracers/opencensus/openCensusSpanWrapper.ts

@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import { SpanContext, Span, SpanOptions, Attributes, Status } from "@opentelemetry/types";
+import { SpanContext, Span, SpanOptions, Attributes, Status, TraceFlags } from "@opentelemetry/api";
 import { OpenCensusTraceStateWrapper } from "./openCensusTraceStateWrapper";
 import { OpenCensusTracerWrapper } from "./openCensusTracerWrapper";
 import { Attributes as OpenCensusAttributes, Span as OpenCensusSpan } from "@opencensus/web-types";
 
-function isWrappedSpan(span?: Span | SpanContext): span is OpenCensusSpanWrapper {
+function isWrappedSpan(span?: Span | SpanContext | null): span is OpenCensusSpanWrapper {
   return !!span && (span as OpenCensusSpanWrapper).getWrappedSpan !== undefined;
 }
 
@@ -56,8 +56,8 @@ export class OpenCensusSpanWrapper implements Span {
         for (const link of options.links) {
           // Since there is no way to set the link relationship, leave it as Unspecified.
           this._span.addLink(
-            link.spanContext.traceId,
-            link.spanContext.spanId,
+            link.context.traceId,
+            link.context.spanId,
             0 /* LinkType.UNSPECIFIED */,
             link.attributes as OpenCensusAttributes
           );
@@ -86,7 +86,7 @@ export class OpenCensusSpanWrapper implements Span {
     return {
       spanId: openCensusSpanContext.spanId,
       traceId: openCensusSpanContext.traceId,
-      traceFlags: openCensusSpanContext.options,
+      traceFlags: openCensusSpanContext.options as TraceFlags,
       traceState: new OpenCensusTraceStateWrapper(openCensusSpanContext.traceState)
     };
   }

sdk/core/core-tracing/src/tracers/opencensus/openCensusTraceStateWrapper.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { TraceState } from "@opentelemetry/types";
+import { TraceState } from "@opentelemetry/api";
 
 /**
  * @ignore