Merge pull request #4267 from microsoft/gary/further-telem-null-checks

Add additional null checks to telemetry logger middleware.
microsoft · Jul 14, 2020 · 7cd2aaa · 7cd2aaa
2 parents 9edaffa + 1f97458
commit 7cd2aaa
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/libraries/Microsoft.Bot.Builder/TelemetryLoggerMiddleware.cs b/libraries/Microsoft.Bot.Builder/TelemetryLoggerMiddleware.cs
@@ -257,8 +257,8 @@ protected virtual async Task OnDeleteActivityAsync(Activity activity, Cancellati
             var properties = new Dictionary<string, string>()
                 {
                     { TelemetryConstants.ReplyActivityIDProperty, activity.ReplyToId },
-                    { TelemetryConstants.RecipientIdProperty, activity.Recipient.Id },
-                    { TelemetryConstants.ConversationNameProperty, activity.Conversation.Name },
+                    { TelemetryConstants.RecipientIdProperty, activity.Recipient?.Id },
+                    { TelemetryConstants.ConversationNameProperty, activity.Conversation?.Name },
                     { TelemetryConstants.LocaleProperty, activity.Locale },
                 };
 
@@ -313,9 +313,9 @@ protected virtual async Task OnDeleteActivityAsync(Activity activity, Cancellati
 
             var properties = new Dictionary<string, string>()
                 {
-                    { TelemetryConstants.RecipientIdProperty, activity.Recipient.Id },
-                    { TelemetryConstants.ConversationIdProperty, activity.Conversation.Id },
-                    { TelemetryConstants.ConversationNameProperty, activity.Conversation.Name },
+                    { TelemetryConstants.RecipientIdProperty, activity.Recipient?.Id },
+                    { TelemetryConstants.ConversationIdProperty, activity.Conversation?.Id },
+                    { TelemetryConstants.ConversationNameProperty, activity.Conversation?.Name },
                     { TelemetryConstants.LocaleProperty, activity.Locale },
                 };
 
@@ -353,9 +353,9 @@ protected virtual async Task OnDeleteActivityAsync(Activity activity, Cancellati
 
             var properties = new Dictionary<string, string>()
                 {
-                    { TelemetryConstants.RecipientIdProperty, activity.Recipient.Id },
-                    { TelemetryConstants.ConversationIdProperty, activity.Conversation.Id },
-                    { TelemetryConstants.ConversationNameProperty, activity.Conversation.Name },
+                    { TelemetryConstants.RecipientIdProperty, activity.Recipient?.Id },
+                    { TelemetryConstants.ConversationIdProperty, activity.Conversation?.Id },
+                    { TelemetryConstants.ConversationNameProperty, activity.Conversation?.Name },
                 };
 
             // Additional Properties can override "stock" properties.