From 93c8d028edc08ceb24d711d4274b0963f5025c71 Mon Sep 17 00:00:00 2001 From: "Svetlana.Zemlyanskaya" Date: Fri, 25 Jan 2019 19:39:19 +0100 Subject: [PATCH] FUS: record all events locally if implicitly invoked to simplify collectors testing --- .../actions/RecordStateStatisticsEventLogAction.java | 4 ++-- .../service/fus/collectors/FUStateUsagesLogger.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/actions/RecordStateStatisticsEventLogAction.java b/platform/platform-impl/src/com/intellij/internal/statistic/actions/RecordStateStatisticsEventLogAction.java index be39d5ecc455..fcc055d2a5ab 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/actions/RecordStateStatisticsEventLogAction.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/actions/RecordStateStatisticsEventLogAction.java @@ -42,8 +42,8 @@ public class RecordStateStatisticsEventLogAction extends AnAction { return; } - myStatesLogger.logApplicationStates(approvedGroups); - myStatesLogger.logProjectStates(project, approvedGroups); + myStatesLogger.logApplicationStates(approvedGroups, true); + myStatesLogger.logProjectStates(project, approvedGroups, true); ApplicationManager.getApplication().invokeLater( () -> showNotification(project, e, "Collecting and recording events was finished") diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/service/fus/collectors/FUStateUsagesLogger.java b/platform/platform-impl/src/com/intellij/internal/statistic/service/fus/collectors/FUStateUsagesLogger.java index 6eae9c70a7fb..8975e7cc708c 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/service/fus/collectors/FUStateUsagesLogger.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/service/fus/collectors/FUStateUsagesLogger.java @@ -27,18 +27,18 @@ public class FUStateUsagesLogger implements UsagesCollectorConsumer { public static FUStateUsagesLogger create() { return new FUStateUsagesLogger(); } public void logProjectStates(@NotNull Project project) { - logProjectStates(project, EventLogExternalSettingsService.getInstance().getApprovedGroups()); + logProjectStates(project, EventLogExternalSettingsService.getInstance().getApprovedGroups(), false); } public void logApplicationStates() { - logApplicationStates(EventLogExternalSettingsService.getInstance().getApprovedGroups()); + logApplicationStates(EventLogExternalSettingsService.getInstance().getApprovedGroups(), false); } - public void logProjectStates(@NotNull Project project, @NotNull Set approvedGroups) { + public void logProjectStates(@NotNull Project project, @NotNull Set approvedGroups, boolean recordAll) { if (!approvedGroups.isEmpty() || ApplicationManagerEx.getApplicationEx().isInternal()) { synchronized (LOCK) { for (ProjectUsagesCollector usagesCollector : ProjectUsagesCollector.getExtensions(this)) { - if (approvedGroups.contains(usagesCollector.getGroupId())) { + if (recordAll || approvedGroups.contains(usagesCollector.getGroupId())) { final FeatureUsageGroup group = new FeatureUsageGroup(usagesCollector.getGroupId(), usagesCollector.getVersion()); logUsagesAsStateEvents(project, group, usagesCollector.getData(project), usagesCollector.getUsages(project)); } @@ -47,10 +47,10 @@ public class FUStateUsagesLogger implements UsagesCollectorConsumer { } } - public void logApplicationStates(@NotNull Set approvedGroups) { + public void logApplicationStates(@NotNull Set approvedGroups, boolean recordAll) { synchronized (LOCK) { for (ApplicationUsagesCollector usagesCollector : ApplicationUsagesCollector.getExtensions(this)) { - if (approvedGroups.contains(usagesCollector.getGroupId())) { + if (recordAll || approvedGroups.contains(usagesCollector.getGroupId())) { final FeatureUsageGroup group = new FeatureUsageGroup(usagesCollector.getGroupId(), usagesCollector.getVersion()); logUsagesAsStateEvents(null, group, usagesCollector.getData(), usagesCollector.getUsages()); }