Removing getProjectSize function for efficiency. (#4466)

Author: ashishrp-aws

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

@@ -32,10 +32,8 @@ import com.intellij.ui.content.ContentManagerListener
 import com.intellij.ui.treeStructure.Tree
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.TimeoutCancellationException
-import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.isActive
@@ -220,7 +218,6 @@ class CodeWhispererCodeScanManager(val project: Project) {
         var codeScanStatus: Result = Result.Failed
         val startTime = Instant.now().toEpochMilli()
         var codeScanResponseContext = defaultCodeScanResponseContext()
-        var getProjectSize: Deferred<Long?> = async { null }
         val connection = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(CodeWhispererConnection.getInstance())
         var codeScanJobId: String? = null
         var language: CodeWhispererProgrammingLanguage = CodeWhispererUnknownLanguage.INSTANCE
@@ -270,9 +267,6 @@ class CodeWhispererCodeScanManager(val project: Project) {
                     }
                     LOG.info { "Security scan completed for jobID: $codeScanJobId." }
                 }
-                getProjectSize = async {
-                    codeScanSessionConfig.getTotalProjectSizeInBytes()
-                }
             }
         } catch (e: Error) {
             if (scope == CodeWhispererConstants.CodeAnalysisScope.PROJECT) {
@@ -292,7 +286,14 @@ class CodeWhispererCodeScanManager(val project: Project) {
             launch {
                 val duration = (Instant.now().toEpochMilli() - startTime).toDouble()
                 CodeWhispererTelemetryService.getInstance().sendSecurityScanEvent(
-                    CodeScanTelemetryEvent(codeScanResponseContext, duration, codeScanStatus, getProjectSize.await()?.toDouble(), connection, scope)
+                    CodeScanTelemetryEvent(
+                        codeScanResponseContext,
+                        duration,
+                        codeScanStatus,
+                        codeScanResponseContext.payloadContext.srcPayloadSize.toDouble() ?: 0.0,
+                        connection,
+                        scope
+                    )
                 )
                 sendCodeScanTelemetryToServiceAPI(project, language, codeScanJobId, scope)
             }

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

@@ -9,11 +9,7 @@ import com.intellij.openapi.project.guessProjectDir
 import com.intellij.openapi.project.modules
 import com.intellij.openapi.vcs.changes.ChangeListManager
 import com.intellij.openapi.vfs.LocalFileSystem
-import com.intellij.openapi.vfs.VFileProperty
-import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
-import kotlinx.coroutines.TimeoutCancellationException
-import kotlinx.coroutines.time.withTimeout
 import software.aws.toolkits.core.utils.createTemporaryZipFile
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
@@ -35,7 +31,6 @@ import software.aws.toolkits.telemetry.CodewhispererLanguage
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path
-import java.time.Duration
 import java.time.Instant
 import java.util.Stack
 import kotlin.io.path.relativeTo
@@ -134,30 +129,6 @@ class CodeScanSessionConfig(
         return bufferedReader.useLines { lines -> lines.count() }
     }
 
-    suspend fun getTotalProjectSizeInBytes(): Long {
-        var totalSize = 0L
-        try {
-            withTimeout(Duration.ofSeconds(TELEMETRY_TIMEOUT_IN_SECONDS)) {
-                if (scope == CodeAnalysisScope.FILE) {
-                    totalSize = selectedFile?.length ?: 0L
-                } else {
-                    val changeListManager = ChangeListManager.getInstance(project)
-                    VfsUtil.collectChildrenRecursively(projectRoot).filter {
-                        !it.isDirectory && !it.`is`((VFileProperty.SYMLINK)) && (
-                            !changeListManager.isIgnoredFile(it)
-                            )
-                    }.fold(0L) { acc, next ->
-                        totalSize = acc + next.length
-                        totalSize
-                    }
-                }
-            }
-        } catch (e: TimeoutCancellationException) {
-            // Do nothing
-        }
-        return totalSize
-    }
-
     private fun zipFiles(files: List<Path>): File = createTemporaryZipFile {
         files.forEach { file ->
             val relativePath = file.relativeTo(projectRoot.toNioPath())
@@ -235,7 +206,6 @@ class CodeScanSessionConfig(
 
     companion object {
         private val LOG = getLogger<CodeScanSessionConfig>()
-        private const val TELEMETRY_TIMEOUT_IN_SECONDS: Long = 10
         fun create(file: VirtualFile?, project: Project, scope: CodeAnalysisScope): CodeScanSessionConfig = CodeScanSessionConfig(file, project, scope)
     }
 }

plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanTestBase.kt

@@ -226,10 +226,6 @@ open class CodeWhispererCodeScanTestBase(projectRule: CodeInsightTestFixtureRule
         ]                
     """
 
-    internal fun getTotalProjectSizeInBytes(sessionConfigSpy: CodeScanSessionConfig, totalSize: Long) = runBlocking {
-        assertThat(sessionConfigSpy.getTotalProjectSizeInBytes()).isEqualTo(totalSize)
-    }
-
     internal fun selectedFileLargerThanPayloadSizeThrowsException(sessionConfigSpy: CodeScanSessionConfig) {
         sessionConfigSpy.stub {
             onGeneric { getPayloadLimitInBytes() }.thenReturn(100)

plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererProjectCodeScanTest.kt

@@ -86,11 +86,6 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
         getProjectPayloadMetadata(sessionConfigSpy, 10, totalSize, this.totalLines, CodewhispererLanguage.Csharp)
     }
 
-    @Test
-    fun `test getTotalProjectSizeInBytes()`() {
-        getTotalProjectSizeInBytes(sessionConfigSpy, this.totalSize)
-    }
-
     @Test
     fun `selected file larger than payload limit throws exception`() {
         selectedFileLargerThanPayloadSizeThrowsException(sessionConfigSpy)