Skip to content

Add null check for from #1807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 28, 2020
Merged

Add null check for from #1807

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a5679f
Add null check for from
garypretty Feb 27, 2020
a766e7c
Merge branch 'master' into gary/telemetry-null-check
Stevenic Feb 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libraries/botbuilder-core/src/telemetryLoggerMiddleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ export class TelemetryLoggerMiddleware implements Middleware {
protected async fillReceiveEventProperties(activity: Activity, telemetryProperties?: {[key: string]:string}): Promise<{ [key: string]: string }> {
const properties: { [key: string]: string } = {};

properties[this.telemetryConstants.fromIdProperty] = activity.from.id || '';
properties[this.telemetryConstants.fromIdProperty] = activity.from ? activity.from.id : '';
properties[this.telemetryConstants.conversationNameProperty] = activity.conversation.name || '';
properties[this.telemetryConstants.localeProperty] = activity.locale || '';
properties[this.telemetryConstants.recipientIdProperty] = activity.recipient.id;
Expand All @@ -197,8 +197,8 @@ export class TelemetryLoggerMiddleware implements Middleware {
// Use the LogPersonalInformation flag to toggle logging PII data, text and user name are common examples
if (this.logPersonalInformation) {

if (activity.from.name && activity.from.name.trim()) {
properties[this.telemetryConstants.fromNameProperty] = activity.from.name;
if (activity.from && activity.from.name && activity.from.name.trim()) {
properties[this.telemetryConstants.fromNameProperty] = activity.from ? activity.from.name : '';;
}

if (activity.text && activity.text.trim()) {
Expand Down