Skip to content

fix(amazonq): listprofile throttle storm, only allow 1 service call at a time #5624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

fix(amazonq): listprofile throttle storm, only allow 1 service call at a time #5624

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97b5ece
fix listprofile throttle error storm, only allow 1 service call at a …
Will-ShaoHua Apr 23, 2025
3f4b7ba
detekt
Will-ShaoHua Apr 23, 2025
1f3d34c
a
Will-ShaoHua Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
ApplicationManager.getApplication().executeOnPooledThread {
var errorMessage = ""
val profiles = try {
QRegionProfileManager.getInstance().listRegionProfiles(project)
QRegionProfileManager.getInstance().listProfilesCompletableFuture(project).get()
} catch (e: Exception) {
e.message?.let {
errorMessage = it
Expand Down
2 changes: 1 addition & 1 deletion ...nity/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class QRegionProfileDialog(

combo.proposeModelUpdate { model ->
try {
QRegionProfileManager.getInstance().listRegionProfiles(project)?.forEach {
QRegionProfileManager.getInstance().listProfilesCompletableFuture(project).get()?.forEach {
Copy link
Contributor

@rli rli Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AwsResourceCache already limits the call to one at a time

model.addElement(it)
} ?: error("Attempted to fetch profiles while there does not exist")

Expand Down
24 changes: 22 additions & 2 deletions ...ity/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
import com.intellij.util.xmlb.annotations.MapAnnotation
import com.intellij.util.xmlb.annotations.Property
import kotlinx.coroutines.CoroutineScope
import software.amazon.awssdk.core.SdkClient
import software.aws.toolkits.core.TokenConnectionSettings
import software.aws.toolkits.core.utils.debug
Expand All @@ -36,15 +37,18 @@
import software.aws.toolkits.telemetry.Telemetry
import java.time.Duration
import java.util.Collections
import java.util.concurrent.CompletableFuture
import java.util.concurrent.Future

Check warning on line 41 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileManager.kt

View workflow job for this annotation

GitHub Actions / qodana

Unused import directive 

Unused import directive
import kotlin.reflect.KClass

@Service(Service.Level.APP)
@State(name = "qProfileStates", storages = [Storage("aws.xml")])
class QRegionProfileManager : PersistentStateComponent<QProfileState>, Disposable {
class QRegionProfileManager(private val cs: CoroutineScope) : PersistentStateComponent<QProfileState>, Disposable {

Check warning on line 46 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileManager.kt

View workflow job for this annotation

GitHub Actions / qodana

Unused symbol 

Property "cs" is never used

// Map to store connectionId to its active profile
private val connectionIdToActiveProfile = Collections.synchronizedMap<String, QRegionProfile>(mutableMapOf())
private val connectionIdToProfileCount = mutableMapOf<String, Int>()
private var job: CompletableFuture<List<QRegionProfile>?>? = null

init {
ApplicationManager.getApplication().messageBus.connect(this)
Expand All @@ -65,7 +69,7 @@
val conn = getIdcConnectionOrNull(project)
val selected = activeProfile(project) ?: return
val profiles = tryOrNull {
listRegionProfiles(project)
listProfilesCompletableFuture(project).get()
}

if (profiles == null || profiles.none { it.arn == selected.arn }) {
Expand Down Expand Up @@ -104,6 +108,22 @@
}
}

fun listProfilesCompletableFuture(project: Project): CompletableFuture<List<QRegionProfile>?> {
this.job?.let { ongoingJob ->
return ongoingJob
}

val future = CompletableFuture.supplyAsync {
listRegionProfiles(project)
}.whenComplete { t, u ->
// This runs when the future completes (success or failure)
this.job = null
}

this.job = future
return future
}

fun activeProfile(project: Project): QRegionProfile? = getIdcConnectionOrNull(project)?.let { connectionIdToActiveProfile[it.id] }

fun hasValidConnectionButNoActiveProfile(project: Project): Boolean = getIdcConnectionOrNull(project) != null && activeProfile(project) == null
Expand Down
Loading