From 501480fbcabac1b0b4de92a4e256eae4936e2745 Mon Sep 17 00:00:00 2001
From: "sergey.vasiliev" <sergey.vasiliev@jetbrains.com>
Date: Thu, 11 Oct 2018 08:48:41 +0200
Subject: [PATCH] FUS context cleanup

---
 .../statistics/ExternalSystemSettingsCollector.kt          | 2 +-
 .../service/fus/collectors/AbstractUsageTrigger.java       | 7 ++++++-
 .../statistic/service/fus/collectors/FUSUsageContext.java  | 4 ----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/statistics/ExternalSystemSettingsCollector.kt b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/statistics/ExternalSystemSettingsCollector.kt
index d21469eeb00d..dcdace1d2ae5 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/statistics/ExternalSystemSettingsCollector.kt
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/statistics/ExternalSystemSettingsCollector.kt
@@ -16,7 +16,7 @@ class ExternalSystemSettingsCollector() : ProjectUsagesCollector() {
     val usages = mutableSetOf<UsageDescriptor>()
 
     for (manager in ExternalSystemApiUtil.getAllManagers()) {
-      val context = FUSUsageContext.create(mapOf("system" to escapeSystemId(manager.getSystemId())))
+      val context = FUSUsageContext.create(escapeSystemId(manager.getSystemId()))
       for (projectsSetting in manager.getSettingsProvider().`fun`(project).getLinkedProjectsSettings()) {
         usages.add(addContext(getBooleanUsage("autoImport", projectsSetting.isUseAutoImport), context))
         usages.add(addContext(getBooleanUsage("useQualifiedModuleNames", projectsSetting.isUseQualifiedModuleNames), context))
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/service/fus/collectors/AbstractUsageTrigger.java b/platform/platform-impl/src/com/intellij/internal/statistic/service/fus/collectors/AbstractUsageTrigger.java
index 31bf5937c3f2..d10d44184a74 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/service/fus/collectors/AbstractUsageTrigger.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/service/fus/collectors/AbstractUsageTrigger.java
@@ -4,6 +4,7 @@ package com.intellij.internal.statistic.service.fus.collectors;
 import com.intellij.internal.statistic.beans.UsageDescriptor;
 import com.intellij.internal.statistic.eventLog.FeatureUsageLogger;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.xmlb.annotations.*;
 import org.jetbrains.annotations.NonNls;
@@ -90,7 +91,7 @@ public abstract class AbstractUsageTrigger<T extends FeatureUsagesCollector> imp
     if (info != null) {
       return info.getUsageCollectorInfo(usageCollectorId).usages.stream()
         .map(usage -> new UsageDescriptor(usage.id, usage.count, (usage.context != null && usage.context.size() > 0) ?
-                                                                 FUSUsageContext.create(usage.context) : null))
+                                                                 FUSUsageContext.create(usage.contextValues()) : null))
         .collect(Collectors.toSet());
     }
     return Collections.emptySet();
@@ -194,5 +195,9 @@ public abstract class AbstractUsageTrigger<T extends FeatureUsagesCollector> imp
       usage.context = context != null ? context.getData() : ContainerUtil.newLinkedHashMap();
       return usage;
     }
+
+    public  String[] contextValues() {
+      return ArrayUtil.toStringArray(context.values());
+    }
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/service/fus/collectors/FUSUsageContext.java b/platform/platform-impl/src/com/intellij/internal/statistic/service/fus/collectors/FUSUsageContext.java
index 073f03cb5dd4..287b5a6655da 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/service/fus/collectors/FUSUsageContext.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/service/fus/collectors/FUSUsageContext.java
@@ -66,10 +66,6 @@ public class FUSUsageContext {
     assert data.length <= MAX_DATA_SIZE;
     return new FUSUsageContext(data);
   }
-  public static FUSUsageContext create(@NotNull Map<String, String> data) {
-    assert data.size() <= MAX_DATA_SIZE;
-    return new FUSUsageContext(data);
-  }
 
   @NotNull
   private static String getContextDataKey(int i) {