From 568f48de07a1da895e4b964c66900c83bc54a342 Mon Sep 17 00:00:00 2001 From: "Svetlana.Zemlyanskaya" Date: Wed, 31 Jul 2019 18:36:06 +0200 Subject: [PATCH] FUS: escape invalid field names in event data GitOrigin-RevId: a3df8ea9716e011aacfc6715a2dda16f5a5ffc15 --- .../intellij/vcs/log/history/VcsLogFileHistoryProviderImpl.kt | 2 +- .../com/intellij/vcs/log/ui/actions/GoToParentOrChildAction.kt | 2 +- .../xdebugger/impl/breakpoints/BreakpointsUsageCollector.kt | 2 +- .../changeReminder/stats/ChangeReminderStatsCollector.kt | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/history/VcsLogFileHistoryProviderImpl.kt b/platform/vcs-log/impl/src/com/intellij/vcs/log/history/VcsLogFileHistoryProviderImpl.kt index b0764007fb09..017a24eed541 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/history/VcsLogFileHistoryProviderImpl.kt +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/history/VcsLogFileHistoryProviderImpl.kt @@ -79,7 +79,7 @@ class VcsLogFileHistoryProviderImpl : VcsLogFileHistoryProvider { private fun triggerFileHistoryUsage(paths: Collection, 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) } } diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/GoToParentOrChildAction.kt b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/GoToParentOrChildAction.kt index 4d1a7575215b..4170ba629faf 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/GoToParentOrChildAction.kt +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/GoToParentOrChildAction.kt @@ -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 { diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/BreakpointsUsageCollector.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/BreakpointsUsageCollector.kt index d59d24ae1608..445707c74e2e 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/BreakpointsUsageCollector.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/BreakpointsUsageCollector.kt @@ -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) } } diff --git a/plugins/changeReminder/src/com/jetbrains/changeReminder/stats/ChangeReminderStatsCollector.kt b/plugins/changeReminder/src/com/jetbrains/changeReminder/stats/ChangeReminderStatsCollector.kt index d196bc6a08a1..50d7c3e96aaf 100644 --- a/plugins/changeReminder/src/com/jetbrains/changeReminder/stats/ChangeReminderStatsCollector.kt +++ b/plugins/changeReminder/src/com/jetbrains/changeReminder/stats/ChangeReminderStatsCollector.kt @@ -22,6 +22,7 @@ internal enum class ChangeReminderData { } internal fun > T.getReportedId() = this.name.toLowerCase(Locale.ENGLISH).replace('_', '.') +internal fun > 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 - logData.addData(factor.getReportedId(), value) + logData.addData(factor.getReportedFieldName(), value) } FUCounterUsageLogger.getInstance().logEvent(project, "vcs.change.reminder", event.getReportedId(), logData)