Skip to content

fix(dev): add UserAgent in Q feature development requests #5777

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

Closed
wants to merge 1 commit into from
Closed

fix(dev): add UserAgent in Q feature development requests #5777

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion packages/core/src/amazonqFeatureDev/client/featureDev.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
import { ToolkitError, isAwsError } from '../../shared/errors'
import { getCodewhispererConfig } from '../../codewhisperer/client/codewhisperer'
import { createCodeWhispererChatStreamingClient } from '../../shared/clients/codewhispererChatClient'
import { getClientId, getOptOutPreference, getOperatingSystem } from '../../shared/telemetry/util'
import { getClientId, getOptOutPreference, getOperatingSystem, getUserAgent } from '../../shared/telemetry/util'
import { extensionVersion } from '../../shared/vscode/env'

// Re-enable once BE is able to handle retries.
Expand All @@ -46,6 +46,7 @@ export async function createFeatureDevProxyClient(options?: Partial<ServiceOptio
region: cwsprConfig.region,
endpoint: cwsprConfig.endpoint,
token: new Token({ token: bearerToken }),
customUserAgent: getUserAgent(),
Copy link
Contributor

@justinmk3 justinmk3 Oct 11, 2024

Choose a reason for hiding this comment

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

this is already done by createAwsService(), which is called on line 42 above.

Copy link
Contributor

@justinmk3 justinmk3 Oct 11, 2024

Choose a reason for hiding this comment

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

is a caller to createFeatureDevProxyClient perhaps passing customUserAgent and overriding this?

Copy link
Contributor Author

@chengoramazon chengoramazon Oct 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I can not see where customUserAgent predefined in createAwsService. Can you point me to the right place?

I have verified there are not callers override the customUserAgent.

Copy link
Contributor

@justinmk3 justinmk3 Oct 15, 2024

Choose a reason for hiding this comment

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

aws-toolkit-vscode/packages/core/src/shared/awsClientBuilder.ts

Lines 135 to 137 in 5573cbb

if (userAgent && !opt.customUserAgent) {
opt.customUserAgent = getUserAgent({ includePlatform: true, includeClientId: true })
}

Copy link
Contributor Author

@chengoramazon chengoramazon Oct 15, 2024

Choose a reason for hiding this comment

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

Thanks, I am going to cancel this PR then.

httpOptions: {
connectTimeout: 10000, // 10 seconds, 3 times P99 API latency
},
Expand Down
Loading