@azure/communication-chat 1.2.1 → 1.2.3-alpha.20220815.1

package/dist/index.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var communicationCommon = require('@azure/communication-common');
 var logger$1 = require('@azure/logger');
-var coreTracing = require('@azure/core-tracing');
 var coreRestPipeline = require('@azure/core-rest-pipeline');
+var coreTracing = require('@azure/core-tracing');
 var coreClient = require('@azure/core-client');
 var events = require('events');
 var uuid = require('uuid');
@@ -129,6 +129,19 @@ const mapToReadReceiptSdkModel = (readReceipt) => {
     return Object.assign(Object.assign({}, rest), { sender: communicationCommon.deserializeCommunicationIdentifier(senderCommunicationIdentifier) });
 };
 
+/*
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is regenerated.
+ */
+const tracingClient = coreTracing.createTracingClient({
+    namespace: "Azure.Communication",
+    packageName: "@azure/communication-chat",
+    packageVersion: "1.2.3"
+});
+
 /*
  * Copyright (c) Microsoft Corporation.
  * Licensed under the MIT License.
@@ -1096,8 +1109,10 @@ class ChatThreadImpl {
      * @param chatThreadId Thread id to get the chat message read receipts for.
      * @param options The options parameters.
      */
-    listChatReadReceipts(chatThreadId, options) {
-        return this.client.sendOperationRequest({ chatThreadId, options }, listChatReadReceiptsOperationSpec);
+    async listChatReadReceipts(chatThreadId, options) {
+        return tracingClient.withSpan("ChatApiClient.listChatReadReceipts", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, options }, listChatReadReceiptsOperationSpec);
+        });
     }
     /**
      * Sends a read receipt event to a thread, on behalf of a user.
@@ -1105,8 +1120,10 @@ class ChatThreadImpl {
      * @param sendReadReceiptRequest Read receipt details.
      * @param options The options parameters.
      */
-    sendChatReadReceipt(chatThreadId, sendReadReceiptRequest, options) {
-        return this.client.sendOperationRequest({ chatThreadId, sendReadReceiptRequest, options }, sendChatReadReceiptOperationSpec);
+    async sendChatReadReceipt(chatThreadId, sendReadReceiptRequest, options) {
+        return tracingClient.withSpan("ChatApiClient.sendChatReadReceipt", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, sendReadReceiptRequest, options }, sendChatReadReceiptOperationSpec);
+        });
     }
     /**
      * Sends a message to a thread.
@@ -1114,16 +1131,20 @@ class ChatThreadImpl {
      * @param sendChatMessageRequest Details of the message to send.
      * @param options The options parameters.
      */
-    sendChatMessage(chatThreadId, sendChatMessageRequest, options) {
-        return this.client.sendOperationRequest({ chatThreadId, sendChatMessageRequest, options }, sendChatMessageOperationSpec);
+    async sendChatMessage(chatThreadId, sendChatMessageRequest, options) {
+        return tracingClient.withSpan("ChatApiClient.sendChatMessage", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, sendChatMessageRequest, options }, sendChatMessageOperationSpec);
+        });
     }
     /**
      * Gets a list of messages from a thread.
      * @param chatThreadId The thread id of the message.
      * @param options The options parameters.
      */
-    listChatMessages(chatThreadId, options) {
-        return this.client.sendOperationRequest({ chatThreadId, options }, listChatMessagesOperationSpec);
+    async listChatMessages(chatThreadId, options) {
+        return tracingClient.withSpan("ChatApiClient.listChatMessages", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, options }, listChatMessagesOperationSpec);
+        });
     }
     /**
      * Gets a message by id.
@@ -1131,8 +1152,10 @@ class ChatThreadImpl {
      * @param chatMessageId The message id.
      * @param options The options parameters.
      */
-    getChatMessage(chatThreadId, chatMessageId, options) {
-        return this.client.sendOperationRequest({ chatThreadId, chatMessageId, options }, getChatMessageOperationSpec);
+    async getChatMessage(chatThreadId, chatMessageId, options) {
+        return tracingClient.withSpan("ChatApiClient.getChatMessage", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, chatMessageId, options }, getChatMessageOperationSpec);
+        });
     }
     /**
      * Updates a message.
@@ -1141,8 +1164,10 @@ class ChatThreadImpl {
      * @param updateChatMessageRequest Details of the request to update the message.
      * @param options The options parameters.
      */
-    updateChatMessage(chatThreadId, chatMessageId, updateChatMessageRequest, options) {
-        return this.client.sendOperationRequest({ chatThreadId, chatMessageId, updateChatMessageRequest, options }, updateChatMessageOperationSpec);
+    async updateChatMessage(chatThreadId, chatMessageId, updateChatMessageRequest, options) {
+        return tracingClient.withSpan("ChatApiClient.updateChatMessage", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, chatMessageId, updateChatMessageRequest, options }, updateChatMessageOperationSpec);
+        });
     }
     /**
      * Deletes a message.
@@ -1150,16 +1175,20 @@ class ChatThreadImpl {
      * @param chatMessageId The message id.
      * @param options The options parameters.
      */
-    deleteChatMessage(chatThreadId, chatMessageId, options) {
-        return this.client.sendOperationRequest({ chatThreadId, chatMessageId, options }, deleteChatMessageOperationSpec);
+    async deleteChatMessage(chatThreadId, chatMessageId, options) {
+        return tracingClient.withSpan("ChatApiClient.deleteChatMessage", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, chatMessageId, options }, deleteChatMessageOperationSpec);
+        });
     }
     /**
      * Gets the participants of a thread.
      * @param chatThreadId Thread id to get participants for.
      * @param options The options parameters.
      */
-    listChatParticipants(chatThreadId, options) {
-        return this.client.sendOperationRequest({ chatThreadId, options }, listChatParticipantsOperationSpec);
+    async listChatParticipants(chatThreadId, options) {
+        return tracingClient.withSpan("ChatApiClient.listChatParticipants", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, options }, listChatParticipantsOperationSpec);
+        });
     }
     /**
      * Remove a participant from a thread.
@@ -1167,8 +1196,10 @@ class ChatThreadImpl {
      * @param participantCommunicationIdentifier Id of the thread participant to remove from the thread.
      * @param options The options parameters.
      */
-    removeChatParticipant(chatThreadId, participantCommunicationIdentifier, options) {
-        return this.client.sendOperationRequest({ chatThreadId, participantCommunicationIdentifier, options }, removeChatParticipantOperationSpec);
+    async removeChatParticipant(chatThreadId, participantCommunicationIdentifier, options) {
+        return tracingClient.withSpan("ChatApiClient.removeChatParticipant", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, participantCommunicationIdentifier, options }, removeChatParticipantOperationSpec);
+        });
     }
     /**
      * Adds thread participants to a thread. If participants already exist, no change occurs.
@@ -1176,8 +1207,10 @@ class ChatThreadImpl {
      * @param addChatParticipantsRequest Thread participants to be added to the thread.
      * @param options The options parameters.
      */
-    addChatParticipants(chatThreadId, addChatParticipantsRequest, options) {
-        return this.client.sendOperationRequest({ chatThreadId, addChatParticipantsRequest, options }, addChatParticipantsOperationSpec);
+    async addChatParticipants(chatThreadId, addChatParticipantsRequest, options) {
+        return tracingClient.withSpan("ChatApiClient.addChatParticipants", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, addChatParticipantsRequest, options }, addChatParticipantsOperationSpec);
+        });
     }
     /**
      * Updates a thread's properties.
@@ -1185,24 +1218,30 @@ class ChatThreadImpl {
      * @param updateChatThreadRequest Request payload for updating a chat thread.
      * @param options The options parameters.
      */
-    updateChatThreadProperties(chatThreadId, updateChatThreadRequest, options) {
-        return this.client.sendOperationRequest({ chatThreadId, updateChatThreadRequest, options }, updateChatThreadPropertiesOperationSpec);
+    async updateChatThreadProperties(chatThreadId, updateChatThreadRequest, options) {
+        return tracingClient.withSpan("ChatApiClient.updateChatThreadProperties", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, updateChatThreadRequest, options }, updateChatThreadPropertiesOperationSpec);
+        });
     }
     /**
      * Gets a chat thread's properties.
      * @param chatThreadId Id of the thread.
      * @param options The options parameters.
      */
-    getChatThreadProperties(chatThreadId, options) {
-        return this.client.sendOperationRequest({ chatThreadId, options }, getChatThreadPropertiesOperationSpec);
+    async getChatThreadProperties(chatThreadId, options) {
+        return tracingClient.withSpan("ChatApiClient.getChatThreadProperties", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, options }, getChatThreadPropertiesOperationSpec);
+        });
     }
     /**
      * Posts a typing event to a thread, on behalf of a user.
      * @param chatThreadId Id of the thread.
      * @param options The options parameters.
      */
-    sendTypingNotification(chatThreadId, options) {
-        return this.client.sendOperationRequest({ chatThreadId, options }, sendTypingNotificationOperationSpec);
+    async sendTypingNotification(chatThreadId, options) {
+        return tracingClient.withSpan("ChatApiClient.sendTypingNotification", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, options }, sendTypingNotificationOperationSpec);
+        });
     }
     /**
      * ListChatReadReceiptsNext
@@ -1210,8 +1249,10 @@ class ChatThreadImpl {
      * @param nextLink The nextLink from the previous successful call to the ListChatReadReceipts method.
      * @param options The options parameters.
      */
-    listChatReadReceiptsNext(chatThreadId, nextLink, options) {
-        return this.client.sendOperationRequest({ chatThreadId, nextLink, options }, listChatReadReceiptsNextOperationSpec);
+    async listChatReadReceiptsNext(chatThreadId, nextLink, options) {
+        return tracingClient.withSpan("ChatApiClient.listChatReadReceiptsNext", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, nextLink, options }, listChatReadReceiptsNextOperationSpec);
+        });
     }
     /**
      * ListChatMessagesNext
@@ -1219,8 +1260,10 @@ class ChatThreadImpl {
      * @param nextLink The nextLink from the previous successful call to the ListChatMessages method.
      * @param options The options parameters.
      */
-    listChatMessagesNext(chatThreadId, nextLink, options) {
-        return this.client.sendOperationRequest({ chatThreadId, nextLink, options }, listChatMessagesNextOperationSpec);
+    async listChatMessagesNext(chatThreadId, nextLink, options) {
+        return tracingClient.withSpan("ChatApiClient.listChatMessagesNext", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, nextLink, options }, listChatMessagesNextOperationSpec);
+        });
     }
     /**
      * ListChatParticipantsNext
@@ -1228,8 +1271,10 @@ class ChatThreadImpl {
      * @param nextLink The nextLink from the previous successful call to the ListChatParticipants method.
      * @param options The options parameters.
      */
-    listChatParticipantsNext(chatThreadId, nextLink, options) {
-        return this.client.sendOperationRequest({ chatThreadId, nextLink, options }, listChatParticipantsNextOperationSpec);
+    async listChatParticipantsNext(chatThreadId, nextLink, options) {
+        return tracingClient.withSpan("ChatApiClient.listChatParticipantsNext", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, nextLink, options }, listChatParticipantsNextOperationSpec);
+        });
     }
 }
 // Operation Specifications
@@ -1770,31 +1815,39 @@ class ChatImpl {
      * @param createChatThreadRequest Request payload for creating a chat thread.
      * @param options The options parameters.
      */
-    createChatThread(createChatThreadRequest, options) {
-        return this.client.sendOperationRequest({ createChatThreadRequest, options }, createChatThreadOperationSpec);
+    async createChatThread(createChatThreadRequest, options) {
+        return tracingClient.withSpan("ChatApiClient.createChatThread", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ createChatThreadRequest, options }, createChatThreadOperationSpec);
+        });
     }
     /**
      * Gets the list of chat threads of a user.
      * @param options The options parameters.
      */
-    listChatThreads(options) {
-        return this.client.sendOperationRequest({ options }, listChatThreadsOperationSpec);
+    async listChatThreads(options) {
+        return tracingClient.withSpan("ChatApiClient.listChatThreads", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ options }, listChatThreadsOperationSpec);
+        });
     }
     /**
      * Deletes a thread.
      * @param chatThreadId Id of the thread to be deleted.
      * @param options The options parameters.
      */
-    deleteChatThread(chatThreadId, options) {
-        return this.client.sendOperationRequest({ chatThreadId, options }, deleteChatThreadOperationSpec);
+    async deleteChatThread(chatThreadId, options) {
+        return tracingClient.withSpan("ChatApiClient.deleteChatThread", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ chatThreadId, options }, deleteChatThreadOperationSpec);
+        });
     }
     /**
      * ListChatThreadsNext
      * @param nextLink The nextLink from the previous successful call to the ListChatThreads method.
      * @param options The options parameters.
      */
-    listChatThreadsNext(nextLink, options) {
-        return this.client.sendOperationRequest({ nextLink, options }, listChatThreadsNextOperationSpec);
+    async listChatThreadsNext(nextLink, options) {
+        return tracingClient.withSpan("ChatApiClient.listChatThreadsNext", options !== null && options !== void 0 ? options : {}, async (options) => {
+            return this.client.sendOperationRequest({ nextLink, options }, listChatThreadsNextOperationSpec);
+        });
     }
 }
 // Operation Specifications
@@ -1953,7 +2006,7 @@ class ChatApiClient extends coreClient__namespace.ServiceClient {
         const defaults = {
             requestContentType: "application/json; charset=utf-8"
         };
-        const packageDetails = `azsdk-js-communication-chat/1.2.0`;
+        const packageDetails = `azsdk-js-communication-chat/1.2.3`;
         const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix
             ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
             : `${packageDetails}`;
@@ -1967,22 +2020,38 @@ class ChatApiClient extends coreClient__namespace.ServiceClient {
         this.apiVersion = options.apiVersion || "2021-09-07";
         this.chatThread = new ChatThreadImpl(this);
         this.chat = new ChatImpl(this);
+        this.addCustomApiVersionPolicy(options.apiVersion);
+    }
+    /** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
+    addCustomApiVersionPolicy(apiVersion) {
+        if (!apiVersion) {
+            return;
+        }
+        const apiVersionPolicy = {
+            name: "CustomApiVersionPolicy",
+            async sendRequest(request, next) {
+                const param = request.url.split("?");
+                if (param.length > 1) {
+                    const newParams = param[1].split("&").map((item) => {
+                        if (item.indexOf("api-version") > -1) {
+                            return "api-version=" + apiVersion;
+                        }
+                        else {
+                            return item;
+                        }
+                    });
+                    request.url = param[0] + "?" + newParams.join("&");
+                }
+                return next(request);
+            }
+        };
+        this.pipeline.addPolicy(apiVersionPolicy);
     }
 }
 
 // Copyright (c) Microsoft Corporation.
 const logger = logger$1.createClientLogger("communication-chat");
 
-// Copyright (c) Microsoft Corporation.
-/**
- * Creates a span using the global tracer.
- * @internal
- */
-const createSpan = coreTracing.createSpanFunction({
-    packagePrefix: "Azure.Communication",
-    namespace: "Microsoft.Communication",
-});
-
 // Copyright (c) Microsoft Corporation.
 /**
  * Creates a new CommunicationTokenCredentialPolicy factory.
@@ -2024,43 +2093,21 @@ class ChatThreadClient {
      * Returns the chat thread.
      * @param options -  Operation options.
      */
-    async getProperties(options = {}) {
-        const { span, updatedOptions } = createSpan("ChatClient-GetProperties", options);
-        try {
+    getProperties(options = {}) {
+        return tracingClient.withSpan("ChatClient-GetProperties", options, async (updatedOptions) => {
             const result = await this.client.chatThread.getChatThreadProperties(this.threadId, updatedOptions);
             return mapToChatThreadPropertiesSdkModel(result);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Updates a thread's topic.
      * @param topic - The topic needs to be updated to.
      * @param options - Operation options.
      */
-    async updateTopic(topic, options = {}) {
-        const { span, updatedOptions } = createSpan("ChatThreadClient-UpdateTopic", options);
-        try {
+    updateTopic(topic, options = {}) {
+        return tracingClient.withSpan("ChatThreadClient-UpdateTopic", options, async (updatedOptions) => {
             await this.client.chatThread.updateChatThreadProperties(this.threadId, { topic: topic }, updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Sends a chat message to a thread identified by threadId.
@@ -2068,24 +2115,13 @@ class ChatThreadClient {
      * @param request - Request for sending a message.
      * @param options - Operation options.
      */
-    async sendMessage(request, options = {}) {
-        const { span, updatedOptions } = createSpan("ChatThreadClient-SendMessage", options);
-        try {
+    sendMessage(request, options = {}) {
+        return tracingClient.withSpan("ChatThreadClient-SendMessage", options, async (updatedOptions) => {
             // reset typing notification clock
             this.timeOfLastTypingRequest = undefined;
             const result = await this.client.chatThread.sendChatMessage(this.threadId, Object.assign(Object.assign({}, request), options), updatedOptions);
             return result;
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Gets a chat message identified by messageId.
@@ -2093,22 +2129,11 @@ class ChatThreadClient {
      * @param messageId - The message id of the message.
      * @param options - Operation options.
      */
-    async getMessage(messageId, options = {}) {
-        const { span, updatedOptions } = createSpan("ChatThreadClient-GetMessage", options);
-        try {
+    getMessage(messageId, options = {}) {
+        return tracingClient.withSpan("ChatThreadClient-GetMessage", options, async (updatedOptions) => {
             const result = await this.client.chatThread.getChatMessage(this.threadId, messageId, updatedOptions);
             return mapToChatMessageSdkModel(result);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     listMessagesPage(pageSettings, options = {}) {
         return tslib.__asyncGenerator(this, arguments, function* listMessagesPage_1() {
@@ -2155,7 +2180,7 @@ class ChatThreadClient {
      * @param options - Get messages options.
      */
     listMessages(options = {}) {
-        const { span, updatedOptions } = createSpan("ChatThreadClient-ListMessages", options);
+        const { span, updatedOptions } = tracingClient.startSpan("ChatThreadClient-ListMessages", options);
         try {
             const iter = this.listMessagesAll(updatedOptions);
             return {
@@ -2172,8 +2197,8 @@ class ChatThreadClient {
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
+                status: "error",
+                error: e,
             });
             throw e;
         }
@@ -2186,21 +2211,10 @@ class ChatThreadClient {
      * @param messageId - The message id of the message.
      * @param options - Operation options.
      */
-    async deleteMessage(messageId, options = {}) {
-        const { span, updatedOptions } = createSpan("ChatThreadClient-DeleteMessage", options);
-        try {
+    deleteMessage(messageId, options = {}) {
+        return tracingClient.withSpan("ChatThreadClient-DeleteMessage", options, async (updatedOptions) => {
             await this.client.chatThread.deleteChatMessage(this.threadId, messageId, updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Updates a message identified by threadId and messageId
@@ -2208,20 +2222,9 @@ class ChatThreadClient {
      * @param options - Operation options.
      */
     async updateMessage(messageId, options = {}) {
-        const { span, updatedOptions } = createSpan("ChatThreadClient-UpdateMessage", options);
-        try {
+        return tracingClient.withSpan("ChatThreadClient-UpdateMessage", options, async (updatedOptions) => {
             await this.client.chatThread.updateChatMessage(this.threadId, messageId, options, updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Adds the details of chat participants belonging to the thread identified by threadId.
@@ -2229,21 +2232,10 @@ class ChatThreadClient {
      * @param options - Operation options.
      */
     async addParticipants(request, options = {}) {
-        const { span, updatedOptions } = createSpan("ChatThreadClient-AddParticipants", options);
-        try {
+        return tracingClient.withSpan("ChatThreadClient-AddParticipants", options, async (updatedOptions) => {
             const result = await this.client.chatThread.addChatParticipants(this.threadId, mapToAddChatParticipantsRequestRestModel(request), updatedOptions);
             return result;
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     listParticipantsPage(continuationState, options = {}) {
         return tslib.__asyncGenerator(this, arguments, function* listParticipantsPage_1() {
@@ -2290,7 +2282,7 @@ class ChatThreadClient {
      * @param options - Operation options.
      */
     listParticipants(options = {}) {
-        const { span, updatedOptions } = createSpan("ChatThreadClient-ListParticipants", options);
+        const { span, updatedOptions } = tracingClient.startSpan("ChatThreadClient-ListParticipants", options);
         try {
             const iter = this.listParticipantsAll(updatedOptions);
             return {
@@ -2307,8 +2299,8 @@ class ChatThreadClient {
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
+                status: "error",
+                error: e,
             });
             throw e;
         }
@@ -2322,20 +2314,9 @@ class ChatThreadClient {
      * @param options - Operation options.
      */
     async removeParticipant(participant, options = {}) {
-        const { span, updatedOptions } = createSpan("ChatThreadClient-RemoveParticipant", options);
-        try {
+        return tracingClient.withSpan("ChatThreadClient-RemoveParticipant", options, async (updatedOptions) => {
             await this.client.chatThread.removeChatParticipant(this.threadId, communicationCommon.serializeCommunicationIdentifier(participant), updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Sends a typing notification to the thread.
@@ -2344,8 +2325,7 @@ class ChatThreadClient {
      * @returns True if the typing message notification could be sent, otherwise false.
      */
     async sendTypingNotification(options = {}) {
-        const { span, updatedOptions } = createSpan("ChatThreadClient-SendTypingNotification", options);
-        try {
+        return tracingClient.withSpan("ChatThreadClient-SendTypingNotification", options, async (updatedOptions) => {
             const dateNow = new Date();
             const { senderDisplayName } = updatedOptions, restOptions = tslib.__rest(updatedOptions, ["senderDisplayName"]);
             if (this.canPostTypingNotification(dateNow)) {
@@ -2355,39 +2335,17 @@ class ChatThreadClient {
             }
             logger.info(`Typing Notification NOT Send. [thread_id=${this.threadId}]`);
             return false;
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Sends a read receipt to the thread identified by threadId.
-     * @param messageId - The message id of the message that user latest read.
      * @param request - Request for sending a read receipt
      * @param options - Operation options.
      */
     async sendReadReceipt(request, options = {}) {
-        const { span, updatedOptions } = createSpan("ChatThreadClient-SendReadReceipt", options);
-        try {
+        return tracingClient.withSpan("ChatThreadClient-SendReadReceipt", options, async (updatedOptions) => {
             await this.client.chatThread.sendChatReadReceipt(this.threadId, request, updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     listReadReceiptsPage(continuationState, options = {}) {
         return tslib.__asyncGenerator(this, arguments, function* listReadReceiptsPage_1() {
@@ -2434,7 +2392,7 @@ class ChatThreadClient {
      * @param options - Get messages options.
      */
     listReadReceipts(options = {}) {
-        const { span, updatedOptions } = createSpan("ChatThreadClient-ListChatReadReceipts", options);
+        const { span, updatedOptions } = tracingClient.startSpan("ChatThreadClient-ListChatReadReceipts", options);
         try {
             const iter = this.listReadReceiptsAll(updatedOptions);
             return {
@@ -2451,8 +2409,8 @@ class ChatThreadClient {
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
+                status: "error",
+                error: e,
             });
             throw e;
         }
@@ -2539,9 +2497,8 @@ class ChatClient {
      * @param options - Operation options.
      */
     async createChatThread(request, options = {}) {
-        var _a, _b;
-        const { span, updatedOptions } = createSpan("ChatClient-CreateChatThread", options);
-        try {
+        return tracingClient.withSpan("ChatClient-CreateChatThread", options, async (updatedOptions) => {
+            var _a, _b;
             // We generate an UUID if the user does not provide an idempotencyToken value
             updatedOptions.idempotencyToken = (_a = updatedOptions.idempotencyToken) !== null && _a !== void 0 ? _a : generateUuid();
             const updatedRestModelOptions = mapToCreateChatThreadOptionsRestModel(updatedOptions);
@@ -2550,17 +2507,7 @@ class ChatClient {
                 participants: (_b = options.participants) === null || _b === void 0 ? void 0 : _b.map((participant) => mapToChatParticipantRestModel(participant)),
             }, updatedRestModelOptions);
             return mapToCreateChatThreadResultSdkModel(result);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     listChatThreadsPage(continuationState, options = {}) {
         return tslib.__asyncGenerator(this, arguments, function* listChatThreadsPage_1() {
@@ -2606,7 +2553,7 @@ class ChatClient {
      * @param options - List chat threads options.
      */
     listChatThreads(options = {}) {
-        const { span, updatedOptions } = createSpan("ChatClient-ListChatThreads", options);
+        const { span, updatedOptions } = tracingClient.startSpan("ChatClient-ListChatThreads", options);
         try {
             const iter = this.listChatThreadsAll(updatedOptions);
             return {
@@ -2623,8 +2570,8 @@ class ChatClient {
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
+                error: e,
+                status: "error",
             });
             throw e;
         }
@@ -2638,20 +2585,9 @@ class ChatClient {
      * @param options -  Operation options.
      */
     async deleteChatThread(threadId, options = {}) {
-        const { span, updatedOptions } = createSpan("ChatClient-DeleteChatThread", options);
-        try {
+        return tracingClient.withSpan("ChatClient-DeleteChatThread", options, async (updatedOptions) => {
             await this.client.chat.deleteChatThread(threadId, updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Start receiving realtime notifications.