patch

Author: Will-ShaoHua

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt

@@ -7,7 +7,6 @@ import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.SystemInfo
 import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider
 import software.amazon.awssdk.services.codewhisperer.CodeWhispererClient
 import software.amazon.awssdk.services.codewhisperer.model.CreateCodeScanRequest
@@ -25,13 +24,10 @@ import software.amazon.awssdk.services.codewhispererruntime.model.CreateUploadUr
 import software.amazon.awssdk.services.codewhispererruntime.model.Dimension
 import software.amazon.awssdk.services.codewhispererruntime.model.GenerateCompletionsRequest
 import software.amazon.awssdk.services.codewhispererruntime.model.GenerateCompletionsResponse
-import software.amazon.awssdk.services.codewhispererruntime.model.IdeCategory
 import software.amazon.awssdk.services.codewhispererruntime.model.ListAvailableCustomizationsRequest
 import software.amazon.awssdk.services.codewhispererruntime.model.ListFeatureEvaluationsResponse
-import software.amazon.awssdk.services.codewhispererruntime.model.OperatingSystem
 import software.amazon.awssdk.services.codewhispererruntime.model.SendTelemetryEventResponse
 import software.amazon.awssdk.services.codewhispererruntime.model.SuggestionState
-import software.amazon.awssdk.services.codewhispererruntime.model.UserContext
 import software.amazon.awssdk.services.codewhispererruntime.model.UserIntent
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
@@ -44,15 +40,14 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManagerListener
 import software.aws.toolkits.jetbrains.core.credentials.pinning.CodeWhispererConnection
 import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererCustomization
-import software.aws.toolkits.jetbrains.services.amazonq.FEATURE_EVALUATION_PRODUCT_NAME
+import software.aws.toolkits.jetbrains.services.amazonq.codeWhispererUserContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.RequestContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.ResponseContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getTelemetryOptOutPreference
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.transform
-import software.aws.toolkits.jetbrains.services.telemetry.ClientMetadata
 import software.aws.toolkits.telemetry.CodewhispererCompletionType
 import software.aws.toolkits.telemetry.CodewhispererSuggestionState
 import java.time.Instant
@@ -187,24 +182,6 @@ interface CodeWhispererClientAdaptor : Disposable {
 }
 
 open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeWhispererClientAdaptor {
-    private val codeWhispererUserContext = ClientMetadata.getDefault().let {
-        val osForCodeWhisperer: OperatingSystem =
-            when {
-                SystemInfo.isWindows -> OperatingSystem.WINDOWS
-                SystemInfo.isMac -> OperatingSystem.MAC
-                // For now, categorize everything else as "Linux" (Linux/FreeBSD/Solaris/etc)
-                else -> OperatingSystem.LINUX
-            }
-
-        UserContext.builder()
-            .ideCategory(IdeCategory.JETBRAINS)
-            .operatingSystem(osForCodeWhisperer)
-            .product(FEATURE_EVALUATION_PRODUCT_NAME)
-            .clientId(it.clientId)
-            .ideVersion(it.awsVersion)
-            .build()
-    }
-
     private val mySigv4Client by lazy { createUnmanagedSigv4Client() }
 
     @Volatile
@@ -334,7 +311,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                 }
             }
             requestBuilder.optOutPreference(getTelemetryOptOutPreference())
-            requestBuilder.userContext(codeWhispererUserContext)
+            requestBuilder.userContext(codeWhispererUserContext())
         }
     }
 
@@ -356,7 +333,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
             }
         }
         requestBuilder.optOutPreference(getTelemetryOptOutPreference())
-        requestBuilder.userContext(codeWhispererUserContext)
+        requestBuilder.userContext(codeWhispererUserContext())
     }
 
     override fun sendUserModificationTelemetry(
@@ -383,7 +360,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
             }
         }
         requestBuilder.optOutPreference(getTelemetryOptOutPreference())
-        requestBuilder.userContext(codeWhispererUserContext)
+        requestBuilder.userContext(codeWhispererUserContext())
     }
 
     override fun sendCodeScanTelemetry(
@@ -402,7 +379,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
             }
         }
         requestBuilder.optOutPreference(getTelemetryOptOutPreference())
-        requestBuilder.userContext(codeWhispererUserContext)
+        requestBuilder.userContext(codeWhispererUserContext())
     }
     override fun sendCodeScanRemediationTelemetry(
         language: CodeWhispererProgrammingLanguage?,
@@ -432,11 +409,11 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
             }
         }
         requestBuilder.optOutPreference(getTelemetryOptOutPreference())
-        requestBuilder.userContext(codeWhispererUserContext)
+        requestBuilder.userContext(codeWhispererUserContext())
     }
 
     override fun listFeatureEvaluations(): ListFeatureEvaluationsResponse = bearerClient().listFeatureEvaluations {
-        it.userContext(codeWhispererUserContext)
+        it.userContext(codeWhispererUserContext())
     }
 
     override fun sendMetricDataTelemetry(eventName: String, metadata: Map<String, Any?>): SendTelemetryEventResponse =
@@ -450,7 +427,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                 }
             }
             requestBuilder.optOutPreference(getTelemetryOptOutPreference())
-            requestBuilder.userContext(codeWhispererUserContext)
+            requestBuilder.userContext(codeWhispererUserContext())
         }
 
     override fun sendChatAddMessageTelemetry(
@@ -490,7 +467,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
             }
         }
         requestBuilder.optOutPreference(getTelemetryOptOutPreference())
-        requestBuilder.userContext(codeWhispererUserContext)
+        requestBuilder.userContext(codeWhispererUserContext())
     }
 
     override fun sendChatInteractWithMessageTelemetry(
@@ -519,7 +496,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                 telemetryEventBuilder.chatInteractWithMessageEvent(event)
             }
             requestBuilder.optOutPreference(getTelemetryOptOutPreference())
-            requestBuilder.userContext(codeWhispererUserContext)
+            requestBuilder.userContext(codeWhispererUserContext())
         }
 
     override fun sendChatUserModificationTelemetry(
@@ -545,7 +522,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
             }
         }
         requestBuilder.optOutPreference(getTelemetryOptOutPreference())
-        requestBuilder.userContext(codeWhispererUserContext)
+        requestBuilder.userContext(codeWhispererUserContext())
     }
 
     override fun dispose() {