Skip to content

fix(inline): empty string customization arn (no customization selected) passed #5333

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 8 commits into from
Feb 10, 2025
Merged

fix(inline): empty string customization arn (no customization selected) passed #5333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9457318
fix empty string customization arn passed which causes service throwi…
Will-ShaoHua Feb 6, 2025
da305c5
patch
Will-ShaoHua Feb 6, 2025
211d20f
Merge branch 'main' into bug
Will-ShaoHua Feb 7, 2025
f642878
String.nullize()
Will-ShaoHua Feb 10, 2025
50f120c
Merge remote-tracking branch 'upstream/main' into bug
Will-ShaoHua Feb 10, 2025
f5f7540
Merge remote-tracking branch 'origin/bug' into bug
Will-ShaoHua Feb 10, 2025
00628b7
patch
Will-ShaoHua Feb 10, 2025
b6a5b21
Merge branch 'main' into bug
Will-ShaoHua Feb 10, 2025
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
21 changes: 9 additions & 12 deletions ...e/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ 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.util.text.nullize
import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider
import software.amazon.awssdk.services.codewhisperer.CodeWhispererClient
import software.amazon.awssdk.services.codewhisperer.model.CreateCodeScanRequest
Expand Down Expand Up @@ -146,7 +147,7 @@ interface CodeWhispererClientAdaptor : Disposable {
sessionId: String,
requestId: String,
language: CodeWhispererProgrammingLanguage,
customizationArn: String,
customizationArn: String?,
acceptedCharacterCount: Int,
unmodifiedAcceptedTokenCount: Int,
): SendTelemetryEventResponse
Expand Down Expand Up @@ -427,7 +428,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
it.timestamp(Instant.now())
it.suggestionReferenceCount(suggestionReferenceCount)
it.generatedLine(lineCount)
it.customizationArn(requestContext.customizationArn)
it.customizationArn(requestContext.customizationArn.nullize(nullizeSpaces = true))
it.numberOfRecommendations(numberOfRecommendations)
it.acceptedCharacterCount(acceptedCharCount)
}
Expand Down Expand Up @@ -473,7 +474,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
it.timestamp(Instant.now())
it.suggestionReferenceCount(suggestionReferenceCount)
it.generatedLine(lineCount)
it.customizationArn(requestContext.customizationArn)
it.customizationArn(requestContext.customizationArn.nullize(nullizeSpaces = true))
it.numberOfRecommendations(numberOfRecommendations)
it.acceptedCharacterCount(acceptedCharCount)
}
Expand All @@ -495,7 +496,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
requestBuilder.telemetryEvent { telemetryEventBuilder ->
telemetryEventBuilder.codeCoverageEvent {
it.programmingLanguage { languageBuilder -> languageBuilder.languageName(language.toCodeWhispererRuntimeLanguage().languageId) }
it.customizationArn(customizationArn)
it.customizationArn(customizationArn.nullize(nullizeSpaces = true))
it.acceptedCharacterCount(acceptedTokenCount.toInt())
it.totalCharacterCount(totalTokenCount.toInt())
it.timestamp(Instant.now())
Expand All @@ -512,7 +513,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
sessionId: String,
requestId: String,
language: CodeWhispererProgrammingLanguage,
customizationArn: String,
customizationArn: String?,
acceptedCharacterCount: Int,
unmodifiedAcceptedTokenCount: Int,
): SendTelemetryEventResponse = bearerClient().sendTelemetryEvent { requestBuilder ->
Expand All @@ -523,7 +524,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
it.programmingLanguage { languageBuilder ->
languageBuilder.languageName(language.toCodeWhispererRuntimeLanguage().languageId)
}
it.customizationArn(customizationArn)
it.customizationArn(customizationArn.nullize(nullizeSpaces = true))
// deprecated field, service side should not use this % anymore
it.modificationPercentage(0.0)
it.timestamp(Instant.now())
Expand Down Expand Up @@ -760,9 +761,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
it.responseLength(responseLength)
it.numberOfCodeBlocks(numberOfCodeBlocks)
it.hasProjectLevelContext(hasProjectLevelContext)
customization?.arn?.let { arn ->
it.customizationArn(arn)
}
it.customizationArn(customization?.arn.nullize(nullizeSpaces = true))
}
}
requestBuilder.optOutPreference(getTelemetryOptOutPreference())
Expand Down Expand Up @@ -815,9 +814,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
}
it.modificationPercentage(modificationPercentage)
it.hasProjectLevelContext(hasProjectLevelContext)
customization?.arn?.let { arn ->
it.customizationArn(arn)
}
it.customizationArn(customization?.arn.nullize(nullizeSpaces = true))
}
}
requestBuilder.optOutPreference(getTelemetryOptOutPreference())
Expand Down
2 changes: 1 addition & 1 deletion ...olkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererUserModificationTracker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ class CodeWhispererUserModificationTracker(private val project: Project) : Dispo
suggestion.sessionId,
suggestion.requestId,
CodeWhispererLanguageManager.getInstance().getLanguage(suggestion.vFile),
CodeWhispererModelConfigurator.getInstance().activeCustomization(project)?.arn.orEmpty(),
CodeWhispererModelConfigurator.getInstance().activeCustomization(project)?.arn,
suggestion.suggestion.length,
getUnmodifiedAcceptedCharsCount(suggestion.suggestion, modifiedSuggestion)
)
Expand Down
Loading