QnATelemetry improvements (#467)

lzc850612 · web-flow · commit d444d8a80e16 · 2018-12-18T14:42:31.000-08:00
* add knowledgebase id into telemetry

* add qna and luis application/knowledgebase ids into telemetry

* update enterprise template sample with the latest telemetry change
diff --git a/solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/Telemetry/LuisTelemetryConstants.cs b/solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/Telemetry/LuisTelemetryConstants.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Bot.Solutions
     /// </summary>
     public static class LuisTelemetryConstants
     {
-        public const string ApplicationId = "applicationId";
+        public const string ApplicationIdProperty = "applicationId";
         public const string IntentPrefix = "luisIntent";  // Application Insights Custom Event name (with Intent)
         public const string IntentProperty = "intent";
         public const string IntentScoreProperty = "intentScore";
diff --git a/solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/Telemetry/QnATelemetryConstants.cs b/solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/Telemetry/QnATelemetryConstants.cs
@@ -8,6 +8,7 @@ namespace Microsoft.Bot.Solutions
     /// </summary>
     public static class QnATelemetryConstants
     {
+        public const string KnowledgeBaseIdProperty = "knowledgeBaseId";
         public const string ActivityIdProperty = "activityId";
         public const string AnswerProperty = "answer";
         public const string ArticleFoundProperty = "articleFound";
@@ -18,4 +19,4 @@ public static class QnATelemetryConstants
         public const string ScoreProperty = "score";
         public const string UsernameProperty = "username";
     }
-}
+}
diff --git a/solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/Telemetry/TelemetryLuisRecognizer.cs b/solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/Telemetry/TelemetryLuisRecognizer.cs
@@ -125,7 +125,7 @@ public TelemetryLuisRecognizer(LuisApplication application, LuisPredictionOption
                 // Add the intent score and conversation id properties
                 var telemetryProperties = new Dictionary<string, string>()
                 {
-                    { LuisTelemetryConstants.ApplicationId, _luisApplication.ApplicationId },
+                    { LuisTelemetryConstants.ApplicationIdProperty, _luisApplication.ApplicationId },
                     { LuisTelemetryConstants.IntentProperty, topLuisIntent.intent },
                     { LuisTelemetryConstants.IntentScoreProperty, intentScore },
                 };
diff --git a/solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/Telemetry/TelemetryQnAMaker.cs b/solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/Telemetry/TelemetryQnAMaker.cs
@@ -7,6 +7,7 @@
 using Microsoft.ApplicationInsights;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.AI.QnA;
+using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Solutions
 {
@@ -19,7 +20,9 @@ namespace Microsoft.Bot.Solutions
     /// </summary>
     public class TelemetryQnAMaker : QnAMaker, ITelemetryQnAMaker
     {
-        public static readonly string QnaMsgEvent = "QnaMessage";
+        public const string QnaMsgEvent = "QnaMessage";
+
+        private QnAMakerEndpoint _endpoint;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="TelemetryQnAMaker"/> class.
@@ -35,13 +38,15 @@ public TelemetryQnAMaker(QnAMakerEndpoint endpoint, QnAMakerOptions options = nu
         {
             LogUserName = logUserName;
             LogOriginalMessage = logOriginalMessage;
+
+            _endpoint = endpoint;
         }
 
         public bool LogUserName { get; }
 
         public bool LogOriginalMessage { get; }
 
-        public new async Task<QueryResult[]> GetAnswersAsync(ITurnContext context)
+        public async Task<QueryResult[]> GetAnswersAsync(ITurnContext context)
         {
             // Call Qna Maker
             var queryResults = await base.GetAnswersAsync(context);
@@ -52,6 +57,7 @@ public TelemetryQnAMaker(QnAMakerEndpoint endpoint, QnAMakerOptions options = nu
                 var telemetryProperties = new Dictionary<string, string>();
                 var telemetryMetrics = new Dictionary<string, double>();
 
+                telemetryProperties.Add(QnATelemetryConstants.KnowledgeBaseIdProperty, _endpoint.KnowledgeBaseId);
                 // Make it so we can correlate our reports with Activity or Conversation
                 telemetryProperties.Add(QnATelemetryConstants.ActivityIdProperty, context.Activity.Id);
                 var conversationId = context.Activity.Conversation.Id;
@@ -78,15 +84,15 @@ public TelemetryQnAMaker(QnAMakerEndpoint endpoint, QnAMakerOptions options = nu
                 if (queryResults.Length > 0)
                 {
                     var queryResult = queryResults[0];
-                    telemetryProperties.Add(QnATelemetryConstants.QuestionProperty, string.Join(",", queryResult.Questions));
+                    telemetryProperties.Add(QnATelemetryConstants.QuestionProperty, JsonConvert.SerializeObject(queryResult.Questions));
                     telemetryProperties.Add(QnATelemetryConstants.AnswerProperty, queryResult.Answer);
                     telemetryMetrics.Add(QnATelemetryConstants.ScoreProperty, queryResult.Score);
                     telemetryProperties.Add(QnATelemetryConstants.ArticleFoundProperty, "true");
                 }
                 else
                 {
                     telemetryProperties.Add(QnATelemetryConstants.QuestionProperty, "No Qna Question matched");
-                    telemetryProperties.Add(QnATelemetryConstants.AnswerProperty, "No Qna Question matched");
+                    telemetryProperties.Add(QnATelemetryConstants.AnswerProperty, "No Qna Answer matched");
                     telemetryProperties.Add(QnATelemetryConstants.ArticleFoundProperty, "true");
                 }
 
diff --git a/templates/Enterprise-Template/src/csharp/EnterpriseBotSample/Middleware/Telemetry/LuisTelemetryConstants.cs b/templates/Enterprise-Template/src/csharp/EnterpriseBotSample/Middleware/Telemetry/LuisTelemetryConstants.cs
@@ -8,6 +8,7 @@ namespace EnterpriseBotSample.Middleware.Telemetry
     /// </summary>
     public static class LuisTelemetryConstants
     {
+        public const string ApplicationIdProperty = "applicationId";
         public const string IntentPrefix = "LuisIntent";  // Application Insights Custom Event name (with Intent)
         public const string IntentProperty = "Intent";
         public const string IntentScoreProperty = "IntentScore";
@@ -17,4 +18,4 @@ public static class LuisTelemetryConstants
         public const string SentimentLabelProperty = "SentimentLabel";
         public const string SentimentScoreProperty = "SentimentScore";
     }
-}
+}
diff --git a/templates/Enterprise-Template/src/csharp/EnterpriseBotSample/Middleware/Telemetry/QnATelemetryConstants.cs b/templates/Enterprise-Template/src/csharp/EnterpriseBotSample/Middleware/Telemetry/QnATelemetryConstants.cs
@@ -8,6 +8,7 @@ namespace EnterpriseBotSample.Middleware.Telemetry
     /// </summary>
     public static class QnATelemetryConstants
     {
+        public const string KnowledgeBaseIdProperty = "knowledgeBaseId";
         public const string ActivityIdProperty = "ActivityId";
         public const string UsernameProperty = "Username";
         public const string ConversationIdProperty = "ConversationId";
@@ -17,4 +18,4 @@ public static class QnATelemetryConstants
         public const string ScoreProperty = "Score";
         public const string ArticleFoundProperty = "QnAItemFound";
     }
-}
+}
diff --git a/templates/Enterprise-Template/src/csharp/EnterpriseBotSample/Middleware/Telemetry/TelemetryLuisRecognizer.cs b/templates/Enterprise-Template/src/csharp/EnterpriseBotSample/Middleware/Telemetry/TelemetryLuisRecognizer.cs
@@ -23,6 +23,8 @@ namespace EnterpriseBotSample.Middleware.Telemetry
     /// </summary>
     public class TelemetryLuisRecognizer : LuisRecognizer
     {
+        private LuisApplication _luisApplication;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="TelemetryLuisRecognizer"/> class.
         /// </summary>
@@ -34,6 +36,8 @@ public class TelemetryLuisRecognizer : LuisRecognizer
         public TelemetryLuisRecognizer(LuisApplication application, LuisPredictionOptions predictionOptions = null, bool includeApiResults = false, bool logOriginalMessage = false, bool logUserName = false)
             : base(application, predictionOptions, includeApiResults)
         {
+            _luisApplication = application;
+
             LogOriginalMessage = logOriginalMessage;
             LogUsername = logUserName;
         }
@@ -85,6 +89,7 @@ public TelemetryLuisRecognizer(LuisApplication application, LuisPredictionOption
                 // Add the intent score and conversation id properties
                 var telemetryProperties = new Dictionary<string, string>()
                 {
+                    { LuisTelemetryConstants.ApplicationIdProperty, _luisApplication.ApplicationId },
                     { LuisTelemetryConstants.ActivityIdProperty, context.Activity.Id },
                     { LuisTelemetryConstants.IntentProperty, topLuisIntent.intent },
                     { LuisTelemetryConstants.IntentScoreProperty, intentScore },
@@ -131,4 +136,4 @@ public TelemetryLuisRecognizer(LuisApplication application, LuisPredictionOption
             return recognizerResult;
         }
     }
-}
+}
diff --git a/templates/Enterprise-Template/src/csharp/EnterpriseBotSample/Middleware/Telemetry/TelemetryQnAMaker.cs b/templates/Enterprise-Template/src/csharp/EnterpriseBotSample/Middleware/Telemetry/TelemetryQnAMaker.cs
@@ -7,6 +7,7 @@
 using Microsoft.ApplicationInsights;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.AI.QnA;
+using Newtonsoft.Json;
 
 namespace EnterpriseBotSample.Middleware.Telemetry
 {
@@ -19,7 +20,9 @@ namespace EnterpriseBotSample.Middleware.Telemetry
     /// </summary>
     public class TelemetryQnAMaker : QnAMaker
     {
-        public static readonly string QnaMsgEvent = "QnaMessage";
+        public const string QnaMsgEvent = "QnaMessage";
+
+        private QnAMakerEndpoint _endpoint;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="TelemetryQnAMaker"/> class.
@@ -35,6 +38,8 @@ public TelemetryQnAMaker(QnAMakerEndpoint endpoint, QnAMakerOptions options = nu
         {
             LogUserName = logUserName;
             LogOriginalMessage = logOriginalMessage;
+
+            _endpoint = endpoint;
         }
 
         public bool LogUserName { get; }
@@ -52,6 +57,7 @@ public TelemetryQnAMaker(QnAMakerEndpoint endpoint, QnAMakerOptions options = nu
                 var telemetryProperties = new Dictionary<string, string>();
                 var telemetryMetrics = new Dictionary<string, double>();
 
+                telemetryProperties.Add(QnATelemetryConstants.KnowledgeBaseIdProperty, _endpoint.KnowledgeBaseId);
                 // Make it so we can correlate our reports with Activity or Conversation
                 telemetryProperties.Add(QnATelemetryConstants.ActivityIdProperty, context.Activity.Id);
                 var conversationId = context.Activity.Conversation.Id;
@@ -78,14 +84,14 @@ public TelemetryQnAMaker(QnAMakerEndpoint endpoint, QnAMakerOptions options = nu
                 if (queryResults.Length > 0)
                 {
                     var queryResult = queryResults[0];
-                    telemetryProperties.Add(QnATelemetryConstants.QuestionProperty, string.Join(",", queryResult.Questions));
+                    telemetryProperties.Add(QnATelemetryConstants.QuestionProperty, JsonConvert.SerializeObject(queryResult.Questions));
                     telemetryProperties.Add(QnATelemetryConstants.AnswerProperty, queryResult.Answer);
                     telemetryMetrics.Add(QnATelemetryConstants.ScoreProperty, queryResult.Score);
                 }
                 else
                 {
                     telemetryProperties.Add(QnATelemetryConstants.QuestionProperty, "No Qna Question matched");
-                    telemetryProperties.Add(QnATelemetryConstants.AnswerProperty, "No Qna Question matched");
+                    telemetryProperties.Add(QnATelemetryConstants.AnswerProperty, "No Qna Answer matched");
                 }
 
                 // Track the event
diff --git a/templates/Enterprise-Template/src/csharp/EnterpriseBotTemplate/Bot Framework/Middleware/Telemetry/LuisTelemetryConstants.cs b/templates/Enterprise-Template/src/csharp/EnterpriseBotTemplate/Bot Framework/Middleware/Telemetry/LuisTelemetryConstants.cs
@@ -8,6 +8,7 @@ namespace $safeprojectname$.Middleware.Telemetry
     /// </summary>
     public static class LuisTelemetryConstants
     {
+        public const string ApplicationId = "applicationId";
         public const string IntentPrefix = "luisIntent";  // Application Insights Custom Event name (with Intent)
         public const string IntentProperty = "intent";
         public const string IntentScoreProperty = "intentScore";
@@ -18,4 +19,4 @@ public static class LuisTelemetryConstants
         public const string SentimentScoreProperty = "sentimentScore";
         public const string DialogId = "dialogId";
     }
-}
+}
diff --git a/templates/Enterprise-Template/src/csharp/EnterpriseBotTemplate/Bot Framework/Middleware/Telemetry/QnATelemetryConstants.cs b/templates/Enterprise-Template/src/csharp/EnterpriseBotTemplate/Bot Framework/Middleware/Telemetry/QnATelemetryConstants.cs
@@ -8,6 +8,7 @@ namespace $safeprojectname$.Middleware.Telemetry
     /// </summary>
     public static class QnATelemetryConstants
     {
+        public const string KnowledgeBaseIdProperty = "knowledgeBaseId";
         public const string ActivityIdProperty = "activityId";
         public const string AnswerProperty = "answer";
         public const string ArticleFoundProperty = "articleFound";
@@ -18,4 +19,4 @@ public static class QnATelemetryConstants
         public const string ScoreProperty = "score";
         public const string UsernameProperty = "username";
     }
-}
+}
diff --git a/templates/Enterprise-Template/src/csharp/EnterpriseBotTemplate/Bot Framework/Middleware/Telemetry/TelemetryLuisRecognizer.cs b/templates/Enterprise-Template/src/csharp/EnterpriseBotTemplate/Bot Framework/Middleware/Telemetry/TelemetryLuisRecognizer.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.ApplicationInsights;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.AI.Luis;
 using Microsoft.Bot.Builder.Dialogs;
@@ -24,6 +23,8 @@ namespace $safeprojectname$.Middleware.Telemetry
     /// </summary>
     public class TelemetryLuisRecognizer : LuisRecognizer
     {
+        private LuisApplication _luisApplication;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="TelemetryLuisRecognizer"/> class.
         /// </summary>
@@ -35,6 +36,8 @@ public class TelemetryLuisRecognizer : LuisRecognizer
         public TelemetryLuisRecognizer(LuisApplication application, LuisPredictionOptions predictionOptions = null, bool includeApiResults = false, bool logOriginalMessage = false, bool logUserName = false)
             : base(application, predictionOptions, includeApiResults)
         {
+            _luisApplication = application;
+
             LogOriginalMessage = logOriginalMessage;
             LogUsername = logUserName;
         }
@@ -122,6 +125,7 @@ public TelemetryLuisRecognizer(LuisApplication application, LuisPredictionOption
                 // Add the intent score and conversation id properties
                 var telemetryProperties = new Dictionary<string, string>()
                 {
+                    { LuisTelemetryConstants.ApplicationId, _luisApplication.ApplicationId },
                     { LuisTelemetryConstants.IntentProperty, topLuisIntent.intent },
                     { LuisTelemetryConstants.IntentScoreProperty, intentScore },
                 };
diff --git a/templates/Enterprise-Template/src/csharp/EnterpriseBotTemplate/Bot Framework/Middleware/Telemetry/TelemetryQnAMaker.cs b/templates/Enterprise-Template/src/csharp/EnterpriseBotTemplate/Bot Framework/Middleware/Telemetry/TelemetryQnAMaker.cs
@@ -4,9 +4,9 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.ApplicationInsights;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.AI.QnA;
+using Newtonsoft.Json;
 
 namespace $safeprojectname$.Middleware.Telemetry
 {
@@ -19,7 +19,9 @@ namespace $safeprojectname$.Middleware.Telemetry
     /// </summary>
     public class TelemetryQnAMaker : QnAMaker
     {
-        public static readonly string QnaMsgEvent = "QnaMessage";
+        public const string QnaMsgEvent = "QnaMessage";
+
+        private QnAMakerEndpoint _endpoint;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="TelemetryQnAMaker"/> class.
@@ -35,13 +37,15 @@ public TelemetryQnAMaker(QnAMakerEndpoint endpoint, QnAMakerOptions options = nu
         {
             LogUserName = logUserName;
             LogOriginalMessage = logOriginalMessage;
+
+            _endpoint = endpoint;
         }
 
         public bool LogUserName { get; }
 
         public bool LogOriginalMessage { get; }
 
-        public new async Task<QueryResult[]> GetAnswersAsync(ITurnContext context)
+        public async Task<QueryResult[]> GetAnswersAsync(ITurnContext context)
         {
             // Call Qna Maker
             var queryResults = await base.GetAnswersAsync(context);
@@ -52,6 +56,7 @@ public TelemetryQnAMaker(QnAMakerEndpoint endpoint, QnAMakerOptions options = nu
                 var telemetryProperties = new Dictionary<string, string>();
                 var telemetryMetrics = new Dictionary<string, double>();
 
+                telemetryProperties.Add(QnATelemetryConstants.KnowledgeBaseIdProperty, _endpoint.KnowledgeBaseId);
                 // Make it so we can correlate our reports with Activity or Conversation
                 telemetryProperties.Add(QnATelemetryConstants.ActivityIdProperty, context.Activity.Id);
                 var conversationId = context.Activity.Conversation.Id;
@@ -78,15 +83,15 @@ public TelemetryQnAMaker(QnAMakerEndpoint endpoint, QnAMakerOptions options = nu
                 if (queryResults.Length > 0)
                 {
                     var queryResult = queryResults[0];
-                    telemetryProperties.Add(QnATelemetryConstants.QuestionProperty, string.Join(",", queryResult.Questions));
+                    telemetryProperties.Add(QnATelemetryConstants.QuestionProperty, JsonConvert.SerializeObject(queryResult.Questions));
                     telemetryProperties.Add(QnATelemetryConstants.AnswerProperty, queryResult.Answer);
                     telemetryMetrics.Add(QnATelemetryConstants.ScoreProperty, queryResult.Score);
                     telemetryProperties.Add(QnATelemetryConstants.ArticleFoundProperty, "true");
                 }
                 else
                 {
                     telemetryProperties.Add(QnATelemetryConstants.QuestionProperty, "No Qna Question matched");
-                    telemetryProperties.Add(QnATelemetryConstants.AnswerProperty, "No Qna Question matched");
+                    telemetryProperties.Add(QnATelemetryConstants.AnswerProperty, "No Qna Answer matched");
                     telemetryProperties.Add(QnATelemetryConstants.ArticleFoundProperty, "true");
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Microsoft.Bot.Solutions`
`8`	`8`	`/// </summary>`
`9`	`9`	`public static class LuisTelemetryConstants`
`10`	`10`	`{`
`11`		`- public const string ApplicationId = "applicationId";`
	`11`	`+ public const string ApplicationIdProperty = "applicationId";`
`12`	`12`	`public const string IntentPrefix = "luisIntent"; // Application Insights Custom Event name (with Intent)`
`13`	`13`	`public const string IntentProperty = "intent";`
`14`	`14`	`public const string IntentScoreProperty = "intentScore";`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ namespace Microsoft.Bot.Solutions`
`8`	`8`	`/// </summary>`
`9`	`9`	`public static class QnATelemetryConstants`
`10`	`10`	`{`
	`11`	`+ public const string KnowledgeBaseIdProperty = "knowledgeBaseId";`
`11`	`12`	`public const string ActivityIdProperty = "activityId";`
`12`	`13`	`public const string AnswerProperty = "answer";`
`13`	`14`	`public const string ArticleFoundProperty = "articleFound";`
`@@ -18,4 +19,4 @@ public static class QnATelemetryConstants`
`18`	`19`	`public const string ScoreProperty = "score";`
`19`	`20`	`public const string UsernameProperty = "username";`
`20`	`21`	`}`
`21`		`-}`
	`22`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public TelemetryLuisRecognizer(LuisApplication application, LuisPredictionOption`
`125`	`125`	`// Add the intent score and conversation id properties`
`126`	`126`	`var telemetryProperties = new Dictionary<string, string>()`
`127`	`127`	`{`
`128`		`- { LuisTelemetryConstants.ApplicationId, _luisApplication.ApplicationId },`
	`128`	`+ { LuisTelemetryConstants.ApplicationIdProperty, _luisApplication.ApplicationId },`
`129`	`129`	`{ LuisTelemetryConstants.IntentProperty, topLuisIntent.intent },`
`130`	`130`	`{ LuisTelemetryConstants.IntentScoreProperty, intentScore },`
`131`	`131`	`};`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ namespace EnterpriseBotSample.Middleware.Telemetry`
`8`	`8`	`/// </summary>`
`9`	`9`	`public static class LuisTelemetryConstants`
`10`	`10`	`{`
	`11`	`+ public const string ApplicationIdProperty = "applicationId";`
`11`	`12`	`public const string IntentPrefix = "LuisIntent"; // Application Insights Custom Event name (with Intent)`
`12`	`13`	`public const string IntentProperty = "Intent";`
`13`	`14`	`public const string IntentScoreProperty = "IntentScore";`
`@@ -17,4 +18,4 @@ public static class LuisTelemetryConstants`
`17`	`18`	`public const string SentimentLabelProperty = "SentimentLabel";`
`18`	`19`	`public const string SentimentScoreProperty = "SentimentScore";`
`19`	`20`	`}`
`20`		`-}`
	`21`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@ namespace EnterpriseBotSample.Middleware.Telemetry`
`23`	`23`	`/// </summary>`
`24`	`24`	`public class TelemetryLuisRecognizer : LuisRecognizer`
`25`	`25`	`{`
	`26`	`+ private LuisApplication _luisApplication;`
	`27`	`+`
`26`	`28`	`/// <summary>`
`27`	`29`	`/// Initializes a new instance of the <see cref="TelemetryLuisRecognizer"/> class.`
`28`	`30`	`/// </summary>`
`@@ -34,6 +36,8 @@ public class TelemetryLuisRecognizer : LuisRecognizer`
`34`	`36`	`public TelemetryLuisRecognizer(LuisApplication application, LuisPredictionOptions predictionOptions = null, bool includeApiResults = false, bool logOriginalMessage = false, bool logUserName = false)`
`35`	`37`	`: base(application, predictionOptions, includeApiResults)`
`36`	`38`	`{`
	`39`	`+ _luisApplication = application;`
	`40`	`+`
`37`	`41`	`LogOriginalMessage = logOriginalMessage;`
`38`	`42`	`LogUsername = logUserName;`
`39`	`43`	`}`
`@@ -85,6 +89,7 @@ public TelemetryLuisRecognizer(LuisApplication application, LuisPredictionOption`
`85`	`89`	`// Add the intent score and conversation id properties`
`86`	`90`	`var telemetryProperties = new Dictionary<string, string>()`
`87`	`91`	`{`
	`92`	`+ { LuisTelemetryConstants.ApplicationIdProperty, _luisApplication.ApplicationId },`
`88`	`93`	`{ LuisTelemetryConstants.ActivityIdProperty, context.Activity.Id },`
`89`	`94`	`{ LuisTelemetryConstants.IntentProperty, topLuisIntent.intent },`
`90`	`95`	`{ LuisTelemetryConstants.IntentScoreProperty, intentScore },`
`@@ -131,4 +136,4 @@ public TelemetryLuisRecognizer(LuisApplication application, LuisPredictionOption`
`131`	`136`	`return recognizerResult;`
`132`	`137`	`}`
`133`	`138`	`}`
`134`		`-}`
	`139`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using Microsoft.ApplicationInsights;`
`8`	`8`	`using Microsoft.Bot.Builder;`
`9`	`9`	`using Microsoft.Bot.Builder.AI.QnA;`
	`10`	`+using Newtonsoft.Json;`
`10`	`11`
`11`	`12`	`namespace EnterpriseBotSample.Middleware.Telemetry`
`12`	`13`	`{`
`@@ -19,7 +20,9 @@ namespace EnterpriseBotSample.Middleware.Telemetry`
`19`	`20`	`/// </summary>`
`20`	`21`	`public class TelemetryQnAMaker : QnAMaker`
`21`	`22`	`{`
`22`		`- public static readonly string QnaMsgEvent = "QnaMessage";`
	`23`	`+ public const string QnaMsgEvent = "QnaMessage";`
	`24`	`+`
	`25`	`+ private QnAMakerEndpoint _endpoint;`
`23`	`26`
`24`	`27`	`/// <summary>`
`25`	`28`	`/// Initializes a new instance of the <see cref="TelemetryQnAMaker"/> class.`
`@@ -35,6 +38,8 @@ public TelemetryQnAMaker(QnAMakerEndpoint endpoint, QnAMakerOptions options = nu`
`35`	`38`	`{`
`36`	`39`	`LogUserName = logUserName;`
`37`	`40`	`LogOriginalMessage = logOriginalMessage;`
	`41`	`+`
	`42`	`+ _endpoint = endpoint;`
`38`	`43`	`}`
`39`	`44`
`40`	`45`	`public bool LogUserName { get; }`
`@@ -52,6 +57,7 @@ public TelemetryQnAMaker(QnAMakerEndpoint endpoint, QnAMakerOptions options = nu`
`52`	`57`	`var telemetryProperties = new Dictionary<string, string>();`
`53`	`58`	`var telemetryMetrics = new Dictionary<string, double>();`
`54`	`59`
	`60`	`+ telemetryProperties.Add(QnATelemetryConstants.KnowledgeBaseIdProperty, _endpoint.KnowledgeBaseId);`
`55`	`61`	`// Make it so we can correlate our reports with Activity or Conversation`
`56`	`62`	`telemetryProperties.Add(QnATelemetryConstants.ActivityIdProperty, context.Activity.Id);`
`57`	`63`	`var conversationId = context.Activity.Conversation.Id;`
`@@ -78,14 +84,14 @@ public TelemetryQnAMaker(QnAMakerEndpoint endpoint, QnAMakerOptions options = nu`
`78`	`84`	`if (queryResults.Length > 0)`
`79`	`85`	`{`
`80`	`86`	`var queryResult = queryResults[0];`
`81`		`- telemetryProperties.Add(QnATelemetryConstants.QuestionProperty, string.Join(",", queryResult.Questions));`
	`87`	`+ telemetryProperties.Add(QnATelemetryConstants.QuestionProperty, JsonConvert.SerializeObject(queryResult.Questions));`
`82`	`88`	`telemetryProperties.Add(QnATelemetryConstants.AnswerProperty, queryResult.Answer);`
`83`	`89`	`telemetryMetrics.Add(QnATelemetryConstants.ScoreProperty, queryResult.Score);`
`84`	`90`	`}`
`85`	`91`	`else`
`86`	`92`	`{`
`87`	`93`	`telemetryProperties.Add(QnATelemetryConstants.QuestionProperty, "No Qna Question matched");`
`88`		`- telemetryProperties.Add(QnATelemetryConstants.AnswerProperty, "No Qna Question matched");`
	`94`	`+ telemetryProperties.Add(QnATelemetryConstants.AnswerProperty, "No Qna Answer matched");`
`89`	`95`	`}`
`90`	`96`
`91`	`97`	`// Track the event`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ namespace $safeprojectname$.Middleware.Telemetry`
`8`	`8`	`/// </summary>`
`9`	`9`	`public static class LuisTelemetryConstants`
`10`	`10`	`{`
	`11`	`+ public const string ApplicationId = "applicationId";`
`11`	`12`	`public const string IntentPrefix = "luisIntent"; // Application Insights Custom Event name (with Intent)`
`12`	`13`	`public const string IntentProperty = "intent";`
`13`	`14`	`public const string IntentScoreProperty = "intentScore";`
`@@ -18,4 +19,4 @@ public static class LuisTelemetryConstants`
`18`	`19`	`public const string SentimentScoreProperty = "sentimentScore";`
`19`	`20`	`public const string DialogId = "dialogId";`
`20`	`21`	`}`
`21`		`-}`
	`22`	`+}`