Increasing debounce to 8 seconds and adding check for sending telemte… (#4575)

* Increasing debounce to 8 seconds and adding check for sending telemtery events.

* Increasing debounce to 8 seconds and adding check for sending telemtery events.

* Adding isTelemetrySkipped for better readability.

* Added changelog for bug fix.

* Update .changes/next-release/bugfix-908d7b81-ea6b-445f-a166-b09c8640dfaf.json

Co-authored-by: Will Lo <[email protected]>

* Refactored isTelemetrySkipped to skipTelemetry.

---------

Co-authored-by: Will Lo <[email protected]>

Author: ashishrp-aws

.changes/next-release/bugfix-908d7b81-ea6b-445f-a166-b09c8640dfaf.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix intermittent validation exception from CodeWhisperer service for improperly formed request"
+}

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt

@@ -63,8 +63,8 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhisper
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isUserBuilderId
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererPlainText
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererUnknownLanguage
-import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.CodeScanTelemetryEvent
 import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererColorUtil.INACTIVE_TEXT_COLOR
@@ -223,6 +223,7 @@ class CodeWhispererCodeScanManager(val project: Project) {
         val connection = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(CodeWhispererConnection.getInstance())
         var codeScanJobId: String? = null
         var language: CodeWhispererProgrammingLanguage = CodeWhispererUnknownLanguage.INSTANCE
+        var skipTelemetry = false
         try {
             val file =
                 if (isRunningOnRemoteBackend()) {
@@ -232,14 +233,15 @@ class CodeWhispererCodeScanManager(val project: Project) {
                 }
             val codeScanSessionConfig = CodeScanSessionConfig.create(file, project, scope)
             val selectedFile = codeScanSessionConfig.getSelectedFile()
-            language = selectedFile?.programmingLanguage() ?: CodeWhispererUnknownLanguage.INSTANCE
+            language = codeScanSessionConfig.getProgrammingLanguage()
             if (scope == CodeWhispererConstants.CodeAnalysisScope.FILE &&
                 (
                     selectedFile == null || !language.isAutoFileScanSupported() || !selectedFile.isFile ||
                         runReadAction { (codeScanSessionConfig.fileIndex.isInLibrarySource(selectedFile)) } ||
                         selectedFile.fileSystem.protocol == "remoteDeploymentFS"
                     )
             ) {
+                skipTelemetry = true
                 LOG.debug { "Language is unknown or plaintext, skipping code scan." }
                 codeScanStatus = Result.Cancelled
                 return@launch
@@ -250,6 +252,7 @@ class CodeWhispererCodeScanManager(val project: Project) {
                     val session = CodeWhispererCodeScanSession(sessionContext)
                     val codeScanResponse = session.run()
                     language = codeScanSessionConfig.getProgrammingLanguage()
+                    if (language == CodeWhispererPlainText.INSTANCE) { skipTelemetry = true }
                     codeScanResponseContext = codeScanResponse.responseContext
                     codeScanJobId = codeScanResponseContext.codeScanJobId
                     when (codeScanResponse) {
@@ -289,19 +292,21 @@ class CodeWhispererCodeScanManager(val project: Project) {
         } finally {
             // After code scan
             afterCodeScan(scope)
-            launch {
-                val duration = (Instant.now().toEpochMilli() - startTime).toDouble()
-                CodeWhispererTelemetryService.getInstance().sendSecurityScanEvent(
-                    CodeScanTelemetryEvent(
-                        codeScanResponseContext,
-                        duration,
-                        codeScanStatus,
-                        codeScanResponseContext.payloadContext.srcPayloadSize.toDouble() ?: 0.0,
-                        connection,
-                        scope
+            if (!skipTelemetry) {
+                launch {
+                    val duration = (Instant.now().toEpochMilli() - startTime).toDouble()
+                    CodeWhispererTelemetryService.getInstance().sendSecurityScanEvent(
+                        CodeScanTelemetryEvent(
+                            codeScanResponseContext,
+                            duration,
+                            codeScanStatus,
+                            codeScanResponseContext.payloadContext.srcPayloadSize.toDouble() ?: 0.0,
+                            connection,
+                            scope
+                        )
                     )
-                )
-                sendCodeScanTelemetryToServiceAPI(project, language, codeScanJobId, scope)
+                    sendCodeScanTelemetryToServiceAPI(project, language, codeScanJobId, scope)
+                }
             }
         }
     }

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt

@@ -61,7 +61,7 @@ object CodeWhispererConstants {
     const val CODE_SCAN_CREATE_PAYLOAD_TIMEOUT_IN_SECONDS: Long = 10
     const val FILE_SCAN_TIMEOUT_IN_SECONDS: Long = 60 // 60 seconds
     const val FILE_SCAN_PAYLOAD_SIZE_LIMIT_IN_BYTES: Long = 1024 * 200 // 200KB
-    const val AUTO_SCAN_DEBOUNCE_DELAY_IN_SECONDS: Long = 5
+    const val AUTO_SCAN_DEBOUNCE_DELAY_IN_SECONDS: Long = 8
     const val TOTAL_BYTES_IN_KB = 1024
     const val TOTAL_BYTES_IN_MB = 1024 * 1024
     const val TOTAL_MILLIS_IN_SECOND = 1000