diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/statistics/SearchEverywhereUsageTriggerCollector.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/statistics/SearchEverywhereUsageTriggerCollector.java index 600663d20168..fde282f20008 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/statistics/SearchEverywhereUsageTriggerCollector.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/statistics/SearchEverywhereUsageTriggerCollector.java @@ -25,7 +25,8 @@ public final class SearchEverywhereUsageTriggerCollector extends CounterUsagesCo @ApiStatus.Internal public static final String NOT_REPORTABLE_ID = "third.party"; - public static final StringEventField CONTRIBUTOR_ID_FIELD = EventFields.String("contributorID", Arrays.asList( + @ApiStatus.Internal + public static final List ALLOWED_CONTRIBUTOR_ID_LIST = Arrays.asList( "FileSearchEverywhereContributor", "SearchEverywhereContributor.All", "ClassSearchEverywhereContributor", @@ -44,7 +45,9 @@ public final class SearchEverywhereUsageTriggerCollector extends CounterUsagesCo "RiderOnboardingSearchEverywhereContributor", "CalculatorSEContributor", "DbObjectsSEContributor" - )); + ); + + public static final StringEventField CONTRIBUTOR_ID_FIELD = EventFields.String("contributorID", ALLOWED_CONTRIBUTOR_ID_LIST); private static final List ourTabs = Arrays.asList("FileSearchEverywhereContributor", "SearchEverywhereContributor.All", diff --git a/plugins/search-everywhere-ml/ranking/core/src/com/intellij/searchEverywhereMl/ranking/core/SearchEverywhereMLStatisticsCollector.kt b/plugins/search-everywhere-ml/ranking/core/src/com/intellij/searchEverywhereMl/ranking/core/SearchEverywhereMLStatisticsCollector.kt index 9ea4066753e2..c9a78ed68cc5 100644 --- a/plugins/search-everywhere-ml/ranking/core/src/com/intellij/searchEverywhereMl/ranking/core/SearchEverywhereMLStatisticsCollector.kt +++ b/plugins/search-everywhere-ml/ranking/core/src/com/intellij/searchEverywhereMl/ranking/core/SearchEverywhereMLStatisticsCollector.kt @@ -4,6 +4,7 @@ package com.intellij.searchEverywhereMl.ranking.core import com.intellij.ide.actions.searcheverywhere.SearchEverywhereEssentialContributorMarker import com.intellij.ide.actions.searcheverywhere.SearchEverywhereMixedListInfo import com.intellij.ide.actions.searcheverywhere.SearchRestartReason +import com.intellij.ide.actions.searcheverywhere.statistics.SearchEverywhereUsageTriggerCollector.ALLOWED_CONTRIBUTOR_ID_LIST import com.intellij.ide.util.gotoByName.GotoActionModel import com.intellij.internal.statistic.collectors.fus.actions.persistence.ActionsEventLogGroup import com.intellij.internal.statistic.eventLog.EventLogGroup @@ -20,7 +21,6 @@ import com.intellij.searchEverywhereMl.features.SearchEverywhereStateFeaturesPro import com.intellij.searchEverywhereMl.log.MLSE_RECORDER_ID import com.intellij.searchEverywhereMl.ranking.core.features.SearchEverywhereContextFeaturesProvider import com.intellij.searchEverywhereMl.ranking.core.features.SearchEverywhereContributorFeaturesProvider -import com.intellij.searchEverywhereMl.ranking.core.features.SearchEverywhereContributorFeaturesProvider.SE_CONTRIBUTORS import com.intellij.searchEverywhereMl.ranking.core.features.SearchEverywhereElementFeaturesProvider import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.VisibleForTesting @@ -174,7 +174,7 @@ object SearchEverywhereMLStatisticsCollector : CounterUsagesCollector() { // context fields private val IS_PROJECT_OPEN = EventFields.Boolean("isProjectOpen") private val IS_PROJECT_DISPOSED_KEY = EventFields.Boolean("projectDisposed") - internal val SE_TAB_ID_KEY = EventFields.String("seTabId", SE_CONTRIBUTORS) + internal val SE_TAB_ID_KEY = EventFields.String("seTabId", ALLOWED_CONTRIBUTOR_ID_LIST) internal val SEARCH_START_TIME_KEY = EventFields.Long("startTime") internal val REBUILD_REASON_KEY = EventFields.Enum("rebuildReason") internal val SESSION_ID = EventFields.Int("sessionId") @@ -214,7 +214,7 @@ object SearchEverywhereMLStatisticsCollector : CounterUsagesCollector() { * within the context of a Search Everywhere action. */ internal val ELEMENT_CONTRIBUTOR = EventFields.String("contributor", - SearchEverywhereContributorFeaturesProvider.SE_CONTRIBUTORS, + ALLOWED_CONTRIBUTOR_ID_LIST, "Contributor name that provided the element") val COLLECTED_RESULTS_DATA_KEY: ObjectListEventField = ObjectListEventField( diff --git a/plugins/search-everywhere-ml/ranking/core/src/com/intellij/searchEverywhereMl/ranking/core/features/SearchEverywhereContributorFeaturesProvider.kt b/plugins/search-everywhere-ml/ranking/core/src/com/intellij/searchEverywhereMl/ranking/core/features/SearchEverywhereContributorFeaturesProvider.kt index f1f70917f0ae..ce8287d16e7b 100644 --- a/plugins/search-everywhere-ml/ranking/core/src/com/intellij/searchEverywhereMl/ranking/core/features/SearchEverywhereContributorFeaturesProvider.kt +++ b/plugins/search-everywhere-ml/ranking/core/src/com/intellij/searchEverywhereMl/ranking/core/features/SearchEverywhereContributorFeaturesProvider.kt @@ -4,6 +4,7 @@ import com.intellij.ide.actions.searcheverywhere.EssentialContributor import com.intellij.ide.actions.searcheverywhere.SearchEverywhereContributor import com.intellij.ide.actions.searcheverywhere.SearchEverywhereEssentialContributorMarker import com.intellij.ide.actions.searcheverywhere.SearchEverywhereMixedListInfo +import com.intellij.ide.actions.searcheverywhere.statistics.SearchEverywhereUsageTriggerCollector.ALLOWED_CONTRIBUTOR_ID_LIST import com.intellij.internal.statistic.eventLog.events.EventField import com.intellij.internal.statistic.eventLog.events.EventFields import com.intellij.internal.statistic.eventLog.events.EventPair @@ -14,18 +15,7 @@ import com.intellij.searchEverywhereMl.ranking.core.features.statistician.Contri import com.intellij.searchEverywhereMl.ranking.core.features.statistician.getContributorStatistics internal object SearchEverywhereContributorFeaturesProvider { - val SE_CONTRIBUTORS = listOf( - "SearchEverywhereContributor.All", "ClassSearchEverywhereContributor", - "FileSearchEverywhereContributor", "RecentFilesSEContributor", - "SymbolSearchEverywhereContributor", "ActionSearchEverywhereContributor", - "RunConfigurationsSEContributor", "CommandsContributor", - "TopHitSEContributor", "com.intellij.ide.actions.searcheverywhere.CalculatorSEContributor", - "TmsSearchEverywhereContributor", "YAMLKeysSearchEverywhereContributor", - "UrlSearchEverywhereContributor", "Vcs.Git", "AutocompletionContributor", - "TextSearchContributor", "DbSETablesContributor", "third.party" - ) - - val CONTRIBUTOR_INFO_ID = EventFields.String("contributorId", SE_CONTRIBUTORS) + val CONTRIBUTOR_INFO_ID = EventFields.String("contributorId", ALLOWED_CONTRIBUTOR_ID_LIST) val CONTRIBUTOR_PRIORITY = EventFields.Int("contributorPriority") val CONTRIBUTOR_WEIGHT = EventFields.Int("contributorWeight") val CONTRIBUTOR_IS_MOST_POPULAR = EventFields.Boolean("contributorIsMostPopular")