Skip to content

feat(telemetry): Include user intent for copy and insert code interactions #4903

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 5 commits into from
Sep 25, 2024
Merged

feat(telemetry): Include user intent for copy and insert code interactions #4903

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ffd0a4
Include user intent for copy and insert code interactions
lalexcaws Sep 23, 2024
56f9d5e
Remove user intent from code modification entry
lalexcaws Sep 24, 2024
d228b9c
Update telemetry test with user intent
lalexcaws Sep 24, 2024
b8b9eb6
Merge branch 'main' into user-intent
lalexcaws Sep 24, 2024
dea1c52
Merge branch 'main' into user-intent
laileni-aws Sep 25, 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: 2 additions & 0 deletions ...software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ class TelemetryHelper(private val context: AmazonQAppInitContext, private val se
AmazonqTelemetry.interactWithMessage(
cwsprChatConversationId = getConversationId(message.tabId).orEmpty(),
cwsprChatMessageId = message.messageId,
cwsprChatUserIntent = message.userIntent?.let { getTelemetryUserIntent(it) },
cwsprChatInteractionType = CwsprChatInteractionType.CopySnippet,
cwsprChatAcceptedCharactersLength = message.code.length.toLong(),
cwsprChatInteractionTarget = message.insertionTargetType,
Expand All @@ -233,6 +234,7 @@ class TelemetryHelper(private val context: AmazonQAppInitContext, private val se
AmazonqTelemetry.interactWithMessage(
cwsprChatConversationId = getConversationId(message.tabId).orEmpty(),
cwsprChatMessageId = message.messageId,
cwsprChatUserIntent = message.userIntent?.let { getTelemetryUserIntent(it) },
cwsprChatInteractionType = CwsprChatInteractionType.InsertAtCursor,
cwsprChatAcceptedCharactersLength = message.code.length.toLong(),
cwsprChatAcceptedNumberOfLines = message.code.lines().size.toLong(),
Expand Down
3 changes: 3 additions & 0 deletions ...tbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/messages/CwcMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import com.fasterxml.jackson.databind.JsonSerializer
import com.fasterxml.jackson.databind.SerializerProvider
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
import com.fasterxml.jackson.databind.annotation.JsonSerialize
import software.amazon.awssdk.services.codewhispererstreaming.model.UserIntent
import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthFollowUpType
import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
import software.aws.toolkits.jetbrains.services.amazonq.onboarding.OnboardingPageInteractionType
Expand Down Expand Up @@ -65,6 +66,7 @@ sealed interface IncomingCwcMessage : CwcMessage {
val command: String?,
@JsonProperty("tabID") val tabId: String,
val messageId: String,
val userIntent: UserIntent?,
val code: String,
val insertionTargetType: String?,
val eventId: String?,
Expand All @@ -75,6 +77,7 @@ sealed interface IncomingCwcMessage : CwcMessage {
data class InsertCodeAtCursorPosition(
@JsonProperty("tabID") val tabId: String,
val messageId: String,
val userIntent: UserIntent?,
val code: String,
val insertionTargetType: String?,
val codeReference: List<CodeReference>?,
Expand Down
3 changes: 3 additions & 0 deletions ...ins-community/tst/software/aws/toolkits/jetbrains/services/amazonq/TelemetryHelperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ class TelemetryHelperTest {
private const val mockRegion = "us-east-1"
private const val tabId = "tabId"
private const val messageId = "messageId"
private val userIntent = UserIntent.SHOW_EXAMPLES
private const val conversationId = "conversationId"
private const val triggerId = "triggerId"
private const val customizationArn = "customizationArn"
Expand Down Expand Up @@ -414,6 +415,7 @@ class TelemetryHelperTest {
"command",
tabId,
messageId,
userIntent,
"println()",
"insertionTargetType",
"eventId",
Expand Down Expand Up @@ -476,6 +478,7 @@ class TelemetryHelperTest {
IncomingCwcMessage.InsertCodeAtCursorPosition(
tabId,
messageId,
userIntent,
code,
inserTionTargetType,
emptyList(),
Expand Down
4 changes: 4 additions & 0 deletions plugins/core/jetbrains-community/resources/telemetryOverride.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,10 @@
{
"type": "cwsprChatMessageId"
},
{
"type": "cwsprChatUserIntent",
"required": false
},
Comment on lines +656 to +659
Copy link
Contributor

@rli rli Sep 24, 2024

Choose a reason for hiding this comment

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

should be pushing this into the common definitions

Copy link
Contributor Author

@lalexcaws lalexcaws Sep 24, 2024

Choose a reason for hiding this comment

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

yep, this was mentioned in my VSCode plugin change as well. Going to get out that change

{
"type": "cwsprChatInteractionType"
},
Expand Down
Loading