From 644c1b834fa30cc2e261abab961999cff3331ef9 Mon Sep 17 00:00:00 2001
From: "Svetlana.Zemlyanskaya" <svetlana.zemlyanskaya@jetbrains.com>
Date: Thu, 22 Nov 2018 11:15:31 +0100
Subject: [PATCH] FUS: report ui collectors from listed or JB plugins

---
 .../actions/persistence/IntentionsCollector.java  | 15 +++++++++++----
 .../actions/persistence/MainMenuCollector.java    |  5 ++++-
 .../ui/persistence/ToolbarClicksCollector.java    | 15 ++++++++++++++-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/IntentionsCollector.java b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/IntentionsCollector.java
index 69d3069139ea..887b34144505 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/IntentionsCollector.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/IntentionsCollector.java
@@ -9,6 +9,8 @@ import com.intellij.internal.statistic.collectors.fus.actions.IntentionUsagesCol
 import com.intellij.internal.statistic.eventLog.FeatureUsageLogger;
 import com.intellij.internal.statistic.persistence.UsageStatisticsPersistenceComponent;
 import com.intellij.internal.statistic.service.fus.collectors.FUSUsageContext;
+import com.intellij.internal.statistic.utils.PluginType;
+import com.intellij.internal.statistic.utils.StatisticsUtilKt;
 import com.intellij.lang.Language;
 import com.intellij.openapi.components.*;
 import com.intellij.openapi.util.text.StringUtil;
@@ -57,7 +59,7 @@ public class IntentionsCollector extends BaseUICollector implements PersistentSt
   }
 
   @NotNull
-  private String getIntentionId(@NotNull IntentionAction action) {
+  private static String getIntentionId(@NotNull IntentionAction action) {
     Object handler = action;
     if (action instanceof IntentionActionDelegate) {
       IntentionAction delegate = ((IntentionActionDelegate)action).getDelegate();
@@ -71,15 +73,20 @@ public class IntentionsCollector extends BaseUICollector implements PersistentSt
       }
     }
 
-    String fqn = handler.getClass().getName();
+    final Class<?> clazz = handler.getClass();
+    final PluginType type = StatisticsUtilKt.getPluginType(clazz);
+    if (!type.isSafeToReport()) {
+      return type.name();
+    }
+
+    String fqn = clazz.getName();
     for (String prefix : PREFIXES_TO_STRIP) {
       fqn = StringUtil.trimStart(fqn, prefix);
     }
 
-    if (isNotBundledPluginClass(handler.getClass())) {
+    if (!type.isBundled()) {
       fqn = "[!]" + fqn;
     }
-
     return fqn;
   }
 
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/MainMenuCollector.java b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/MainMenuCollector.java
index 9a5f35acb243..b5ce349b9cec 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/MainMenuCollector.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/MainMenuCollector.java
@@ -6,6 +6,8 @@ import com.intellij.internal.statistic.collectors.fus.actions.MainMenuUsagesColl
 import com.intellij.internal.statistic.eventLog.FeatureUsageLogger;
 import com.intellij.internal.statistic.persistence.UsageStatisticsPersistenceComponent;
 import com.intellij.internal.statistic.service.fus.collectors.FUSUsageContext;
+import com.intellij.internal.statistic.utils.PluginType;
+import com.intellij.internal.statistic.utils.StatisticsUtilKt;
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.impl.ActionMenu;
@@ -53,7 +55,8 @@ public class MainMenuCollector extends BaseUICollector implements PersistentStat
 
   public void record(@NotNull AnAction action) {
     try {
-      if (isNotBundledPluginClass(action.getClass())) {
+      final PluginType type = StatisticsUtilKt.getPluginType(action.getClass());
+      if (!type.isJBPlugin()) {
         return;
       }
 
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ui/persistence/ToolbarClicksCollector.java b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ui/persistence/ToolbarClicksCollector.java
index c7280d44e383..1640f7b02097 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ui/persistence/ToolbarClicksCollector.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ui/persistence/ToolbarClicksCollector.java
@@ -2,10 +2,13 @@
 package com.intellij.internal.statistic.collectors.fus.ui.persistence;
 
 import com.intellij.internal.statistic.beans.ConvertUsagesUtil;
+import com.intellij.internal.statistic.collectors.fus.actions.persistence.BaseUICollector;
 import com.intellij.internal.statistic.collectors.fus.ui.ToolbarClicksUsagesCollector;
 import com.intellij.internal.statistic.eventLog.FeatureUsageLogger;
 import com.intellij.internal.statistic.persistence.UsageStatisticsPersistenceComponent;
 import com.intellij.internal.statistic.service.fus.collectors.FUSUsageContext;
+import com.intellij.internal.statistic.utils.PluginType;
+import com.intellij.internal.statistic.utils.StatisticsUtilKt;
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.ActionWithDelegate;
 import com.intellij.openapi.actionSystem.AnAction;
@@ -47,6 +50,16 @@ public class ToolbarClicksCollector implements PersistentStateComponent<ToolbarC
   }
 
   public static void record(@NotNull AnAction action, String place) {
+    record(toRecordedId(action), place);
+  }
+
+  @NotNull
+  private static String toRecordedId(@NotNull AnAction action) {
+    final PluginType type = StatisticsUtilKt.getPluginType(action.getClass());
+    if (!type.isJBPlugin()) {
+      return type.name();
+    }
+
     String id = ActionManager.getInstance().getId(action);
     if (id == null) {
       if (action instanceof ActionWithDelegate) {
@@ -55,7 +68,7 @@ public class ToolbarClicksCollector implements PersistentStateComponent<ToolbarC
         id = action.getClass().getName();
       }
     }
-    record(id, place);
+    return id;
   }
 
   public static void record(String actionId, String place) {