FUS: escape invalid field names in event data

GitOrigin-RevId: a3df8ea9716e011aacfc6715a2dda16f5a5ffc15
This commit is contained in:
Svetlana.Zemlyanskaya
2019-07-31 20:03:41 +03:00
committed by intellij-monorepo-bot
parent 9737ecafac
commit 568f48de07
4 changed files with 5 additions and 4 deletions
@@ -79,7 +79,7 @@ class VcsLogFileHistoryProviderImpl : VcsLogFileHistoryProvider {
private fun triggerFileHistoryUsage(paths: Collection<FilePath>, hash: Hash?) {
VcsLogUsageTriggerCollector.triggerUsage(VcsLogUsageTriggerCollector.VcsLogEvent.HISTORY_SHOWN) { data ->
val kind = if (paths.size > 1) "multiple" else if (paths.first().isDirectory) "folder" else "file"
data.addData("kind", kind).addData("has.revision", hash != null)
data.addData("kind", kind).addData("has_revision", hash != null)
}
}
@@ -67,7 +67,7 @@ open class GoToParentOrChildAction(val parent: Boolean) : DumbAwareAction() {
}
private fun DumbAwareAction.triggerUsage(e: AnActionEvent) {
VcsLogUsageTriggerCollector.triggerUsage(e, this) { data -> data.addData("parent.commit", parent) }
VcsLogUsageTriggerCollector.triggerUsage(e, this) { data -> data.addData("parent_commit", parent) }
}
private fun getActionText(commitMetadata: VcsCommitMetadata): String {
@@ -18,7 +18,7 @@ class BreakpointsUsageCollector {
if (breakpoint is XBreakpointBase<*, *, *>) {
val data = FeatureUsageData()
addType(type, data)
data.addData("within.session", withinSession)
data.addData("within_session", withinSession)
FUCounterUsageLogger.getInstance().logEvent(breakpoint.getProject(), GROUP, "breakpoint.added", data)
}
}
@@ -22,6 +22,7 @@ internal enum class ChangeReminderData {
}
internal fun <T : Enum<*>> T.getReportedId() = this.name.toLowerCase(Locale.ENGLISH).replace('_', '.')
internal fun <T : Enum<*>> T.getReportedFieldName() = this.name.toLowerCase(Locale.ENGLISH)
internal fun logEvent(project: Project, event: ChangeReminderEvent, factor: ChangeReminderData, value: Long) =
logEvent(project, event, mapOf(factor to value))
@@ -30,7 +31,7 @@ internal fun logEvent(project: Project, event: ChangeReminderEvent, data: Map<Ch
val logData = FeatureUsageData()
data.forEach { (factor, value) ->
logData.addData(factor.getReportedId(), value)
logData.addData(factor.getReportedFieldName(), value)
}
FUCounterUsageLogger.getInstance().logEvent(project, "vcs.change.reminder", event.getReportedId(), logData)