Merge branch 'rli/fix-freeze-expired-token-1' into rli/fix-freeze-expired-token

rli · rli · commit 631e2001df05 · 2024-09-18T15:22:19.000-07:00
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererRecommendationAction.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererRecommendationAction.kt
@@ -8,12 +8,15 @@ import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.project.DumbAware
+import com.intellij.openapi.util.Key
+import kotlinx.coroutines.Job
 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.service.CodeWhispererAutomatedTriggerType
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererService
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.CodewhispererTriggerType
+import java.util.concurrent.atomic.AtomicReference
 
 class CodeWhispererRecommendationAction : AnAction(message("codewhisperer.trigger.service")), DumbAware {
     override fun getActionUpdateThread() = ActionUpdateThread.BGT
@@ -32,6 +35,12 @@ class CodeWhispererRecommendationAction : AnAction(message("codewhisperer.trigge
         }
 
         val triggerType = TriggerTypeInfo(CodewhispererTriggerType.OnDemand, CodeWhispererAutomatedTriggerType.Unknown())
-        CodeWhispererService.getInstance().showRecommendationsInPopup(editor, triggerType, latencyContext)
+        val job = CodeWhispererService.getInstance().showRecommendationsInPopup(editor, triggerType, latencyContext)
+
+        e.getData(CommonDataKeys.EDITOR)?.getUserData(ACTION_JOB_KEY)?.set(job)
+    }
+
+    companion object {
+        val ACTION_JOB_KEY = Key.create<AtomicReference<Job?>>("amazonq.codewhisperer.job")
     }
 }
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/CodeWhispererProgrammingLanguage.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/CodeWhispererProgrammingLanguage.kt
@@ -24,8 +24,6 @@ abstract class CodeWhispererProgrammingLanguage {
 
     open fun isCodeCompletionSupported(): Boolean = false
 
-    open fun isCodeScanSupported(): Boolean = false
-
     open fun isAutoFileScanSupported(): Boolean = false
 
     open fun isImportAdderSupported(): Boolean = false
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererC.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererC.kt
@@ -13,8 +13,6 @@ class CodeWhispererC private constructor() : CodeWhispererProgrammingLanguage()
 
     override fun isCodeCompletionSupported(): Boolean = true
 
-    override fun isCodeScanSupported(): Boolean = true
-
     override fun isAutoFileScanSupported(): Boolean = true
 
     companion object {
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererCpp.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererCpp.kt
@@ -13,8 +13,6 @@ class CodeWhispererCpp private constructor() : CodeWhispererProgrammingLanguage(
 
     override fun isCodeCompletionSupported(): Boolean = true
 
-    override fun isCodeScanSupported(): Boolean = true
-
     override fun isAutoFileScanSupported(): Boolean = true
 
     companion object {
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererCsharp.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererCsharp.kt
@@ -13,8 +13,6 @@ class CodeWhispererCsharp private constructor() : CodeWhispererProgrammingLangua
 
     override fun isCodeCompletionSupported(): Boolean = true
 
-    override fun isCodeScanSupported(): Boolean = true
-
     override fun isAutoFileScanSupported(): Boolean = true
 
     companion object {
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererGo.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererGo.kt
@@ -13,8 +13,6 @@ class CodeWhispererGo private constructor() : CodeWhispererProgrammingLanguage()
 
     override fun isCodeCompletionSupported(): Boolean = true
 
-    override fun isCodeScanSupported(): Boolean = true
-
     override fun isAutoFileScanSupported(): Boolean = true
 
     companion object {
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererJava.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererJava.kt
@@ -16,8 +16,6 @@ class CodeWhispererJava private constructor() : CodeWhispererProgrammingLanguage
 
     override fun isCodeCompletionSupported(): Boolean = true
 
-    override fun isCodeScanSupported(): Boolean = true
-
     override fun isAutoFileScanSupported(): Boolean = true
 
     override fun isImportAdderSupported(): Boolean = true
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererJavaScript.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererJavaScript.kt
@@ -16,8 +16,6 @@ class CodeWhispererJavaScript private constructor() : CodeWhispererProgrammingLa
 
     override fun isCodeCompletionSupported(): Boolean = true
 
-    override fun isCodeScanSupported(): Boolean = true
-
     override fun isAutoFileScanSupported(): Boolean = true
 
     override fun isImportAdderSupported(): Boolean = true
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererJson.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererJson.kt
@@ -13,8 +13,6 @@ class CodeWhispererJson private constructor() : CodeWhispererProgrammingLanguage
 
     override fun isCodeCompletionSupported(): Boolean = true
 
-    override fun isCodeScanSupported(): Boolean = true
-
     override fun isAutoFileScanSupported(): Boolean = true
 
     companion object {
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererPhp.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererPhp.kt
@@ -13,8 +13,6 @@ class CodeWhispererPhp private constructor() : CodeWhispererProgrammingLanguage(
 
     override fun isCodeCompletionSupported(): Boolean = true
 
-    override fun isCodeScanSupported(): Boolean = true
-
     override fun isAutoFileScanSupported(): Boolean = true
 
     companion object {
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererPlainText.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererPlainText.kt
@@ -11,8 +11,6 @@ class CodeWhispererPlainText private constructor() : CodeWhispererProgrammingLan
 
     override fun toTelemetryType(): CodewhispererLanguage = CodewhispererLanguage.Plaintext
 
-    override fun isCodeScanSupported(): Boolean = true
-
     override fun isAutoFileScanSupported(): Boolean = false
 
     companion object {
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererPython.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererPython.kt
@@ -16,8 +16,6 @@ class CodeWhispererPython private constructor() : CodeWhispererProgrammingLangua
 
     override fun isCodeCompletionSupported(): Boolean = true
 
-    override fun isCodeScanSupported(): Boolean = true
-
     override fun isAutoFileScanSupported(): Boolean = true
 
     override fun isImportAdderSupported(): Boolean = true
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererRuby.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererRuby.kt
@@ -13,8 +13,6 @@ class CodeWhispererRuby private constructor() : CodeWhispererProgrammingLanguage
 
     override fun isCodeCompletionSupported(): Boolean = true
 
-    override fun isCodeScanSupported(): Boolean = true
-
     override fun isAutoFileScanSupported(): Boolean = true
 
     companion object {
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererTf.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererTf.kt
@@ -13,8 +13,6 @@ class CodeWhispererTf private constructor() : CodeWhispererProgrammingLanguage()
 
     override fun isCodeCompletionSupported(): Boolean = true
 
-    override fun isCodeScanSupported(): Boolean = true
-
     override fun isAutoFileScanSupported(): Boolean = true
 
     companion object {
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererTypeScript.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererTypeScript.kt
@@ -16,8 +16,6 @@ class CodeWhispererTypeScript private constructor() : CodeWhispererProgrammingLa
 
     override fun isCodeCompletionSupported(): Boolean = true
 
-    override fun isCodeScanSupported(): Boolean = true
-
     override fun isAutoFileScanSupported(): Boolean = true
 
     override fun isSupplementalContextSupported() = true
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererYaml.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererYaml.kt
@@ -13,8 +13,6 @@ class CodeWhispererYaml private constructor() : CodeWhispererProgrammingLanguage
 
     override fun isCodeCompletionSupported(): Boolean = true
 
-    override fun isCodeScanSupported(): Boolean = true
-
     override fun isAutoFileScanSupported(): Boolean = true
 
     companion object {
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt
@@ -104,15 +104,17 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
         editor: Editor,
         triggerTypeInfo: TriggerTypeInfo,
         latencyContext: LatencyContext
-    ) {
+    ): Job? {
         if (job == null || job?.isCompleted == true) {
             job = cs.launch(getCoroutineBgContext()) {
                 doShowRecommendationsInPopup(editor, triggerTypeInfo, latencyContext)
             }
         }
+
+        // did some wrangling, but compiler didn't believe this can't be null
+        return job
     }
 
-    @RequiresEdt
     private suspend fun doShowRecommendationsInPopup(
         editor: Editor,
         triggerTypeInfo: TriggerTypeInfo,
@@ -123,6 +125,7 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
 
         latencyContext.credentialFetchingStart = System.nanoTime()
 
+        // try to refresh automatically if possible, otherwise ask user to login again
         if (isQExpired(project)) {
             // consider changing to only running once a ~minute since this is relatively expensive
             // say the connection is un-refreshable if refresh fails for 3 times
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererLanguageManagerTest.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererLanguageManagerTest.kt
@@ -131,33 +131,7 @@ class CodeWhispererProgrammingLanguageTest {
     @Test
     fun `test language isSupport`() {
         EP_NAME.extensionList.forEach { language ->
-            val telemetryType = language.toTelemetryType()
-            val shouldSupportAutoCompletion = true
-
-            val shouldSupportSecurityScan = when (telemetryType) {
-                CodewhispererLanguage.Java -> true
-                CodewhispererLanguage.Python -> true
-                CodewhispererLanguage.Javascript -> true
-                CodewhispererLanguage.Typescript -> true
-                CodewhispererLanguage.Kotlin -> true
-                CodewhispererLanguage.Go -> true
-                CodewhispererLanguage.Php -> true
-                CodewhispererLanguage.Ruby -> true
-                CodewhispererLanguage.C -> true
-                CodewhispererLanguage.Cpp -> true
-                CodewhispererLanguage.Csharp -> true
-                CodewhispererLanguage.Plaintext -> true
-                CodewhispererLanguage.Tf -> true
-                CodewhispererLanguage.Yaml -> true
-                CodewhispererLanguage.Yml -> true
-                CodewhispererLanguage.Hcl -> true
-                CodewhispererLanguage.Json -> true
-                CodewhispererLanguage.Jsonc -> true
-                else -> false
-            }
-
-            assertThat(language.isCodeCompletionSupported()).isEqualTo(shouldSupportAutoCompletion)
-            assertThat(language.isCodeScanSupported()).isEqualTo(shouldSupportSecurityScan)
+            assertThat(language.isCodeCompletionSupported()).isTrue
         }
     }
 
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTestBase.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTestBase.kt
@@ -8,6 +8,10 @@ import com.intellij.testFramework.DisposableRule
 import com.intellij.testFramework.RuleChain
 import com.intellij.testFramework.replaceService
 import com.intellij.testFramework.runInEdtAndWait
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.yield
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Before
@@ -32,6 +36,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestU
 import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestUtil.pythonResponse
 import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestUtil.pythonTestLeftContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestUtil.testValidAccessToken
+import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererRecommendationAction
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererLoginType
 import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorManager
@@ -51,6 +56,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhisp
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererColorUtil.POPUP_DIM_HEX
 import software.aws.toolkits.jetbrains.utils.rules.PythonCodeInsightTestFixtureRule
 import software.aws.toolkits.resources.message
+import java.util.concurrent.atomic.AtomicReference
 
 // TODO: restructure testbase, too bulky and hard to debug
 open class CodeWhispererTestBase {
@@ -180,12 +186,26 @@ open class CodeWhispererTestBase {
         runInEdtAndWait {}
     }
 
+    /**
+     * Block until manual action has either failed or completed
+     */
     fun invokeCodeWhispererService() {
+        val jobRef = AtomicReference<Job?>()
         runInEdtAndWait {
+            projectRule.fixture.editor.putUserData(CodeWhispererRecommendationAction.ACTION_JOB_KEY, jobRef)
+            // does not block, so we need to extract something to track the async task
             projectRule.fixture.performEditorAction(codeWhispererRecommendationActionId)
         }
-        while (CodeWhispererInvocationStatus.getInstance().hasExistingInvocation()) {
-            Thread.sleep(10)
+
+        runTest {
+            // wait for CodeWhispererService#showRecommendationsInPopup to complete, if started
+            jobRef.get()?.join()
+
+            // wait for subsequent background operations to be complete
+            while (CodeWhispererInvocationStatus.getInstance().hasExistingInvocation()) {
+                yield()
+                delay(10)
+            }
         }
     }
 
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/cwChatConnector.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/cwChatConnector.ts
@@ -260,7 +260,7 @@ export class Connector {
 
             const answer: ChatItem = {
                 type: messageData.messageType,
-                messageId: messageData.messageID ?? messageData.triggerID,
+                messageId: messageData.messageId ?? messageData.triggerID,
                 body: messageData.message,
                 followUp: followUps,
                 canBeVoted: true,
@@ -295,7 +295,7 @@ export class Connector {
                 type: messageData.messageType,
                 body: undefined,
                 relatedContent: undefined,
-                messageId: messageData.messageID,
+                messageId: messageData.messageId,
                 codeReference: messageData.codeReference,
                 followUp:
                     messageData.followUps !== undefined && messageData.followUps.length > 0
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/SsoAccessTokenProvider.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/SsoAccessTokenProvider.kt
@@ -378,7 +378,7 @@ class SsoAccessTokenProvider(
             is PKCEAuthorizationGrantToken -> loadPkceClientRegistration()
         }
         if (registration == null) {
-            val message = "Unable to load client registration"
+            val message = "Unable to load client registration from cache"
             sendRefreshCredentialsMetric(
                 currentToken,
                 reason = "Null client registration",
@@ -388,6 +388,7 @@ class SsoAccessTokenProvider(
             throw InvalidClientException.builder().message(message).build()
         }
 
+        var stageName = RefreshCredentialStage.CREATE_TOKEN
         try {
             val newToken = client.createToken {
                 it.clientId(registration.clientId)
@@ -396,11 +397,13 @@ class SsoAccessTokenProvider(
                 it.refreshToken(currentToken.refreshToken)
             }
 
+            stageName = RefreshCredentialStage.GET_TOKEN_DETAILS
             val token = when (currentToken) {
                 is DeviceAuthorizationGrantToken -> newToken.toDAGAccessToken(currentToken.createdAt)
                 is PKCEAuthorizationGrantToken -> newToken.toPKCEAccessToken(currentToken.createdAt)
             }
 
+            stageName = RefreshCredentialStage.SAVE_TOKEN
             saveAccessToken(token)
 
             sendRefreshCredentialsMetric(
@@ -417,12 +420,13 @@ class SsoAccessTokenProvider(
                 else -> null
             }
             val message = when (e) {
-                is AwsServiceException -> e.awsErrorDetails()?.errorMessage() ?: "Unknown error"
-                else -> e.message ?: "Unknown error"
-            }
+                is AwsServiceException -> e.awsErrorDetails()?.errorMessage()
+                else -> e.message
+            } ?: "$stageName: Unknown error"
+
             sendRefreshCredentialsMetric(
                 currentToken,
-                reason = "Refresh access token request failed",
+                reason = "Refresh access token request failed: $stageName",
                 reasonDesc = message,
                 requestId = requestId,
                 result = Result.Failed
@@ -431,6 +435,12 @@ class SsoAccessTokenProvider(
         }
     }
 
+    enum class RefreshCredentialStage {
+        CREATE_TOKEN,
+        GET_TOKEN_DETAILS,
+        SAVE_TOKEN
+    }
+
     private fun loadDagClientRegistration(): ClientRegistration? =
         cache.loadClientRegistration(dagClientRegistrationCacheKey)?.let {
             return it
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt
@@ -20,6 +20,7 @@ import software.aws.toolkits.core.utils.outputStream
 import software.aws.toolkits.core.utils.putNextEntry
 import software.aws.toolkits.jetbrains.core.coroutines.EDT
 import software.aws.toolkits.jetbrains.core.coroutines.getCoroutineBgContext
+import software.aws.toolkits.jetbrains.services.telemetry.ALLOWED_CODE_EXTENSIONS
 import software.aws.toolkits.resources.AwsCoreBundle
 import software.aws.toolkits.telemetry.AmazonqTelemetry
 import java.io.File
@@ -94,7 +95,7 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
         if (file.isDirectory) return true
 
         val extension = file.extension ?: return false
-        return FeatureDevBundleConfig.ALLOWED_CODE_EXTENSIONS.contains(extension)
+        return ALLOWED_CODE_EXTENSIONS.contains(extension)
     }
 
     private fun ignoreFileByExtension(file: VirtualFile) =
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QConstants.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QConstants.kt
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypesMetrics.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypesMetrics.kt
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/TelemetryUtils.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/TelemetryUtils.kt
diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt
diff --git a/plugins/core/src/main/resources/META-INF/plugin.xml b/plugins/core/src/main/resources/META-INF/plugin.xml
