Merge remote-tracking branch 'origin/main' into rli/otel

Author: rli

.changes/next-release/bugfix-b18a6b61-e1e9-42dd-952d-7c32ea7a3a19.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix pointless busy loop in Amazon Q wasting CPU cycles (#5000)"
+}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/project/ProjectContextProvider.kt

@@ -21,7 +21,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
-import kotlinx.coroutines.yield
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
@@ -48,14 +47,15 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
                 return@launch
             }
 
+            // TODO: need better solution for this
+            @Suppress("LoopWithTooManyJumpStatements")
             while (true) {
                 if (encoderServer.isNodeProcessRunning()) {
-                    // TODO: need better solution for this
                     delay(10000)
                     initAndIndex()
                     break
                 } else {
-                    yield()
+                    delay(10000)
                 }
             }
         }

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

@@ -52,7 +52,8 @@ class OpenedFileTypesMetricsService : Disposable {
     @Synchronized
     fun addToExistingTelemetryBatch(fileExt: String) {
         if (fileExt in ALLOWED_CODE_EXTENSIONS) {
-            currentOpenedFileTypes.add(fileExt)
+            val extension = ".$fileExt"
+            currentOpenedFileTypes.add(extension)
         }
     }
 

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt

@@ -3,34 +3,34 @@
 
 package software.aws.toolkits.jetbrains.services.telemetry
 
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.mockito.kotlin.times
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
 
 class OpenedFileTypeMetricsTest {
 
     private lateinit var service: OpenedFileTypesMetricsService
 
-    @Before
+    @BeforeEach
     fun setup() {
         service = OpenedFileTypesMetricsService()
     }
 
-    @After
+    @AfterEach
     fun teardown() {
         service.dispose()
     }
 
     @Test
     fun `test addToExistingTelemetryBatch with allowed extension`() {
         service.addToExistingTelemetryBatch("kt")
-        assert(service.getOpenedFileTypes().contains("kt"))
+        assertThat(service.getOpenedFileTypes()).contains(".kt")
     }
 
     @Test
     fun `test addToExistingTelemetryBatch with disallowed extension`() {
         service.addToExistingTelemetryBatch("txt")
-        assert(service.getOpenedFileTypes().isEmpty())
+        assertThat(service.getOpenedFileTypes()).isEmpty()
     }
 }