From 43ceecb6cb489708340032c4c874f426248894de Mon Sep 17 00:00:00 2001 From: Ivan Migalev Date: Sat, 22 Feb 2025 18:15:25 +0100 Subject: [PATCH] What's New: drop legacy FUS collectors GitOrigin-RevId: 4ec12db13740dbc8184aa11b6614f816cb45bafa --- .../resources/intellij.platform.whatsNew.xml | 2 -- ...gacyRiderWhatsNewCounterUsagesCollector.kt | 21 ------------------- .../WhatsNewCounterUsageCollector.kt | 7 +------ .../whatsNew/reaction/ReactionCollector.kt | 12 +---------- 4 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 platform/whatsNew/src/com/intellij/platform/whatsNew/collectors/LegacyRiderWhatsNewCounterUsagesCollector.kt diff --git a/platform/whatsNew/resources/intellij.platform.whatsNew.xml b/platform/whatsNew/resources/intellij.platform.whatsNew.xml index 7db00b28e537..8c460e1bbfcf 100644 --- a/platform/whatsNew/resources/intellij.platform.whatsNew.xml +++ b/platform/whatsNew/resources/intellij.platform.whatsNew.xml @@ -3,8 +3,6 @@ - - diff --git a/platform/whatsNew/src/com/intellij/platform/whatsNew/collectors/LegacyRiderWhatsNewCounterUsagesCollector.kt b/platform/whatsNew/src/com/intellij/platform/whatsNew/collectors/LegacyRiderWhatsNewCounterUsagesCollector.kt deleted file mode 100644 index fb0da73be7a1..000000000000 --- a/platform/whatsNew/src/com/intellij/platform/whatsNew/collectors/LegacyRiderWhatsNewCounterUsagesCollector.kt +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.platform.whatsNew.collectors - -import com.intellij.internal.statistic.collectors.fus.actions.persistence.ActionRuleValidator -import com.intellij.internal.statistic.eventLog.EventLogGroup -import com.intellij.internal.statistic.eventLog.events.EventFields -import com.intellij.internal.statistic.service.fus.collectors.CounterUsagesCollector -import kotlin.jvm.java - -internal object LegacyRiderWhatsNewCounterUsagesCollector : CounterUsagesCollector() { - private val eventLogGroup: EventLogGroup = EventLogGroup("rider.whatsnew.eap", 4) - internal val opened = eventLogGroup.registerEvent("tab_opened", EventFields.Enum(("type"), OpenedType::class.java)) - internal val closed = eventLogGroup.registerEvent("tab_closed") - internal val actionId = EventFields.StringValidatedByCustomRule("action_id", ActionRuleValidator::class.java) - internal val perform = eventLogGroup.registerEvent("action_performed", actionId) - internal val failed = eventLogGroup.registerEvent("action_failed", actionId, EventFields.Enum(("type"), ActionFailedReason::class.java)) - - override fun getGroup(): EventLogGroup { - return eventLogGroup - } -} \ No newline at end of file diff --git a/platform/whatsNew/src/com/intellij/platform/whatsNew/collectors/WhatsNewCounterUsageCollector.kt b/platform/whatsNew/src/com/intellij/platform/whatsNew/collectors/WhatsNewCounterUsageCollector.kt index cadacb3bcb0d..6767341145c7 100644 --- a/platform/whatsNew/src/com/intellij/platform/whatsNew/collectors/WhatsNewCounterUsageCollector.kt +++ b/platform/whatsNew/src/com/intellij/platform/whatsNew/collectors/WhatsNewCounterUsageCollector.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.platform.whatsNew.collectors import com.intellij.internal.statistic.collectors.fus.actions.persistence.ActionRuleValidator @@ -21,27 +21,22 @@ internal object WhatsNewCounterUsageCollector : CounterUsagesCollector() { fun openedPerformed(project: Project?, byClient: Boolean) { opened.log(project, if (byClient) OpenedType.ByClient else OpenedType.Auto) - LegacyRiderWhatsNewCounterUsagesCollector.opened.log(project, if (byClient) OpenedType.ByClient else OpenedType.Auto) } fun closedPerformed(project: Project?) { closed.log(project) - LegacyRiderWhatsNewCounterUsagesCollector.closed.log(project) } fun actionPerformed(project: Project?, id: String) { perform.log(project, id) - LegacyRiderWhatsNewCounterUsagesCollector.perform.log(project, id) } fun actionNotAllowed(project: Project?, id: String) { failed.log(project, id, ActionFailedReason.Not_Allowed) - LegacyRiderWhatsNewCounterUsagesCollector.failed.log(project, id, ActionFailedReason.Not_Allowed) } fun actionNotFound(project: Project?, id: String) { failed.log(project, id, ActionFailedReason.Not_Found) - LegacyRiderWhatsNewCounterUsagesCollector.failed.log(project, id, ActionFailedReason.Not_Found) } fun visionActionPerformed(project: Project?, id: String) { diff --git a/platform/whatsNew/src/com/intellij/platform/whatsNew/reaction/ReactionCollector.kt b/platform/whatsNew/src/com/intellij/platform/whatsNew/reaction/ReactionCollector.kt index 61be6a053d3e..25b446089850 100644 --- a/platform/whatsNew/src/com/intellij/platform/whatsNew/reaction/ReactionCollector.kt +++ b/platform/whatsNew/src/com/intellij/platform/whatsNew/reaction/ReactionCollector.kt @@ -1,3 +1,4 @@ +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.platform.whatsNew.reaction import com.intellij.internal.statistic.eventLog.EventLogGroup @@ -18,18 +19,7 @@ internal object ReactionCollector : CounterUsagesCollector() { fun reactedPerformed(project: Project?, place: String?, type: ReactionType, action: ReationAction) { reacted.log(project, place, type, action) - LegacyReactionCollector.reacted.log(project, place, type, action) } override fun getGroup(): EventLogGroup = eventLogGroup } - -internal object LegacyReactionCollector : CounterUsagesCollector() { - private val eventLogGroup: EventLogGroup = EventLogGroup("rider.reactions", 3) - internal val reacted = eventLogGroup.registerEvent("reacted", - EventFields.ActionPlace, - EventFields.Enum(("type"), ReactionType::class.java), - EventFields.Enum("action", ReationAction::class.java)) - - override fun getGroup(): EventLogGroup = eventLogGroup -} \ No newline at end of file