@microsoft/omnichannel-chat-widget 0.1.0-main.c461296 → 0.1.0-main.c881067

package/lib/esm/common/telemetry/TelemetryHelper.js

@@ -1,6 +1,7 @@
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { ScenarioType } from "./TelemetryConstants";
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import { ScenarioType, TelemetryEvent } from "./TelemetryConstants";
 import { newGuid } from "../utils";
 import { TelemetryManager } from "./TelemetryManager";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
@@ -9,35 +10,27 @@ export class TelemetryHelper {
     switch (input.scenarioType) {
       case ScenarioType.LOAD:
         return TelemetryHelper.conformToLoadContract(level, input);
-
       case ScenarioType.IC3_CLIENT:
         return TelemetryHelper.conformToIC3ClientContract(level, input);
-
       case ScenarioType.WEBCHAT:
         return TelemetryHelper.conformToWebChatContract(level, input);
-
       case ScenarioType.OCCHATSDK:
         return TelemetryHelper.conformToOCChatSDKContract(level, input);
-
       case ScenarioType.ACTIONS:
         return TelemetryHelper.conformToActionsContract(level, input);
-
       case ScenarioType.CALLING:
         return TelemetryHelper.conformToCallingContract(level, input);
-
       case ScenarioType.ACS_ADAPTER:
         return TelemetryHelper.conformToACSAdapterContract(level, input);
-
       default:
       case ScenarioType.CONFIG_VALIDATION:
         return TelemetryHelper.conformToConfigValidationContract(level, input);
     }
   }
-
-  static populateBasicProperties(level, // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  static populateBasicProperties(level,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   telemetryData) {
     var _TelemetryManager$Int, _TelemetryManager$Int2, _TelemetryManager$Int3, _TelemetryManager$Int4, _TelemetryManager$Int5, _TelemetryManager$Int6, _TelemetryManager$Int7;
-
     return {
       WidgetId: ((_TelemetryManager$Int = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int === void 0 ? void 0 : _TelemetryManager$Int.widgetId) ?? "",
       ChatId: ((_TelemetryManager$Int2 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int2 === void 0 ? void 0 : _TelemetryManager$Int2.chatId) ?? "",
@@ -49,14 +42,12 @@ export class TelemetryHelper {
       LogLevel: level
     };
   }
-
   static populate(level, telemetryData, configure) {
     const base = TelemetryHelper.populateBasicProperties(level, telemetryData);
     const event = base;
     configure(event);
     return event;
   }
-
   static conformToActionsContract(level, input) {
     const payload = input.payload;
     return TelemetryHelper.populate(level, payload, event => {
@@ -64,9 +55,10 @@ export class TelemetryHelper {
       event.ActionType = payload.ActionType;
       event.ElapsedTimeInMilliseconds = payload.ElapsedTimeInMilliseconds;
       event.ExceptionDetails = JSON.stringify(payload.ExceptionDetails);
+      event.Description = payload.Description;
+      event.CustomProperties = JSON.stringify(payload.CustomProperties);
     });
   }
-
   static conformToWebChatContract(level, input) {
     const payload = input.payload;
     return TelemetryHelper.populate(level, payload, event => {
@@ -78,12 +70,10 @@ export class TelemetryHelper {
       event.ExceptionDetails = JSON.stringify(payload.error);
     });
   }
-
   static conformToConfigValidationContract(level, input) {
     const payload = input.payload;
     return TelemetryHelper.populate(level, payload, event => {
       var _TelemetryManager$Int8, _TelemetryManager$Int9, _TelemetryManager$Int10;
-
       event.Event = payload.Event;
       event.RequestId = payload.RequestId;
       event.LCWVersion = (_TelemetryManager$Int8 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int8 === void 0 ? void 0 : _TelemetryManager$Int8.environmentVersion;
@@ -92,14 +82,13 @@ export class TelemetryHelper {
       event.ElapsedTimeInMilliseconds = payload.ElapsedTimeInMilliseconds;
       event.ExceptionDetails = JSON.stringify(payload.ExceptionDetails);
       event.Language = ((_TelemetryManager$Int10 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int10 === void 0 ? void 0 : _TelemetryManager$Int10.chatWidgetLocaleLCID) || "";
+      event.Description = payload.Data;
     });
   }
-
   static conformToLoadContract(level, input) {
     const payload = input.payload;
     return TelemetryHelper.populate(level, payload, event => {
       var _TelemetryManager$Int11, _TelemetryManager$Int12, _TelemetryManager$Int13;
-
       event.Event = payload.Event;
       event.ResourcePath = payload.ResourcePath;
       event.WidgetState = payload.WidgetState;
@@ -112,12 +101,10 @@ export class TelemetryHelper {
       event.OCChatComponentsVersion = ((_TelemetryManager$Int13 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int13 === void 0 ? void 0 : _TelemetryManager$Int13.chatComponentVersion) ?? "";
     });
   }
-
   static conformToIC3ClientContract(level, input) {
     const payload = input.payload;
     return TelemetryHelper.populate(level, payload, event => {
       var _TelemetryManager$Int14;
-
       event.Event = payload.Event;
       event.IC3ClientVersion = (_TelemetryManager$Int14 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int14 === void 0 ? void 0 : _TelemetryManager$Int14.IC3ClientVersion;
       event.SubscriptionId = payload.SubscriptionId;
@@ -130,7 +117,6 @@ export class TelemetryHelper {
       event.Description = payload.Description;
     });
   }
-
   static conformToACSAdapterContract(level, input) {
     const payload = input.payload;
     return TelemetryHelper.populate(level, payload, event => {
@@ -144,7 +130,6 @@ export class TelemetryHelper {
       event.ExceptionDetails = payload.ExceptionDetails;
     });
   }
-
   static conformToCallingContract(level, input) {
     const payload = input.payload;
     return TelemetryHelper.populate(level, payload, event => {
@@ -155,7 +140,6 @@ export class TelemetryHelper {
       event.Description = payload.Description;
     });
   }
-
   static conformToOCChatSDKContract(level, input) {
     const payload = input.payload;
     return TelemetryHelper.populate(level, payload, event => {
@@ -167,95 +151,97 @@ export class TelemetryHelper {
       event.ExceptionDetails = JSON.stringify(payload.ExceptionDetails);
     });
   }
-
   static addChatConfigDataToTelemetry(chatConfig, telemetryInternalData) {
     var _chatConfig$ChatWidge;
-
     const telemetryDataLocal = telemetryInternalData;
     telemetryDataLocal.chatWidgetLocaleLCID = (_chatConfig$ChatWidge = chatConfig.ChatWidgetLanguage) === null || _chatConfig$ChatWidge === void 0 ? void 0 : _chatConfig$ChatWidge.msdyn_localeid;
     return telemetryDataLocal;
   }
-
   static addWidgetDataToTelemetry(telemetryConfig, telemetryInternalData) {
     const telemetryDataLocal = telemetryInternalData;
     telemetryDataLocal.widgetId = telemetryConfig === null || telemetryConfig === void 0 ? void 0 : telemetryConfig.appId;
     telemetryDataLocal.orgId = telemetryConfig === null || telemetryConfig === void 0 ? void 0 : telemetryConfig.orgId;
     telemetryDataLocal.orgUrl = telemetryConfig === null || telemetryConfig === void 0 ? void 0 : telemetryConfig.orgUrl;
-    telemetryDataLocal.lcwRuntimeId = newGuid();
+    telemetryDataLocal.lcwRuntimeId = telemetryConfig.LCWRuntimeId ?? newGuid();
     return telemetryDataLocal;
   }
-
   static addSessionDataToTelemetry(chatSession, telemetryInternalData) {
     var _chatSession$chatToke, _chatSession$chatToke2;
-
     const telemetryDataLocal = telemetryInternalData;
     telemetryDataLocal.chatId = chatSession === null || chatSession === void 0 ? void 0 : (_chatSession$chatToke = chatSession.chatToken) === null || _chatSession$chatToke === void 0 ? void 0 : _chatSession$chatToke.chatId;
     telemetryDataLocal.currentRequestId = chatSession === null || chatSession === void 0 ? void 0 : (_chatSession$chatToke2 = chatSession.chatToken) === null || _chatSession$chatToke2 === void 0 ? void 0 : _chatSession$chatToke2.requestId;
     return telemetryInternalData;
   }
-
   static addConversationDataToTelemetry(liveWorkItem, telemetryInternalData) {
     const telemetryDataLocal = telemetryInternalData;
     telemetryDataLocal.conversationId = liveWorkItem.conversationId;
     return telemetryDataLocal;
   }
-
 }
-
 _defineProperty(TelemetryHelper, "callId", void 0);
-
 _defineProperty(TelemetryHelper, "elapsedTime", void 0);
-
 _defineProperty(TelemetryHelper, "logCallingEvent", (logLevel, payload, callId) => {
   const telemetryEvent = {
     eventName: (payload === null || payload === void 0 ? void 0 : payload.Event) ?? "",
     logLevel: logLevel,
-    payload: { ...payload,
+    payload: {
+      ...payload,
       CallId: callId
     }
   };
   BroadcastService.postMessage(telemetryEvent);
 });
-
 _defineProperty(TelemetryHelper, "logLoadingEvent", (logLevel, payload) => {
   const telemetryEvent = {
     eventName: (payload === null || payload === void 0 ? void 0 : payload.Event) ?? "",
     logLevel: logLevel,
-    payload: { ...payload
+    payload: {
+      ...payload
     }
   };
   BroadcastService.postMessage(telemetryEvent);
 });
-
 _defineProperty(TelemetryHelper, "logActionEvent", (logLevel, payload) => {
   const telemetryEvent = {
     eventName: (payload === null || payload === void 0 ? void 0 : payload.Event) ?? "",
     logLevel: logLevel,
-    payload: { ...payload
+    payload: {
+      ...payload
     }
   };
   BroadcastService.postMessage(telemetryEvent);
 });
-
 _defineProperty(TelemetryHelper, "logSDKEvent", (logLevel, payload) => {
   var _TelemetryManager$Int15;
-
   const telemetryEvent = {
     eventName: (payload === null || payload === void 0 ? void 0 : payload.Event) ?? "",
     logLevel: logLevel,
-    payload: { ...payload,
+    payload: {
+      ...payload,
       TransactionId: newGuid(),
       RequestId: (_TelemetryManager$Int15 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int15 === void 0 ? void 0 : _TelemetryManager$Int15.currentRequestId
     }
   };
   BroadcastService.postMessage(telemetryEvent);
 });
-
 _defineProperty(TelemetryHelper, "logConfigDataEvent", (logLevel, payload) => {
   const telemetryEvent = {
     eventName: (payload === null || payload === void 0 ? void 0 : payload.Event) ?? "",
     logLevel: logLevel,
-    payload: { ...payload
+    payload: {
+      ...payload
+    }
+  };
+  BroadcastService.postMessage(telemetryEvent);
+});
+_defineProperty(TelemetryHelper, "logWebChatEvent", (logLevel, payload) => {
+  const telemetryEvent = {
+    eventName: TelemetryEvent.WebChatEvent,
+    logLevel: logLevel,
+    payload: {
+      ...payload,
+      type: TelemetryEvent.WebChatEvent,
+      scenarioType: ScenarioType.WEBCHAT
     }
   };
   BroadcastService.postMessage(telemetryEvent);

package/lib/esm/common/telemetry/TelemetryManager.js

@@ -1,21 +1,18 @@
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { LogLevel, ScenarioType, TelemetryConstants, TelemetryEvent } from "./TelemetryConstants";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { ariaTelemetryLogger } from "./loggers/ariaTelemetryLogger";
 import { consoleLogger } from "./loggers/consoleLogger";
+import { defaultAriaConfig } from "./defaultConfigs/defaultAriaConfig";
+import { TelemetryHelper } from "./TelemetryHelper";
 export class TelemetryTimers {}
-
 _defineProperty(TelemetryTimers, "LcwLoadToChatButtonTimer", void 0);
-
 _defineProperty(TelemetryTimers, "ProactiveChatScreenTimer", void 0);
-
 _defineProperty(TelemetryTimers, "WidgetLoadTimer", void 0);
-
 export class TelemetryManager {}
-
 _defineProperty(TelemetryManager, "InternalTelemetryData", void 0);
-
 const loggers = [];
 export const disposeLoggers = () => {
   loggers.map(logger => {
@@ -25,30 +22,23 @@ export const disposeLoggers = () => {
 export const RegisterLoggers = () => {
   const registerLoggers = () => {
     var _TelemetryManager$Int, _TelemetryManager$Int2, _TelemetryManager$Int3, _TelemetryManager$Int4, _TelemetryManager$Int5, _TelemetryManager$Int6, _TelemetryManager$Int7, _TelemetryManager$Int8;
-
-    if (!((_TelemetryManager$Int = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int !== void 0 && (_TelemetryManager$Int2 = _TelemetryManager$Int.telemetryConfig) !== null && _TelemetryManager$Int2 !== void 0 && _TelemetryManager$Int2.disableConsoleLog) || !((_TelemetryManager$Int3 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int3 !== void 0 && (_TelemetryManager$Int4 = _TelemetryManager$Int3.telemetryConfig) !== null && _TelemetryManager$Int4 !== void 0 && _TelemetryManager$Int4.telemetryDisabled)) {
+    if (((_TelemetryManager$Int = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int === void 0 ? void 0 : (_TelemetryManager$Int2 = _TelemetryManager$Int.telemetryConfig) === null || _TelemetryManager$Int2 === void 0 ? void 0 : _TelemetryManager$Int2.disableConsoleLog) === false || ((_TelemetryManager$Int3 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int3 === void 0 ? void 0 : (_TelemetryManager$Int4 = _TelemetryManager$Int3.telemetryConfig) === null || _TelemetryManager$Int4 === void 0 ? void 0 : _TelemetryManager$Int4.telemetryDisabled) === false) {
       BroadcastService.getAnyMessage().subscribe(event => {
         if (event.payload && event.eventName in TelemetryEvent) {
           logTelemetry(event);
         }
       });
     }
-
-    if (!((_TelemetryManager$Int5 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int5 !== void 0 && (_TelemetryManager$Int6 = _TelemetryManager$Int5.telemetryConfig) !== null && _TelemetryManager$Int6 !== void 0 && _TelemetryManager$Int6.disableConsoleLog)) {
+    if (((_TelemetryManager$Int5 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int5 === void 0 ? void 0 : (_TelemetryManager$Int6 = _TelemetryManager$Int5.telemetryConfig) === null || _TelemetryManager$Int6 === void 0 ? void 0 : _TelemetryManager$Int6.disableConsoleLog) === false) {
       loggers.push(consoleLogger());
     }
-
-    if (!((_TelemetryManager$Int7 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int7 !== void 0 && (_TelemetryManager$Int8 = _TelemetryManager$Int7.telemetryConfig) !== null && _TelemetryManager$Int8 !== void 0 && _TelemetryManager$Int8.telemetryDisabled)) {
+    if (((_TelemetryManager$Int7 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int7 === void 0 ? void 0 : (_TelemetryManager$Int8 = _TelemetryManager$Int7.telemetryConfig) === null || _TelemetryManager$Int8 === void 0 ? void 0 : _TelemetryManager$Int8.telemetryDisabled) === false) {
       var _TelemetryManager$Int9, _TelemetryManager$Int18, _TelemetryManager$Int19;
-
       if ((_TelemetryManager$Int9 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int9 !== void 0 && _TelemetryManager$Int9.ariaConfig) {
         var _TelemetryManager$Int10, _TelemetryManager$Int11, _TelemetryManager$Int12, _TelemetryManager$Int13, _TelemetryManager$Int14, _TelemetryManager$Int15, _TelemetryManager$Int16, _TelemetryManager$Int17;
-
-        loggers.push(ariaTelemetryLogger(((_TelemetryManager$Int10 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int10 === void 0 ? void 0 : (_TelemetryManager$Int11 = _TelemetryManager$Int10.ariaConfig) === null || _TelemetryManager$Int11 === void 0 ? void 0 : _TelemetryManager$Int11.ariaTelemetryKey) ?? "", ((_TelemetryManager$Int12 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int12 === void 0 ? void 0 : (_TelemetryManager$Int13 = _TelemetryManager$Int12.ariaConfig) === null || _TelemetryManager$Int13 === void 0 ? void 0 : _TelemetryManager$Int13.disableCookieUsage) ?? false, ((_TelemetryManager$Int14 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int14 === void 0 ? void 0 : (_TelemetryManager$Int15 = _TelemetryManager$Int14.ariaConfig) === null || _TelemetryManager$Int15 === void 0 ? void 0 : _TelemetryManager$Int15.collectorUriForTelemetry) ?? "", ((_TelemetryManager$Int16 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int16 === void 0 ? void 0 : (_TelemetryManager$Int17 = _TelemetryManager$Int16.ariaConfig) === null || _TelemetryManager$Int17 === void 0 ? void 0 : _TelemetryManager$Int17.ariaTelemetryApplicationName) ?? "OmniChannelProd_Web"));
+        loggers.push(ariaTelemetryLogger(((_TelemetryManager$Int10 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int10 === void 0 ? void 0 : (_TelemetryManager$Int11 = _TelemetryManager$Int10.ariaConfig) === null || _TelemetryManager$Int11 === void 0 ? void 0 : _TelemetryManager$Int11.ariaTelemetryKey) ?? defaultAriaConfig.ariaTelemetryKey, ((_TelemetryManager$Int12 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int12 === void 0 ? void 0 : (_TelemetryManager$Int13 = _TelemetryManager$Int12.ariaConfig) === null || _TelemetryManager$Int13 === void 0 ? void 0 : _TelemetryManager$Int13.disableCookieUsage) ?? defaultAriaConfig.disableCookieUsage, ((_TelemetryManager$Int14 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int14 === void 0 ? void 0 : (_TelemetryManager$Int15 = _TelemetryManager$Int14.ariaConfig) === null || _TelemetryManager$Int15 === void 0 ? void 0 : _TelemetryManager$Int15.collectorUriForTelemetry) ?? defaultAriaConfig.collectorUriForTelemetry, ((_TelemetryManager$Int16 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int16 === void 0 ? void 0 : (_TelemetryManager$Int17 = _TelemetryManager$Int16.ariaConfig) === null || _TelemetryManager$Int17 === void 0 ? void 0 : _TelemetryManager$Int17.ariaTelemetryApplicationName) ?? defaultAriaConfig.ariaTelemetryApplicationName));
       }
-
       const customLoggers = (_TelemetryManager$Int18 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int18 === void 0 ? void 0 : (_TelemetryManager$Int19 = _TelemetryManager$Int18.telemetryConfig) === null || _TelemetryManager$Int19 === void 0 ? void 0 : _TelemetryManager$Int19.telemetryLoggers;
-
       if (customLoggers) {
         customLoggers.map(logger => {
           loggers.push(logger);
@@ -56,7 +46,6 @@ export const RegisterLoggers = () => {
       }
     }
   };
-
   const parseInput = function (payload) {
     let scenarioType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ScenarioType.UNDEFINED;
     return {
@@ -64,13 +53,17 @@ export const RegisterLoggers = () => {
       payload: payload
     };
   };
-
   const logTelemetry = telemetryEvent => {
     loggers.map(logger => {
+      var _payload;
       const logLevel = telemetryEvent.logLevel ?? LogLevel.INFO;
-      logger.log(logLevel, parseInput(telemetryEvent === null || telemetryEvent === void 0 ? void 0 : telemetryEvent.payload));
+      const scenarioType = ((_payload = telemetryEvent.payload) === null || _payload === void 0 ? void 0 : _payload.scenarioType) ?? ScenarioType.UNDEFINED;
+      const telemetryInput = parseInput(telemetryEvent === null || telemetryEvent === void 0 ? void 0 : telemetryEvent.payload, scenarioType);
+      telemetryInput.telemetryInfo = {
+        telemetryInfo: TelemetryHelper.buildTelemetryEvent(logLevel, telemetryInput)
+      };
+      logger.log(logLevel, telemetryInput);
     });
   };
-
   return registerLoggers();
 };

package/lib/esm/common/telemetry/defaultConfigs/defaultAriaConfig.js

@@ -1,6 +1,6 @@
 export const defaultAriaConfig = {
   collectorUriForTelemetry: "",
   ariaTelemetryKey: "c7655518acf1403f93ff6b9f77942f0a-d01a02fd-6b50-4de3-a566-62eda11f93bc-7083",
-  ariaTelemetryApplicationName: "",
+  ariaTelemetryApplicationName: "D365_Omnichannel_Client_Public_Prod",
   disableCookieUsage: true
 };

package/lib/esm/common/telemetry/defaultConfigs/defaultTelemetryConfiguration.js

@@ -3,5 +3,8 @@ export const defaultTelemetryConfiguration = {
   telemetryDisabled: false,
   disableConsoleLog: false,
   telemetryLoggers: [],
-  ariaConfigurations: defaultAriaConfig
+  ariaConfigurations: defaultAriaConfig,
+  chatWidgetVersion: "0.0.0-0",
+  chatComponentVersion: "0.0.0-0",
+  OCChatSDKVersion: "0.0.0-0"
 };

package/lib/esm/common/telemetry/loggers/ariaTelemetryLogger.js

@@ -1,25 +1,32 @@
-import { isNullOrEmptyString, isNullOrUndefined } from "../../utils";
-import AWTEventProperties from "@microsoft/omnichannel-chat-sdk/lib/external/aria/webjs/AWTEventProperties";
-import AWTLogManager from "@microsoft/omnichannel-chat-sdk/lib/external/aria/webjs/AWTLogManager";
-import { AWTPiiKind } from "@microsoft/omnichannel-chat-sdk/lib/external/aria/common/Enums";
-import { Constants } from "../../Constants";
-import { TelemetryHelper } from "../TelemetryHelper";
+import { getDomain, isNullOrEmptyString, isNullOrUndefined } from "../../utils";
+import { AWTLogManager } from "@microsoft/omnichannel-chat-sdk/lib/external/aria/webjs/AriaSDK";
+import { AWTCustomerContentKind, AWTPiiKind, AWTPropertyType } from "@microsoft/omnichannel-chat-sdk/lib/external/aria/common/Enums";
+import { Constants, AriaTelemetryConstants, EnvironmentVersion } from "../../Constants";
+import { TelemetryManager } from "../TelemetryManager";
 export const ariaTelemetryLogger = (ariaTelemetryKey, disabledCookieUsage, collectiorUriForTelemetry, ariaTelemetryApplicationName) => {
   let _logger;
-
   const logger = () => {
     if (isNullOrUndefined(_logger) && !isNullOrEmptyString(ariaTelemetryKey)) {
       const configuration = {
         disableCookiesUsage: disabledCookieUsage
       };
-
       if (!isNullOrEmptyString(collectiorUriForTelemetry)) {
         configuration.collectorUri = collectiorUriForTelemetry;
+      } else {
+        if (TelemetryManager.InternalTelemetryData.environmentVersion == EnvironmentVersion.prod) {
+          var _TelemetryManager$Int;
+          const orgUrl = (_TelemetryManager$Int = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int === void 0 ? void 0 : _TelemetryManager$Int.orgUrl;
+          if (!isNullOrUndefined(orgUrl)) {
+            // If the given org is a Production EU org, modify the Aria collector uri
+            const region = getDomain(orgUrl);
+            if (region === AriaTelemetryConstants.EU) {
+              configuration.collectorUri = AriaTelemetryConstants.EUROPE_ENDPOINT;
+            }
+          }
+        }
       }
-
       try {
         _logger = AWTLogManager.initialize(ariaTelemetryKey, configuration);
-
         if (_logger === undefined) {
           _logger = AWTLogManager.getLogger(ariaTelemetryKey);
         }
@@ -27,24 +34,43 @@ export const ariaTelemetryLogger = (ariaTelemetryKey, disabledCookieUsage, colle
         console.log(error);
       }
     }
-
     return _logger;
   };
-
   const ariaLogger = {
     log: (logLevel, telemetryInput) => {
-      let property;
-      const eventProperties = new AWTEventProperties();
-      const event = TelemetryHelper.buildTelemetryEvent(logLevel, telemetryInput);
-      eventProperties.setName(telemetryInput.scenarioType);
-
-      for (const key of Object.keys(event)) {
-        property = typeof event[key] === "object" ? JSON.stringify(event[key]) : event[key];
-        eventProperties.setProperty(key, property);
+      try {
+        var _telemetryInput$telem;
+        const telemetryInfo = telemetryInput === null || telemetryInput === void 0 ? void 0 : (_telemetryInput$telem = telemetryInput.telemetryInfo) === null || _telemetryInput$telem === void 0 ? void 0 : _telemetryInput$telem.telemetryInfo;
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const eventProperties = {
+          name: telemetryInput.scenarioType,
+          properties: {}
+        };
+        if (telemetryInfo) {
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
+          Object.keys(telemetryInfo).forEach((key, index) => {
+            if (!isNullOrUndefined(telemetryInfo[key]) && !isNullOrEmptyString(telemetryInfo[key])) {
+              const property = {
+                value: typeof telemetryInfo[key] === "object" ? JSON.stringify(telemetryInfo[key]) : telemetryInfo[key],
+                type: typeof telemetryInfo[key] === "number" ? AWTPropertyType.Double : AWTPropertyType.String,
+                pii: AWTPiiKind.NotSet,
+                cc: AWTCustomerContentKind.NotSet
+              };
+              eventProperties.properties[key] = property;
+            }
+          });
+          const nameProperty = {
+            value: Constants.LiveChatWidget,
+            type: AWTPropertyType.String,
+            pii: AWTPiiKind.GenericData,
+            cc: AWTCustomerContentKind.NotSet
+          };
+          eventProperties.properties[ariaTelemetryApplicationName] = nameProperty;
+        }
+        logger() ? logger().logEvent(eventProperties) : console.log("Unable to initialize aria logger");
+      } catch (error) {
+        console.error("Error in logging telemetry to Aria logger:" + error);
       }
-
-      eventProperties.setPropertyWithPii(ariaTelemetryApplicationName, Constants.LiveChatWidget, AWTPiiKind.GenericData);
-      logger() ? logger().logEvent(eventProperties) : console.log("Unable to initialize aria logger");
     },
     dispose: () => {
       AWTLogManager.flush(function () {

package/lib/esm/common/telemetry/loggers/consoleLogger.js

@@ -4,27 +4,23 @@ export const consoleLogger = () => {
   const consoleLogger = {
     log: (logLevel, telemetryInput) => {
       const payload = telemetryInput !== null && telemetryInput !== void 0 && telemetryInput.payload && Object.keys(telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.payload).length > 0 ? telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.payload : "";
-
+      const telemetryInfo = telemetryInput !== null && telemetryInput !== void 0 && telemetryInput.telemetryInfo && Object.keys(telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.telemetryInfo).length > 0 ? telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.telemetryInfo : "";
       try {
         switch (logLevel) {
           case LogLevel.INFO:
-            console.info(Constants.LiveChatWidget, payload);
+            console.info(Constants.LiveChatWidget, payload, telemetryInfo);
             break;
-
           case LogLevel.DEBUG:
-            console.debug(Constants.LiveChatWidget, payload);
+            console.debug(Constants.LiveChatWidget, payload, telemetryInfo);
             break;
-
           case LogLevel.WARN:
-            console.warn(Constants.LiveChatWidget, payload);
+            console.warn(Constants.LiveChatWidget, payload, telemetryInfo);
             break;
-
           case LogLevel.ERROR:
-            console.error(Constants.LiveChatWidget, payload);
+            console.error(Constants.LiveChatWidget, payload, telemetryInfo);
             break;
-
           default:
-            console.debug(Constants.LiveChatWidget, payload);
+            console.debug(Constants.LiveChatWidget, payload, telemetryInfo);
             break;
         }
       } catch (ex) {