Skip to content
This repository was archived by the owner on Dec 4, 2023. It is now read-only.

Update telemetry to log attachments #1114

Merged
tracyboehrer merged 2 commits into from
Mar 30, 2021
Merged

Update telemetry to log attachments #1114

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c065965
Update to log attachments
LeeParrishMSFT Mar 30, 2021
bab9f3a
Add unit test for logging attachments
LeeParrishMSFT Mar 30, 2021
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
Next Next commit
Update to log attachments
  • Loading branch information
@LeeParrishMSFT
LeeParrishMSFT committed Mar 30, 2021
commit c0659652f5c8f2a2b6c5dc576c918b793faa5b0b
1 change: 1 addition & 0 deletions libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TelemetryConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ private TelemetryConstants() {

}

public static final String ATTACHMENTSPROPERTY = "attachments";
public static final String CHANNELIDPROPERTY = "channelId";
public static final String CONVERSATIONIDPROPERTY = "conversationId";
public static final String CONVERSATIONNAMEPROPERTY = "conversationName";
Expand Down
9 changes: 9 additions & 0 deletions libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TelemetryLoggerMiddleware.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ protected CompletableFuture<Void> onDeleteActivity(Activity activity) {
* {@link BotTelemetryClient#trackEvent} method for the
* BotMessageReceived event.
*/
@SuppressWarnings("PMD.EmptyCatchBlock")
protected CompletableFuture<Map<String, String>> fillReceiveEventProperties(
Activity activity,
Map<String, String> additionalProperties
Expand Down Expand Up @@ -217,6 +218,14 @@ protected CompletableFuture<Map<String, String>> fillReceiveEventProperties(
if (!StringUtils.isEmpty(activity.getSpeak())) {
properties.put(TelemetryConstants.SPEAKPROPERTY, activity.getSpeak());
}

if (activity.getAttachments() != null && activity.getAttachments().size() > 0) {
try {
properties.put(TelemetryConstants.ATTACHMENTSPROPERTY,
Serialization.toString(activity.getAttachments()));
} catch (JsonProcessingException e) {
}
}
}

populateAdditionalChannelProperties(activity, properties);
Expand Down