Add clientid to useragent (#3179)

Author: rli

jetbrains-core/src/software/aws/toolkits/jetbrains/core/AwsClientManager.kt

@@ -24,6 +24,7 @@ import software.aws.toolkits.jetbrains.AwsToolkit
 import software.aws.toolkits.jetbrains.core.credentials.AwsConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.CredentialManager
 import software.aws.toolkits.jetbrains.core.region.AwsRegionProvider
+import software.aws.toolkits.jetbrains.settings.AwsSettings
 
 open class AwsClientManager : ToolkitClientManager(), Disposable {
     init {
@@ -59,7 +60,7 @@ open class AwsClientManager : ToolkitClientManager(), Disposable {
         val userAgent: String by lazy {
             val platformName = tryOrNull { ApplicationNamesInfo.getInstance().fullProductNameWithEdition.replace(' ', '-') }
             val platformVersion = tryOrNull { ApplicationInfoEx.getInstanceEx().fullVersion.replace(' ', '-') }
-            "AWS-Toolkit-For-JetBrains/${AwsToolkit.PLUGIN_VERSION} $platformName/$platformVersion"
+            "AWS-Toolkit-For-JetBrains/${AwsToolkit.PLUGIN_VERSION} $platformName/$platformVersion ClientId/${AwsSettings.getInstance().clientId}"
         }
 
         internal val CUSTOMIZER_EP = ExtensionPointName<AwsClientCustomizer>("aws.toolkit.sdk.clientCustomizer")

jetbrains-core/src/software/aws/toolkits/jetbrains/settings/AwsSettings.kt

@@ -6,6 +6,7 @@ package software.aws.toolkits.jetbrains.settings
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.LangDataKeys
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.PersistentStateComponent
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
@@ -83,8 +84,18 @@ class DefaultAwsSettings : PersistentStateComponent<AwsConfiguration>, AwsSettin
         }
 
     override val clientId: UUID
-        @Synchronized get() = UUID.fromString(preferences.get(CLIENT_ID_KEY, UUID.randomUUID().toString())).also {
-            preferences.put(CLIENT_ID_KEY, it.toString())
+        @Synchronized get() {
+            val id = when {
+                ApplicationManager.getApplication().isUnitTestMode || System.getProperty("robot-server.port") != null -> "ffffffff-ffff-ffff-ffff-ffffffffffff"
+                isTelemetryEnabled == false -> "11111111-1111-1111-1111-111111111111"
+                else -> {
+                    preferences.get(CLIENT_ID_KEY, UUID.randomUUID().toString()).also {
+                        preferences.put(CLIENT_ID_KEY, it.toString())
+                    }
+                }
+            }
+
+            return UUID.fromString(id)
         }
 
     companion object {