[Skills] set telemetry (#2561)

xieofxie · web-flow · commit 78b8cef91c29 · 2019-10-25T10:11:36.000+08:00
diff --git a/sdk/csharp/libraries/microsoft.bot.builder.solutions.skills/SkillDialog.cs b/sdk/csharp/libraries/microsoft.bot.builder.solutions.skills/SkillDialog.cs
@@ -76,6 +76,9 @@ public SkillDialog(
 
             AddDialog(new WaterfallDialog(DialogIds.ConfirmSkillSwitchFlow, intentSwitching));
             AddDialog(new ConfirmPrompt(DialogIds.ConfirmSkillSwitchPrompt));
+
+            // TODO It overwrites all added dialogs. See DialogSet
+            TelemetryClient = telemetryClient;
         }
 
         public async Task<DialogTurnResult> ConfirmIntentSwitch(WaterfallStepContext sc, CancellationToken cancellationToken)
diff --git a/skills/csharp/calendarskill/Adapters/CalendarSkillWebSocketBotAdapter.cs b/skills/csharp/calendarskill/Adapters/CalendarSkillWebSocketBotAdapter.cs
@@ -19,6 +19,7 @@ public CalendarSkillWebSocketBotAdapter(
             ConversationState conversationState,
             ResponseManager responseManager,
             IBotTelemetryClient telemetryClient)
+            : base(null, telemetryClient)
         {
             OnTurnError = async (context, exception) =>
             {
diff --git a/skills/csharp/emailskill/Adapters/EmailSkillWebSocketBotAdapter.cs b/skills/csharp/emailskill/Adapters/EmailSkillWebSocketBotAdapter.cs
@@ -19,6 +19,7 @@ public EmailSkillWebSocketBotAdapter(
             ConversationState conversationState,
             ResponseManager responseManager,
             IBotTelemetryClient telemetryClient)
+            : base(null, telemetryClient)
         {
             OnTurnError = async (context, exception) =>
             {
diff --git a/skills/csharp/experimental/automotiveskill/Adapters/AutomotiveSkillWebSocketBotAdapter.cs b/skills/csharp/experimental/automotiveskill/Adapters/AutomotiveSkillWebSocketBotAdapter.cs
@@ -19,6 +19,7 @@ public AutomotiveSkillWebSocketBotAdapter(
             ConversationState conversationState,
             ResponseManager responseManager,
             IBotTelemetryClient telemetryClient)
+            : base(null, telemetryClient)
         {
             OnTurnError = async (context, exception) =>
             {
diff --git a/skills/csharp/experimental/bingsearchskill/Adapters/CustomSkillAdapter.cs b/skills/csharp/experimental/bingsearchskill/Adapters/CustomSkillAdapter.cs
@@ -19,6 +19,7 @@ public CustomSkillAdapter(
             ConversationState conversationState,
             ResponseManager responseManager,
             IBotTelemetryClient telemetryClient)
+            : base(null, telemetryClient)
         {
             OnTurnError = async (context, exception) =>
             {
diff --git a/skills/csharp/experimental/eventskill/Adapters/EventSkillAdapter.cs b/skills/csharp/experimental/eventskill/Adapters/EventSkillAdapter.cs
@@ -22,6 +22,7 @@ public EventSkillAdapter(
             ConversationState conversationState,
             ResponseManager responseManager,
             IBotTelemetryClient telemetryClient)
+            : base(null, telemetryClient)
         {
             OnTurnError = async (context, exception) =>
             {
diff --git a/skills/csharp/experimental/hospitalityskill/Adapters/HospitalitySkillAdapter.cs b/skills/csharp/experimental/hospitalityskill/Adapters/HospitalitySkillAdapter.cs
@@ -22,6 +22,7 @@ public HospitalitySkillAdapter(
             ConversationState conversationState,
             ResponseManager responseManager,
             IBotTelemetryClient telemetryClient)
+            : base(null, telemetryClient)
         {
             OnTurnError = async (context, exception) =>
             {
diff --git a/skills/csharp/experimental/itsmskill/Adapters/CustomSkillAdapter.cs b/skills/csharp/experimental/itsmskill/Adapters/CustomSkillAdapter.cs
@@ -22,6 +22,7 @@ public CustomSkillAdapter(
             ConversationState conversationState,
             ResponseManager responseManager,
             IBotTelemetryClient telemetryClient)
+            : base(null, telemetryClient)
         {
             OnTurnError = async (context, exception) =>
             {
diff --git a/skills/csharp/experimental/musicskill/Adapters/CustomSkillAdapter.cs b/skills/csharp/experimental/musicskill/Adapters/CustomSkillAdapter.cs
@@ -22,6 +22,7 @@ public CustomSkillAdapter(
             ConversationState conversationState,
             ResponseManager responseManager,
             IBotTelemetryClient telemetryClient)
+            : base(null, telemetryClient)
         {
             OnTurnError = async (context, exception) =>
             {
diff --git a/skills/csharp/experimental/newsskill/Adapters/NewsSkillWebSocketBotAdapter.cs b/skills/csharp/experimental/newsskill/Adapters/NewsSkillWebSocketBotAdapter.cs
@@ -17,6 +17,7 @@ public NewsSkillWebSocketBotAdapter(
             UserState userState,
             ConversationState conversationState,
             IBotTelemetryClient telemetryClient)
+            : base(null, telemetryClient)
         {
             OnTurnError = async (context, exception) =>
             {
diff --git a/skills/csharp/experimental/phoneskill/Adapters/PhoneSkillWebSocketBotAdapter.cs b/skills/csharp/experimental/phoneskill/Adapters/PhoneSkillWebSocketBotAdapter.cs
@@ -23,6 +23,7 @@ public PhoneSkillWebSocketBotAdapter(
             BotStateSet botStateSet,
             ResponseManager responseManager,
             IBotTelemetryClient telemetryClient)
+            : base(null, telemetryClient)
         {
             OnTurnError = async (context, exception) =>
             {
diff --git a/skills/csharp/experimental/restaurantbookingskill/Adapters/RestaurantSkillWebSocketBotAdapter.cs b/skills/csharp/experimental/restaurantbookingskill/Adapters/RestaurantSkillWebSocketBotAdapter.cs
@@ -19,6 +19,7 @@ public RestaurantSkillWebSocketBotAdapter(
             ConversationState conversationState,
             ResponseManager responseManager,
             IBotTelemetryClient telemetryClient)
+            : base(null, telemetryClient)
         {
             OnTurnError = async (context, exception) =>
             {
diff --git a/skills/csharp/experimental/weatherskill/Adapters/CustomSkillAdapter.cs b/skills/csharp/experimental/weatherskill/Adapters/CustomSkillAdapter.cs
@@ -19,6 +19,7 @@ public CustomSkillAdapter(
             ConversationState conversationState,
             ResponseManager responseManager,
             IBotTelemetryClient telemetryClient)
+            : base(null, telemetryClient)
         {
             OnTurnError = async (context, exception) =>
             {
diff --git a/skills/csharp/pointofinterestskill/Adapters/POISkillWebSocketBotAdapter.cs b/skills/csharp/pointofinterestskill/Adapters/POISkillWebSocketBotAdapter.cs
@@ -19,6 +19,7 @@ public POISkillWebSocketBotAdapter(
             ConversationState conversationState,
             ResponseManager responseManager,
             IBotTelemetryClient telemetryClient)
+            : base(null, telemetryClient)
         {
             OnTurnError = async (context, exception) =>
             {
diff --git a/skills/csharp/todoskill/Adapters/ToDoSkillWebSocketBotAdapter.cs b/skills/csharp/todoskill/Adapters/ToDoSkillWebSocketBotAdapter.cs
@@ -19,6 +19,7 @@ public ToDoSkillWebSocketBotAdapter(
             ConversationState conversationState,
             ResponseManager responseManager,
             IBotTelemetryClient telemetryClient)
+            : base(null, telemetryClient)
         {
             OnTurnError = async (context, exception) =>
             {
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Adapters/CustomSkillAdapter.cs b/templates/Skill-Template/csharp/Sample/SkillSample/Adapters/CustomSkillAdapter.cs
@@ -22,6 +22,7 @@ public CustomSkillAdapter(
             ConversationState conversationState,
             ResponseManager responseManager,
             IBotTelemetryClient telemetryClient)
+            : base(null, telemetryClient)
         {
             OnTurnError = async (context, exception) =>
             {
diff --git a/templates/Skill-Template/csharp/Template/Skill/Adapters/CustomSkillAdapter.cs b/templates/Skill-Template/csharp/Template/Skill/Adapters/CustomSkillAdapter.cs
@@ -22,6 +22,7 @@ public CustomSkillAdapter(
             ConversationState conversationState,
             ResponseManager responseManager,
             IBotTelemetryClient telemetryClient)
+            : base(null, telemetryClient)
         {
             OnTurnError = async (context, exception) =>
             {

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,9 @@ public SkillDialog(`
`76`	`76`
`77`	`77`	`AddDialog(new WaterfallDialog(DialogIds.ConfirmSkillSwitchFlow, intentSwitching));`
`78`	`78`	`AddDialog(new ConfirmPrompt(DialogIds.ConfirmSkillSwitchPrompt));`
	`79`	`+`
	`80`	`+ // TODO It overwrites all added dialogs. See DialogSet`
	`81`	`+ TelemetryClient = telemetryClient;`
`79`	`82`	`}`
`80`	`83`
`81`	`84`	`public async Task<DialogTurnResult> ConfirmIntentSwitch(WaterfallStepContext sc, CancellationToken cancellationToken)`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public CalendarSkillWebSocketBotAdapter(`
`19`	`19`	`ConversationState conversationState,`
`20`	`20`	`ResponseManager responseManager,`
`21`	`21`	`IBotTelemetryClient telemetryClient)`
	`22`	`+ : base(null, telemetryClient)`
`22`	`23`	`{`
`23`	`24`	`OnTurnError = async (context, exception) =>`
`24`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public EmailSkillWebSocketBotAdapter(`
`19`	`19`	`ConversationState conversationState,`
`20`	`20`	`ResponseManager responseManager,`
`21`	`21`	`IBotTelemetryClient telemetryClient)`
	`22`	`+ : base(null, telemetryClient)`
`22`	`23`	`{`
`23`	`24`	`OnTurnError = async (context, exception) =>`
`24`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public AutomotiveSkillWebSocketBotAdapter(`
`19`	`19`	`ConversationState conversationState,`
`20`	`20`	`ResponseManager responseManager,`
`21`	`21`	`IBotTelemetryClient telemetryClient)`
	`22`	`+ : base(null, telemetryClient)`
`22`	`23`	`{`
`23`	`24`	`OnTurnError = async (context, exception) =>`
`24`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public CustomSkillAdapter(`
`19`	`19`	`ConversationState conversationState,`
`20`	`20`	`ResponseManager responseManager,`
`21`	`21`	`IBotTelemetryClient telemetryClient)`
	`22`	`+ : base(null, telemetryClient)`
`22`	`23`	`{`
`23`	`24`	`OnTurnError = async (context, exception) =>`
`24`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public EventSkillAdapter(`
`22`	`22`	`ConversationState conversationState,`
`23`	`23`	`ResponseManager responseManager,`
`24`	`24`	`IBotTelemetryClient telemetryClient)`
	`25`	`+ : base(null, telemetryClient)`
`25`	`26`	`{`
`26`	`27`	`OnTurnError = async (context, exception) =>`
`27`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public HospitalitySkillAdapter(`
`22`	`22`	`ConversationState conversationState,`
`23`	`23`	`ResponseManager responseManager,`
`24`	`24`	`IBotTelemetryClient telemetryClient)`
	`25`	`+ : base(null, telemetryClient)`
`25`	`26`	`{`
`26`	`27`	`OnTurnError = async (context, exception) =>`
`27`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public CustomSkillAdapter(`
`22`	`22`	`ConversationState conversationState,`
`23`	`23`	`ResponseManager responseManager,`
`24`	`24`	`IBotTelemetryClient telemetryClient)`
	`25`	`+ : base(null, telemetryClient)`
`25`	`26`	`{`
`26`	`27`	`OnTurnError = async (context, exception) =>`
`27`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public NewsSkillWebSocketBotAdapter(`
`17`	`17`	`UserState userState,`
`18`	`18`	`ConversationState conversationState,`
`19`	`19`	`IBotTelemetryClient telemetryClient)`
	`20`	`+ : base(null, telemetryClient)`
`20`	`21`	`{`
`21`	`22`	`OnTurnError = async (context, exception) =>`
`22`	`23`	`{`