FUS context cleanup

This commit is contained in:
sergey.vasiliev
2018-10-11 08:51:41 +02:00
parent aab2fdb3b8
commit 501480fbca
3 changed files with 7 additions and 6 deletions
@@ -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))
@@ -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());
}
}
}
@@ -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) {