Skip to content

Prune duplicate telemetry override entries #5104

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

Merged
merged 3 commits into from
Nov 19, 2024
Merged

Prune duplicate telemetry override entries #5104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
787de65
Prune duplicate telemetry override entries
rli Nov 18, 2024
b885ac0
bump
rli Nov 18, 2024
1902e35
bump
rli Nov 19, 2024
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 @@ -145,7 +145,7 @@

when (message) {
is BrowserMessage.PrepareUi -> {
this.prepareBrowser(BrowserState(FeatureId.Q, false))
this.prepareBrowser(BrowserState(FeatureId.AmazonQ, false))

Check warning on line 148 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt#L148 

Added line #L148 was not covered by tests
WebviewTelemetry.amazonqSignInOpened(
project,
reAuth = isQExpired(project)
Expand Down
4 changes: 2 additions & 2 deletions ...c/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
val component = if (isQConnected(project) && !isQExpired(project)) {
AmazonQToolWindow.getInstance(project).component
} else {
QWebviewPanel.getInstance(project).browser?.prepareBrowser(BrowserState(FeatureId.Q))
QWebviewPanel.getInstance(project).browser?.prepareBrowser(BrowserState(FeatureId.AmazonQ))
QWebviewPanel.getInstance(project).component
}

Expand Down Expand Up @@ -141,7 +141,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
openMeetQPage(project)
}

QWebviewPanel.getInstance(project).browser?.prepareBrowser(BrowserState(FeatureId.Q))
QWebviewPanel.getInstance(project).browser?.prepareBrowser(BrowserState(FeatureId.AmazonQ))

// isQConnected alone is not robust and there is race condition (read/update connection states)
val component = if (isNewConnectionForQ || (isQConnected(project) && !isQExpired(project))) {
Expand Down
2 changes: 1 addition & 1 deletion ...community/src/software/aws/toolkits/jetbrains/services/cwc/inline/InlineChatController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ class InlineChatController(
requestCredentialsForQ(project, isReauth = false)
} else {
runInEdt {
QWebviewPanel.getInstance(project).browser?.prepareBrowser(BrowserState(FeatureId.Q))
QWebviewPanel.getInstance(project).browser?.prepareBrowser(BrowserState(FeatureId.AmazonQ))
ToolWindowManager.getInstance(project).getToolWindow(AMAZON_Q_WINDOW_ID)?.activate(null, false)
ToolWindowManager.getInstance(project).getToolWindow(AMAZON_Q_WINDOW_ID)?.show()
}
Expand Down
Loading
Loading