add filter in telemetry viewer and detektMain

Author: andrewyuq

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/QInlineCompletionProvider.kt

@@ -150,7 +150,7 @@ class QInlineCompletionProvider(private val cs: CoroutineScope) : InlineCompleti
     }
 
     fun getAllValidVariantsCount(session: InlineCompletionSession) =
-        session.capture()?.variants?.filter { isValidVariant(it) }?.size ?: 0
+        session.capture()?.variants?.count { isValidVariant(it) } ?: 0
 
     private fun isValidVariant(variant: InlineCompletionVariant.Snapshot) =
         (

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt

@@ -95,7 +95,7 @@ class CodeWhispererTelemetryService {
         val params = LogInlineCompletionSessionResultsParams(
             sessionId = sessionContext.sessionId,
             completionSessionResult = sessionContext.itemContexts.filter { it.item != null }.associate {
-                (it.item?.itemId ?: "") to InlineCompletionStates(
+                it.item?.itemId.orEmpty() to InlineCompletionStates(
                     seen = it.hasSeen,
                     accepted = it.isAccepted,
                     discarded = it.isDiscarded

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTestBase.kt

@@ -3,16 +3,12 @@
 
 package software.aws.toolkits.jetbrains.services.codewhisperer
 
-import com.intellij.codeInsight.inline.completion.InlineCompletionLifecycleTestDSL
-import com.intellij.codeInsight.inline.completion.testInlineCompletion
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
 import com.intellij.testFramework.DisposableRule
 import com.intellij.testFramework.RuleChain
-import com.intellij.testFramework.common.waitUntil
-import com.intellij.testFramework.fixtures.CodeInsightTestFixture
 import com.intellij.testFramework.replaceService
 import com.intellij.testFramework.runInEdtAndWait
 import io.mockk.every
@@ -63,7 +59,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.model.InvocationCo
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.LatencyContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.TriggerTypeInfo
 import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupManager
-import software.aws.toolkits.jetbrains.services.codewhisperer.popup.QInlineCompletionProvider
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererRecommendationManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererService

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/OpenTelemetryAction.kt

@@ -14,12 +14,18 @@ import com.intellij.openapi.project.DefaultProjectFactory
 import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.openapi.ui.FrameWrapper
 import com.intellij.openapi.util.Disposer
+import com.intellij.ui.DocumentAdapter
 import com.intellij.ui.JBColor
+import com.intellij.ui.components.JBLabel
+import com.intellij.ui.components.JBTextField
 import com.intellij.util.ui.components.BorderLayoutPanel
 import software.aws.toolkits.core.telemetry.MetricEvent
 import software.aws.toolkits.jetbrains.isDeveloperMode
+import java.awt.BorderLayout
 import javax.swing.BorderFactory
 import javax.swing.JComponent
+import javax.swing.JPanel
+import javax.swing.event.DocumentEvent
 
 class OpenTelemetryAction : DumbAwareAction() {
     override fun actionPerformed(event: AnActionEvent) {
@@ -38,6 +44,8 @@ class OpenTelemetryAction : DumbAwareAction() {
                 setViewer(true)
             }.console
         }
+        private val telemetryEvents = mutableListOf<MetricEvent>()
+        private var currentFilter = ""
 
         init {
             title = "Telemetry Viewer"
@@ -48,11 +56,20 @@ class OpenTelemetryAction : DumbAwareAction() {
             val panel = BorderLayoutPanel()
             val consoleComponent = consoleView.component
 
+            // Add search/filter bar at the top
+            val filterPanel = JPanel(BorderLayout())
+            val filterField = JBTextField().apply {
+                emptyText.text = "Filter telemetry events..."
+            }
+            filterPanel.add(JBLabel("Filter: "), BorderLayout.WEST)
+            filterPanel.add(filterField, BorderLayout.CENTER)
+
             val actionGroup = DefaultActionGroup(*consoleView.createConsoleActions())
             val toolbar = ActionManager.getInstance().createActionToolbar("AWS.TelemetryViewer", actionGroup, false)
 
             toolbar.setTargetComponent(consoleComponent)
 
+            panel.addToTop(filterPanel)
             panel.addToLeft(toolbar.component)
             panel.addToCenter(consoleComponent)
 
@@ -64,11 +81,32 @@ class OpenTelemetryAction : DumbAwareAction() {
             Disposer.register(this) { telemetryService.removeListener(this) }
             Disposer.register(this, consoleView)
 
+            // Implement filtering logic
+            filterField.document.addDocumentListener(object : DocumentAdapter() {
+                override fun textChanged(e: DocumentEvent) {
+                    // Filter console content based on filterField.text
+                    applyFilter(filterField.text)
+                }
+            })
+
             return panel
         }
 
+        private fun applyFilter(filterText: String) {
+            currentFilter = filterText
+            consoleView.clear()
+            telemetryEvents.filter {
+                it.toString().contains(filterText, ignoreCase = true)
+            }.forEach { event ->
+                consoleView.print(event.toString() + "\n", ConsoleViewContentType.NORMAL_OUTPUT)
+            }
+        }
+
         override fun onTelemetryEvent(event: MetricEvent) {
-            consoleView.print(event.toString() + "\n", ConsoleViewContentType.NORMAL_OUTPUT)
+            telemetryEvents.add(event)
+            if (event.toString().contains(currentFilter, ignoreCase = true)) {
+                consoleView.print(event.toString() + "\n", ConsoleViewContentType.NORMAL_OUTPUT)
+            }
         }
     }
 }