fix

Author: rli

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QOpenPanelAction.kt

@@ -15,7 +15,7 @@ import software.aws.toolkits.telemetry.UiTelemetry
 
 class QOpenPanelAction : AnAction(message("action.q.openchat.text"), null, AwsIcons.Logos.AWS_Q) {
     override fun actionPerformed(e: AnActionEvent) {
-        if (isRunningOnRemoteBackend() || !isQSupportedInThisVersion()) return
+        if (isRunningOnRemoteBackend()) return
         val project = e.getRequiredData(CommonDataKeys.PROJECT)
         UiTelemetry.click(project, "q_openChat")
         ToolWindowManager.getInstance(project).getToolWindow(AMAZON_Q_WINDOW_ID)?.activate(null, true)

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformSharedUtils.kt

@@ -9,7 +9,6 @@ import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.lazyIsUnauthedBearerConnection
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
-import software.aws.toolkits.jetbrains.services.amazonq.isQSupportedInThisVersion
 import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import java.time.Instant
 
@@ -28,6 +27,6 @@ fun isValidCodeTransformConnection(project: Project): Boolean {
 }
 fun isCodeTransformAvailable(project: Project): Boolean {
     if (!isIntellij()) return false
-    if (isRunningOnRemoteBackend() || !isQSupportedInThisVersion()) return false
+    if (isRunningOnRemoteBackend()) return false
     return isValidCodeTransformConnection(project)
 }

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QSupportedUtil.kt

@@ -3,9 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.telemetry.otel
 
-import com.intellij.openapi.application.ApplicationInfo
 import com.intellij.openapi.application.ApplicationManager
-import com.intellij.platform.diagnostic.telemetry.helpers.useWithoutActiveScope
 import io.opentelemetry.api.common.AttributeKey
 import io.opentelemetry.api.common.Attributes
 import io.opentelemetry.api.trace.Span
@@ -53,17 +51,8 @@ abstract class AbstractSpanBuilder<
      * @inheritdoc
      */
     inline fun<T> use(operation: (SpanType) -> T): T =
-        // FIX_WHEN_MIN_IS_241: not worth fixing for 233
-        if (ApplicationInfo.getInstance().build.baselineVersion == 233) {
-            startSpan().useWithoutActiveScope { span ->
-                span.makeCurrent().use {
-                    operation(span as SpanType)
-                }
-            }
-        } else {
-            startSpan().ijUse { span ->
-                operation(span as SpanType)
-            }
+        startSpan().ijUse { span ->
+            operation(span as SpanType)
         }
 
     /**

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

@@ -85,7 +85,4 @@ class EcrPullIntegrationTest {
             assertThat(serverRuntime.agent.getImages(null).firstOrNull { it.imageId == localImageId }).isNotNull()
         }
     }
-
-    // FIX_WHEN_MIN_IS_231: deleteImage() is blocking prior to 231
-    private fun Unit.await() {}
 }

plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/services/ecr/EcrPullIntegrationTest.kt

@@ -5,8 +5,6 @@ package software.aws.toolkits.jetbrains.services.lambda.java
 
 import com.intellij.compiler.CompilerTestUtil
 import com.intellij.execution.executors.DefaultDebugExecutor
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.testFramework.common.ThreadLeakTracker
 import com.intellij.testFramework.runInEdtAndWait
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
@@ -57,9 +55,6 @@ class JavaLocalLambdaRunConfigurationIntegrationTest(private val runtime: Lambda
 
     @Before
     fun setUp() {
-        // FIX_WHEN_MIN_IS_241: jdk21 known offender: https://github.com/JetBrains/intellij-community/commit/1bdcfa5340969ba84c0ecf88d48f6e27d3de8a54
-        ThreadLeakTracker.longRunningThreadCreated(ApplicationManager.getApplication(), "process reaper")
-
         setSamExecutableFromEnvironment()
 
         val fixture = projectRule.fixture

plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/services/lambda/java/JavaLocalLambdaRunConfigurationIntegrationTest.kt

@@ -3,12 +3,10 @@
 
 package software.aws.toolkits.jetbrains.services.lambda.execution.sam
 
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.runWriteAction
 import com.intellij.openapi.projectRoots.ProjectJdkTable
 import com.intellij.openapi.roots.ProjectRootManager
 import com.intellij.testFramework.IdeaTestUtil
-import com.intellij.testFramework.common.ThreadLeakTracker
 import com.intellij.testFramework.runInEdtAndGet
 import com.intellij.testFramework.runInEdtAndWait
 import org.assertj.core.api.Assertions.assertThat
@@ -44,9 +42,6 @@ class JavaSamRunningStateTest {
         projectRule.fixture
         credentialManager.addCredentials(mockCredsId)
 
-        // FIX_WHEN_MIN_IS_241: jdk21 known offender: https://github.com/JetBrains/intellij-community/commit/1bdcfa5340969ba84c0ecf88d48f6e27d3de8a54
-        ThreadLeakTracker.longRunningThreadCreated(ApplicationManager.getApplication(), "process reaper")
-
         val sdk = IdeaTestUtil.getMockJdk18()
         runInEdtAndWait {
             runWriteAction {