rebase and fix conflicts

Azure · Aug 25, 2021 · 4932703 · 4932703
1 parent 0d2ec9b
commit 4932703
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/sdk/communication/communication-chat/src/chatClient.ts b/sdk/communication/communication-chat/src/chatClient.ts
@@ -21,7 +21,7 @@ import {
 } from "@azure/communication-signaling";
 import { getSignalingClient } from "./signaling/signalingClient";
 import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { SpanStatusCode } from "@azure/core-http";
+import { SpanStatusCode } from "@azure/core-client";
 import { createSpan } from "./tracing";
 import { ChatThreadClient } from "./chatThreadClient";
 import {

diff --git a/sdk/communication/communication-chat/src/chatThreadClient.ts b/sdk/communication/communication-chat/src/chatThreadClient.ts
@@ -8,7 +8,7 @@ import {
   serializeCommunicationIdentifier
 } from "@azure/communication-common";
 import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { SpanStatusCode } from "@azure/core-http";
+import { SpanStatusCode } from "@azure/core-client";
 import { createSpan } from "./tracing";
 import {
   SendReadReceiptRequest,

diff --git a/sdk/communication/communication-chat/src/tracing.ts b/sdk/communication/communication-chat/src/tracing.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { createSpanFunction } from "@azure/core-http";
+import { createSpanFunction } from "@azure/core-client";
 
 /**
  * Creates a span using the global tracer.

diff --git a/sdk/storage/storage-blob-changefeed/test/blobchangefeedclient.spec.ts b/sdk/storage/storage-blob-changefeed/test/blobchangefeedclient.spec.ts
@@ -9,7 +9,7 @@ import { AbortController } from "@azure/abort-controller";
 import { setTracer } from "@azure/test-utils";
 import { Pipeline } from "@azure/storage-blob";
 import { SDK_VERSION } from "../src/utils/constants";
-import { setSpan, context } from "@azure/core-http";
+import { setSpan, tracingContext } from "@azure/test-utils";
 
 import * as dotenv from "dotenv";
 dotenv.config();
@@ -163,7 +163,7 @@ describe("BlobChangeFeedClient", async () => {
 
     const pageIter = changeFeedClient.listChanges({
       tracingOptions: {
-        tracingContext: setSpan(context.active(), rootSpan)
+        tracingContext: setSpan(tracingContext.active(), rootSpan)
       }
     });
     await pageIter.next();