Skip to content

Commit b97bf36

Browse files
arangatangarangatang
authored
Upgrade telemetryGenerator to 1.0.196. (#4184)
1 parent b1c246c commit b97bf36

File tree

29 files changed

+117
-95
lines changed

29 files changed

+117
-95
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ mockito = "5.10.0"
2121
mockitoKotlin = "5.2.1"
2222
mockk = "1.13.8"
2323
node-gradle = "7.0.1"
24-
telemetryGenerator = "1.0.192"
24+
telemetryGenerator = "1.0.196"
2525
testLogger = "3.1.0"
2626
testRetry = "1.5.2"
2727
# test-only; platform provides slf4j transitively at runtime. <233, 1.7.36; >=233, 2.0.9

‎plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/sso/SsoAccessTokenProvider.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class SsoAccessTokenProvider(
165165
val credentialSourceId = if (currentToken.startUrl == SONO_URL) CredentialSourceId.AwsId else CredentialSourceId.IamIdentityCenter
166166
AwsTelemetry.refreshCredentials(
167167
project = null,
168-
Result.Failed,
168+
result = Result.Failed,
169169
sessionDuration = sessionDuration.toHours().toInt(),
170170
credentialSourceId = credentialSourceId,
171171
reason = "Null refresh token"

‎plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/sso/SsoLoginCallbackProvider.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ object SsoPrompt : SsoLoginCallback {
3535
).showAndGet()
3636

3737
if (result) {
38-
AwsTelemetry.loginWithBrowser(project = null, Result.Succeeded, CredentialType.SsoProfile)
38+
AwsTelemetry.loginWithBrowser(project = null, result = Result.Succeeded, credentialType = CredentialType.SsoProfile)
3939
BrowserUtil.browse(authorization.verificationUriComplete)
4040
} else {
41-
AwsTelemetry.loginWithBrowser(project = null, Result.Cancelled, CredentialType.SsoProfile)
41+
AwsTelemetry.loginWithBrowser(project = null, result = Result.Cancelled, credentialType = CredentialType.SsoProfile)
4242
throw ProcessCanceledException(IllegalStateException(message("credentials.sso.login.cancelled")))
4343
}
4444
}
@@ -61,10 +61,10 @@ object BearerTokenPrompt : SsoLoginCallback {
6161
).showAndGet()
6262

6363
if (codeCopied) {
64-
AwsTelemetry.loginWithBrowser(project = null, Result.Succeeded, CredentialType.BearerToken)
64+
AwsTelemetry.loginWithBrowser(project = null, result = Result.Succeeded, credentialType = CredentialType.BearerToken)
6565
BrowserUtil.browse(authorization.verificationUriComplete)
6666
} else {
67-
AwsTelemetry.loginWithBrowser(project = null, Result.Cancelled, CredentialType.BearerToken)
67+
AwsTelemetry.loginWithBrowser(project = null, result = Result.Cancelled, credentialType = CredentialType.BearerToken)
6868
}
6969
}
7070
}

‎plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/ConfirmUserCodeLoginDialog.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class ConfirmUserCodeLoginDialog(
6666

6767
override fun doCancelAction() {
6868
super.doCancelAction()
69-
AwsTelemetry.loginWithBrowser(project = null, Result.Cancelled, credentialType)
69+
AwsTelemetry.loginWithBrowser(project = null, result = Result.Cancelled, credentialType = credentialType)
7070
}
7171
}
7272

‎plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/actions/DeleteResourceAction.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ abstract class DeleteResourceAction<in T : AwsExplorerResourceNode<*>> : SingleR
2727
val resourceName = selected.displayName()
2828
val response = DeleteResourceDialog(selected.nodeProject, resourceType, resourceName, comment).showAndGet()
2929
if (!response) {
30-
AwsTelemetry.deleteResource(selected.project, selected.serviceId, Result.Cancelled)
30+
AwsTelemetry.deleteResource(project = selected.project, serviceType = selected.serviceId, result = Result.Cancelled)
3131
} else {
3232
ApplicationManager.getApplication().executeOnPooledThread {
3333
try {
3434
performDelete(selected)
3535
notifyInfo(project = selected.project, title = message("delete_resource.deleted", resourceType, resourceName))
36-
AwsTelemetry.deleteResource(selected.project, selected.serviceId, success = true)
36+
AwsTelemetry.deleteResource(project = selected.project, serviceType = selected.serviceId, success = true)
3737
} catch (e: Exception) {
3838
e.notifyError(project = selected.project, title = message("delete_resource.delete_failed", resourceType, resourceName))
39-
AwsTelemetry.deleteResource(selected.project, selected.serviceId, success = false)
39+
AwsTelemetry.deleteResource(project = selected.project, serviceType = selected.serviceId, success = false)
4040
}
4141
}
4242
}

‎plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/tools/DefaultToolManager.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,10 @@ class DefaultToolManager @NonInjectable internal constructor(private val clock:
209209
}
210210

211211
return performInstall(type, latestVersion, indicator).also {
212-
AwsTelemetry.toolInstallation(project, type.telemetryId, Result.Succeeded)
212+
AwsTelemetry.toolInstallation(project = project, toolId = type.telemetryId, result = Result.Succeeded)
213213
}
214214
} catch (e: Exception) {
215-
AwsTelemetry.toolInstallation(project, type.telemetryId, Result.Failed)
215+
AwsTelemetry.toolInstallation(project = project, toolId = type.telemetryId, result = Result.Failed)
216216
throw IllegalStateException(message("executableCommon.failed_install", type.displayName), e)
217217
}
218218
}

‎plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,6 @@ class FeatureDevController(
255255
try {
256256
session = getSessionInfo(tabId)
257257

258-
AmazonqTelemetry.isAcceptedCodeChanges(amazonqConversationId = session.conversationId, enabled = true)
259-
260258
var filePaths: List<NewFileZipInfo> = emptyList()
261259
var deletedFiles: List<String> = emptyList()
262260
var references: List<CodeReference> = emptyList()
@@ -268,7 +266,12 @@ class FeatureDevController(
268266
references = state.references
269267
}
270268
}
271-
269+
AmazonqTelemetry.isAcceptedCodeChanges(
270+
project = null,
271+
amazonqNumberOfFilesAccepted = (filePaths.size + deletedFiles.size) * 1.0,
272+
amazonqConversationId = session.conversationId,
273+
enabled = true
274+
)
272275
session.insertChanges(filePaths = filePaths, deletedFiles = deletedFiles, references = references)
273276

274277
messenger.sendAnswer(

‎plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/apprunner/ui/CreationDialog.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class CreationDialog(private val project: Project, ecrUri: String? = null) :
4141
override fun createCenterPanel(): JComponent = panel.component
4242

4343
override fun doCancelAction() {
44-
ApprunnerTelemetry.createService(project, Result.Cancelled, deploymentTypeFromPanel(panel))
44+
ApprunnerTelemetry.createService(project = project, result = Result.Cancelled, appRunnerServiceSource = deploymentTypeFromPanel(panel))
4545
super.doCancelAction()
4646
}
4747

@@ -68,15 +68,15 @@ class CreationDialog(private val project: Project, ecrUri: String? = null) :
6868
close(OK_EXIT_CODE)
6969
project.refreshAwsTree(AppRunnerResources.LIST_SERVICES)
7070
}
71-
ApprunnerTelemetry.createService(project, Result.Succeeded, deploymentTypeFromPanel(panel))
71+
ApprunnerTelemetry.createService(project = project, result = Result.Succeeded, appRunnerServiceSource = deploymentTypeFromPanel(panel))
7272
} catch (e: Exception) {
7373
if (e is AppRunnerException) {
7474
setErrorText(e.awsErrorDetails()?.errorMessage() ?: message("apprunner.creation.failed"))
7575
} else {
7676
setErrorText(message("apprunner.creation.failed"))
7777
}
7878
LOG.error(e) { "Exception thrown while creating AppRunner Service" }
79-
ApprunnerTelemetry.createService(project, Result.Failed, deploymentTypeFromPanel(panel))
79+
ApprunnerTelemetry.createService(project = project, result = Result.Failed, appRunnerServiceSource = deploymentTypeFromPanel(panel))
8080
} finally {
8181
isOKActionEnabled = true
8282
setOKButtonText(message("general.create_button"))

‎plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/CloudWatchLogWindow.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class CloudWatchLogWindow(override val project: Project) : ToolkitToolWindow {
4040
result = Result.Failed
4141
throw e
4242
} finally {
43-
CloudwatchlogsTelemetry.open(project, result, CloudWatchResourceType.LogGroup, source = "logGroup")
43+
CloudwatchlogsTelemetry.open(project = project, result = result, cloudWatchResourceType = CloudWatchResourceType.LogGroup, source = "logGroup")
4444
}
4545
}
4646
}
@@ -77,7 +77,7 @@ class CloudWatchLogWindow(override val project: Project) : ToolkitToolWindow {
7777
result = Result.Failed
7878
throw e
7979
} finally {
80-
CloudwatchlogsTelemetry.open(project, result, CloudWatchResourceType.LogStream, source = "logStream")
80+
CloudwatchlogsTelemetry.open(project = project, result = result, cloudWatchResourceType = CloudWatchResourceType.LogStream, source = "logStream")
8181
}
8282
}
8383

‎plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/DownloadLogStream.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,11 @@ class LogStreamDownloadToFileTask(
178178
}
179179
)
180180
)
181-
CloudwatchlogsTelemetry.download(project, success = true, CloudWatchResourceType.LogStream)
181+
CloudwatchlogsTelemetry.download(project = project, success = true, cloudWatchResourceType = CloudWatchResourceType.LogStream)
182182
} catch (e: Exception) {
183183
LOG.error(e) { "Exception thrown while downloading large log stream" }
184184
e.notifyError(project = project, title = message("cloudwatch.logs.saving_to_disk_failed", logStream))
185-
CloudwatchlogsTelemetry.download(project, success = false, CloudWatchResourceType.LogStream)
185+
CloudwatchlogsTelemetry.download(project = project, success = false, cloudWatchResourceType = CloudWatchResourceType.LogStream)
186186
}
187187
}
188188

@@ -193,7 +193,7 @@ class LogStreamDownloadToFileTask(
193193
} else {
194194
Result.Failed
195195
}
196-
CloudwatchlogsTelemetry.download(project, result, CloudWatchResourceType.LogStream)
196+
CloudwatchlogsTelemetry.download(project = project, result = result, cloudWatchResourceType = CloudWatchResourceType.LogStream)
197197
}
198198

199199
companion object {

0 commit comments

Comments
 (0)