Azure · richardpark-msft · Mar 29, 2021 · Mar 11, 2021 · Mar 26, 2021 · Mar 26, 2021
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/common/tools/dev-tool/src/config/rollup.base.config.ts b/common/tools/dev-tool/src/config/rollup.base.config.ts
@@ -15,6 +15,47 @@ interface PackageJson {
   devDependencies: Record<string, string>;
 }
 
+/**
+ * Gets the proper configuration needed for rollup's commonJS plugin for @opentelemetry/api.
+ *
+ * NOTE: this manual configuration is only needed because OpenTelemetry uses an
+ * __exportStar downleveled helper function to declare its exports which confuses
+ * rollup's automatic discovery mechanism.
+ *
+ * @returns an object reference that can be `...`'d into your cjs() configuration.
+ */
+export function openTelemetryCommonJs(): Record<string, string[]> {
+  const namedExports: Record<string, string[]> = {};
+
+  for (const key of ["@opentelemetry/api", "@azure/core-tracing/node_modules/@opentelemetry/api"]) {
+    namedExports[key] = [
+      "SpanKind",
+      "TraceFlags",
+      "getSpan",
+      "setSpan",
+      "SpanStatusCode",
+      "getSpanContext",
+      "setSpanContext"
+    ];
+  }
+
+  namedExports[
+    // working around a limitation in the rollup common.js plugin - it's not able to resolve these modules so the named exports listed above will not get applied. We have to drill down to the actual path.
+    "../../../common/temp/node_modules/.pnpm/@opentelemetry/[email protected]/node_modules/@opentelemetry/api/build/src/index.js"
+  ] = [
+    "SpanKind",
+    "TraceFlags",
+    "getSpan",
+    "setSpan",
+    "StatusCode",
+    "CanonicalCode",
+    "getSpanContext",
+    "setSpanContext"
+  ];
+
+  return namedExports;
+}
+
 // #region Warning Handler
 
 /**
@@ -80,9 +121,7 @@ function makeBrowserTestConfig() {
           // Chai's strange internal architecture makes it impossible to statically
           // analyze its exports.
           chai: ["version", "use", "util", "config", "expect", "should", "assert"],
-          // OpenTelemetry uses an __exportStar downleveled helper function to
-          // declare its exports, and so we have to add them here as well.
-          "@opentelemetry/api": ["CanonicalCode", "SpanKind", "TraceFlags"]
+          ...openTelemetryCommonJs()
         }
       }),
       json(),

diff --git a/sdk/anomalydetector/ai-anomaly-detector/package.json b/sdk/anomalydetector/ai-anomaly-detector/package.json
@@ -65,9 +65,8 @@
     "@azure/core-http": "^1.2.0",
     "@azure/core-auth": "^1.2.0",
     "@azure/logger": "^1.0.0",
-    "@opentelemetry/api": "^0.10.2",
     "tslib": "^2.0.0",
-    "@azure/core-tracing": "1.0.0-preview.10"
+    "@azure/core-tracing": "1.0.0-preview.11"
   },
   "devDependencies": {
     "@azure/dev-tool": "^1.0.0",

diff --git a/sdk/anomalydetector/ai-anomaly-detector/rollup.base.config.js b/sdk/anomalydetector/ai-anomaly-detector/rollup.base.config.js
@@ -8,6 +8,7 @@ import { terser } from "rollup-plugin-terser";
 import shim from "rollup-plugin-shim";
 import sourcemaps from "rollup-plugin-sourcemaps";
 import viz from "rollup-plugin-visualizer";
+import { openTelemetryCommonJs } from "@azure/dev-tool/shared-config/rollup";
 
 const pkg = require("./package.json");
 const depNames = Object.keys(pkg.dependencies);
@@ -101,7 +102,7 @@ export function browserConfig(test = false) {
       cjs({
         namedExports: {
           chai: ["assert"],
-          "@opentelemetry/api": ["CanonicalCode", "SpanKind", "TraceFlags"]
+          ...openTelemetryCommonJs()
         }
       }),
       viz({ filename: "dist-browser/browser-stats.html", sourcemap: false })

diff --git a/sdk/anomalydetector/ai-anomaly-detector/src/AnomalyDetectorClient.ts b/sdk/anomalydetector/ai-anomaly-detector/src/AnomalyDetectorClient.ts
@@ -27,7 +27,7 @@ import {
 import { createAnomalyDetectorAzureKeyCredentialPolicy } from "./azureKeyCredentialPolicy";
 import { logger } from "./logger";
 import { createSpan } from "./tracing";
-import { CanonicalCode } from "@opentelemetry/api";
+import { SpanStatusCode } from "@azure/core-tracing";
 
 export type DetectEntireSeriesOptions = OperationOptions;
 export type DetectLastPointOptions = OperationOptions;
@@ -125,7 +125,7 @@ export class AnomalyDetectorClient {
       return this.client.detectEntireSeries(body, finalOptions);
     } catch (error) {
       span.setStatus({
-        code: CanonicalCode.UNKNOWN,
+        code: SpanStatusCode.ERROR,
         message: error.message
       });
       throw error;
@@ -156,7 +156,7 @@ export class AnomalyDetectorClient {
       return this.client.detectLastPoint(body, finalOptions);
     } catch (error) {
       span.setStatus({
-        code: CanonicalCode.UNKNOWN,
+        code: SpanStatusCode.ERROR,
         message: error.message
       });
       throw error;
@@ -185,7 +185,7 @@ export class AnomalyDetectorClient {
       return this.client.detectChangePoint(body, finalOptions);
     } catch (error) {
       span.setStatus({
-        code: CanonicalCode.UNKNOWN,
+        code: SpanStatusCode.ERROR,
         message: error.message
       });
       throw error;

diff --git a/sdk/appconfiguration/app-configuration/package.json b/sdk/appconfiguration/app-configuration/package.json
@@ -89,8 +89,7 @@
     "@azure/core-asynciterator-polyfill": "^1.0.0",
     "@azure/core-http": "^1.2.0",
     "@azure/core-paging": "^1.1.1",
-    "@azure/core-tracing": "1.0.0-preview.10",
-    "@opentelemetry/api": "^0.10.2",
+    "@azure/core-tracing": "1.0.0-preview.11",
     "tslib": "^2.0.0"
   },
   "devDependencies": {

diff --git a/sdk/appconfiguration/app-configuration/rollup.base.config.js b/sdk/appconfiguration/app-configuration/rollup.base.config.js
@@ -8,6 +8,7 @@ import shim from "rollup-plugin-shim";
 import json from "@rollup/plugin-json";
 import * as path from "path";
 import inject from "@rollup/plugin-inject";
+import { openTelemetryCommonJs } from "@azure/dev-tool/shared-config/rollup";
 
 const pkg = require("./package.json");
 const depNames = Object.keys(pkg.dependencies);
@@ -123,7 +124,7 @@ export function browserConfig(test = false) {
           chai: ["assert", "expect", "use"],
           assert: ["ok", "equal", "strictEqual", "deepEqual", "fail", "throws", "notEqual"],
           events: ["EventEmitter"],
-          "@opentelemetry/api": ["CanonicalCode", "SpanKind", "TraceFlags"]
+          ...openTelemetryCommonJs()
         }
       }),
 

diff --git a/sdk/appconfiguration/app-configuration/src/internal/tracingHelpers.ts b/sdk/appconfiguration/app-configuration/src/internal/tracingHelpers.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Span, CanonicalCode } from "@opentelemetry/api";
+import { Span, SpanStatusCode } from "@azure/core-tracing";
 
 import { RestError, OperationOptions } from "@azure/core-http";
 import { createSpanFunction } from "@azure/core-tracing";
@@ -35,14 +35,13 @@ export async function trace<ReturnT>(
     // 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: CanonicalCode.OK
+      code: SpanStatusCode.OK
     });
     return result;
   } catch (err) {
     span.setStatus({
-      code: CanonicalCode.INTERNAL, // TODO: StatusCode.ERROR in otel 0.16+
+      code: SpanStatusCode.ERROR,
       message: err.message
     });
     throw err;

diff --git a/sdk/appconfiguration/app-configuration/test/internal/tracingHelpers.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/tracingHelpers.spec.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import { createSpan, trace } from "../../src/internal/tracingHelpers";
-import { Span, Status, CanonicalCode } from "@opentelemetry/api";
+import { Span, SpanStatus, SpanStatusCode } from "@azure/core-tracing";
 
 import * as assert from "assert";
 import sinon from "sinon";
@@ -12,7 +12,7 @@ import { OperationTracingOptions } from "@azure/core-tracing";
 
 describe("tracingHelpers", () => {
   it("trace OK", async () => {
-    let setStatusStub: sinon.SinonStub<[Status], Span> | undefined;
+    let setStatusStub: sinon.SinonStub<[SpanStatus], Span> | undefined;
     let endStub: sinon.SinonStub | undefined;
 
     const fakeCreateSpan = <
@@ -49,12 +49,12 @@ describe("tracingHelpers", () => {
 
     const [status] = setStatusStub!.args[0];
 
-    assert.equal(status.code, CanonicalCode.OK);
+    assert.equal(status.code, SpanStatusCode.OK);
     assert.equal(endStub?.called, true);
   });
 
   it("trace ERROR", async () => {
-    let setStatusStub: sinon.SinonStub<[Status], Span> | undefined;
+    let setStatusStub: sinon.SinonStub<[SpanStatus], Span> | undefined;
     let endStub: sinon.SinonStub | undefined;
 
     try {
@@ -96,7 +96,7 @@ describe("tracingHelpers", () => {
     assert.ok(setStatusStub, "setStatus should have been called");
     assert.equal(
       setStatusStub?.args[0][0].code,
-      CanonicalCode.INTERNAL,
+      SpanStatusCode.ERROR,
       "Any thrown exception causes the span status to be set to an error"
     );
 

diff --git a/sdk/attestation/attestation/package.json b/sdk/attestation/attestation/package.json
@@ -6,7 +6,7 @@
   "version": "1.0.0-beta.3",
   "dependencies": {
     "@azure/core-http": "^1.2.0",
-    "@azure/identity": "^1.1.0",
+    "@azure/core-tracing": "1.0.0-preview.11",
     "tslib": "^2.0.0"
   },
   "keywords": [
@@ -25,11 +25,11 @@
     "node": ">=8.0.0"
   },
   "devDependencies": {
+    "@azure/identity": "^1.1.0",
     "@azure/dev-tool": "^1.0.0",
     "@azure/eslint-plugin-azure-sdk": "^3.0.0",
     "@azure/test-utils-recorder": "^1.0.0",
     "@microsoft/api-extractor": "7.7.11",
-    "@opentelemetry/api": "^0.10.2",
     "@types/chai": "^4.1.6",
     "@types/chai-as-promised": "^7.1.0",
     "@types/jsrsasign": "^8.0.9",

diff --git a/sdk/communication/communication-chat/package.json b/sdk/communication/communication-chat/package.json
@@ -71,9 +71,8 @@
     "@azure/communication-signaling": "1.0.0-beta.3",
     "@azure/core-auth": "^1.2.0",
     "@azure/core-http": "^1.2.0",
-    "@azure/core-tracing": "1.0.0-preview.10",
+    "@azure/core-tracing": "1.0.0-preview.11",
     "@azure/logger": "^1.0.0",
-    "@opentelemetry/api": "^0.10.2",
     "events": "^3.0.0",
     "tslib": "^2.0.0",
     "@azure/core-paging": "^1.1.1"

diff --git a/sdk/communication/communication-chat/rollup.base.config.js b/sdk/communication/communication-chat/rollup.base.config.js
@@ -8,6 +8,7 @@ import { terser } from "rollup-plugin-terser";
 import sourcemaps from "rollup-plugin-sourcemaps";
 import viz from "rollup-plugin-visualizer";
 import shim from "rollup-plugin-shim";
+import { openTelemetryCommonJs } from "@azure/dev-tool/shared-config/rollup";
 
 const pkg = require("./package.json");
 const depNames = Object.keys(pkg.dependencies);
@@ -100,7 +101,7 @@ export function browserConfig(test = false) {
           chai: ["assert"],
           events: ["EventEmitter"],
           "@azure/communication-signaling": ["CommunicationSignalingClient", "SignalingClient"],
-          "@opentelemetry/api": ["CanonicalCode", "SpanKind", "TraceFlags"]
+          ...openTelemetryCommonJs()
         }
       }),
       viz({ filename: "dist-browser/browser-stats.html", sourcemap: false })

diff --git a/sdk/communication/communication-chat/src/chatClient.ts b/sdk/communication/communication-chat/src/chatClient.ts
@@ -29,7 +29,7 @@ import {
 } from "@azure/core-http";
 import "@azure/core-paging";
 import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { CanonicalCode } from "@opentelemetry/api";
+import { SpanStatusCode } from "@azure/core-tracing";
 import { createSpan } from "./tracing";
 import { ChatThreadClient } from "./chatThreadClient";
 import {
@@ -142,7 +142,7 @@ export class ChatClient {
       return mapToCreateChatThreadResultSdkModel(result);
     } catch (e) {
       span.setStatus({
-        code: CanonicalCode.UNKNOWN,
+        code: SpanStatusCode.ERROR,
         message: e.message
       });
       throw e;
@@ -209,7 +209,7 @@ export class ChatClient {
       };
     } catch (e) {
       span.setStatus({
-        code: CanonicalCode.UNKNOWN,
+        code: SpanStatusCode.ERROR,
         message: e.message
       });
       throw e;
@@ -236,7 +236,7 @@ export class ChatClient {
       );
     } catch (e) {
       span.setStatus({
-        code: CanonicalCode.UNKNOWN,
+        code: SpanStatusCode.ERROR,
         message: e.message
       });
       throw e;