Skip to content

Commit

Permalink
Merge master into feature/amazonqLSP
Browse files Browse the repository at this point in the history
  • Loading branch information
aws-toolkit-automation authored Feb 11, 2025
2 parents 65daa2e + f738715 commit b1a396c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 14 deletions.
12 changes: 5 additions & 7 deletions packages/core/src/auth/providers/credentialsProviderManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
* SPDX-License-Identifier: Apache-2.0
*/

import { oneDay } from '../../shared/datetime'
import { getLogger } from '../../shared/logger/logger'
import { AwsLoadCredentials, telemetry } from '../../shared/telemetry/telemetry'
import { withTelemetryContext } from '../../shared/telemetry/util'
import { cancellableDebounce } from '../../shared/utilities/functionUtils'
import { debounce } from '../../shared/utilities/functionUtils'
import {
asString,
CredentialsProvider,
Expand All @@ -26,13 +27,13 @@ export class CredentialsProviderManager {
private readonly providerFactories: CredentialsProviderFactory[] = []
private readonly providers: CredentialsProvider[] = []

@withTelemetryContext({ name: 'getAllCredentialsProvider', class: credentialsProviderManagerClassName, emit: true })
@withTelemetryContext({ name: 'getAllCredentialsProvider', class: credentialsProviderManagerClassName })
public async getAllCredentialsProviders(): Promise<CredentialsProvider[]> {
let providers: CredentialsProvider[] = []

for (const provider of this.providers) {
if (await provider.isAvailable()) {
telemetry.aws_loadCredentials.emit({
void this.emitWithDebounce({
credentialSourceId: credentialsProviderToTelemetryType(
provider.getCredentialsId().credentialSource
),
Expand Down Expand Up @@ -61,10 +62,7 @@ export class CredentialsProviderManager {

return providers
}
private emitWithDebounce = cancellableDebounce(
(m: AwsLoadCredentials) => telemetry.aws_loadCredentials.emit(m),
100
).promise
private emitWithDebounce = debounce((m: AwsLoadCredentials) => telemetry.aws_loadCredentials.emit(m), oneDay)
/**
* Returns a map of `CredentialsProviderId` string-forms to object-forms,
* from all credential sources. Only available providers are returned.
Expand Down
7 changes: 0 additions & 7 deletions packages/core/src/test/techdebt.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,4 @@ describe('tech debt', function () {
// This is relevant for the use of `fs.cpSync` in the copyFiles scripts.
assert.ok(semver.lt(minNodejs, '18.0.0'), 'with node18+, we can remove the dependency on @types/node@18')
})

it('remove debugging telemetry', async function () {
fixByDate(
'2025-02-11',
'Remove debugging telemetry in `packages/core/src/auth/providers/credentialsProviderManager.ts`. Should only need to remove the `emit: true` in the decorator.'
)
})
})

0 comments on commit b1a396c

Please sign in to comment.