From ed38be3cded2dae4d963025f6657aa1479f340a5 Mon Sep 17 00:00:00 2001 From: Kaizen Conroy Date: Sat, 29 Nov 2025 18:34:53 -0500 Subject: [PATCH] feat: release telemetry --- .../cdk-cli-telemetry-disable-sends-no-data.integtest.ts | 3 +-- .../telemetry-integ-tests/cdk-deploy-telemetry.integtest.ts | 2 -- .../cdk-synth-telemetry-with-errors.integtest.ts | 2 -- .../telemetry-integ-tests/cdk-synth-telemetry.integtest.ts | 3 +-- .../cli-integ/tests/telemetry-integ-tests/constants.ts | 1 - packages/aws-cdk/lib/cli/io-host/cli-io-host.ts | 2 +- 6 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/constants.ts diff --git a/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-cli-telemetry-disable-sends-no-data.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-cli-telemetry-disable-sends-no-data.integtest.ts index 46c1a7cc6..0401d56d0 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-cli-telemetry-disable-sends-no-data.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-cli-telemetry-disable-sends-no-data.integtest.ts @@ -1,4 +1,3 @@ -import { TELEMETRY_ENDPOINT } from './constants'; import { integTest, withDefaultFixture } from '../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime @@ -6,7 +5,7 @@ jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-c integTest( 'CLI Telemetry --disable does not send to endpoint', withDefaultFixture(async (fixture) => { - const output = await fixture.cdk(['cli-telemetry', '--disable'], { verboseLevel: 3, modEnv: { TELEMETRY_ENDPOINT: TELEMETRY_ENDPOINT } }); + const output = await fixture.cdk(['cli-telemetry', '--disable'], { verboseLevel: 3 }); // Check the trace that telemetry was not executed successfully expect(output).not.toContain('Telemetry Sent Successfully'); diff --git a/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-deploy-telemetry.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-deploy-telemetry.integtest.ts index 0b684bbd2..8a223b5a6 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-deploy-telemetry.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-deploy-telemetry.integtest.ts @@ -1,6 +1,5 @@ import * as path from 'path'; import * as fs from 'fs-extra'; -import { TELEMETRY_ENDPOINT } from './constants'; import { integTest, withDefaultFixture } from '../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime @@ -14,7 +13,6 @@ integTest( const deployOutput = await fixture.cdkDeploy('test-1', { telemetryFile, verboseLevel: 3, // trace mode - modEnv: { TELEMETRY_ENDPOINT: TELEMETRY_ENDPOINT }, }); // Check the trace that telemetry was executed successfully diff --git a/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry-with-errors.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry-with-errors.integtest.ts index a81563db7..1a3d7b131 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry-with-errors.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry-with-errors.integtest.ts @@ -1,6 +1,5 @@ import * as path from 'path'; import * as fs from 'fs-extra'; -import { TELEMETRY_ENDPOINT } from './constants'; import { integTest, withDefaultFixture } from '../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime @@ -13,7 +12,6 @@ integTest( allowErrExit: true, modEnv: { INTEG_STACK_SET: 'stage-with-errors', - TELEMETRY_ENDPOINT: TELEMETRY_ENDPOINT, }, verboseLevel: 3, // trace mode }); diff --git a/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry.integtest.ts index 0e80a3a55..24c1ca546 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry.integtest.ts @@ -1,6 +1,5 @@ import * as path from 'path'; import * as fs from 'fs-extra'; -import { TELEMETRY_ENDPOINT } from './constants'; import { integTest, withDefaultFixture } from '../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime @@ -12,7 +11,7 @@ integTest( const synthOutput = await fixture.cdk( ['synth', fixture.fullStackName('test-1'), '--unstable=telemetry', `--telemetry-file=${telemetryFile}`], - { modEnv: { TELEMETRY_ENDPOINT: TELEMETRY_ENDPOINT }, verboseLevel: 3 }, // trace mode + { verboseLevel: 3 }, // trace mode ); // Check the trace that telemetry was executed successfully diff --git a/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/constants.ts b/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/constants.ts deleted file mode 100644 index 6c7da0713..000000000 --- a/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/constants.ts +++ /dev/null @@ -1 +0,0 @@ -export const TELEMETRY_ENDPOINT = 'https://cdk-cli-telemetry.us-east-1.api.aws/metrics'; diff --git a/packages/aws-cdk/lib/cli/io-host/cli-io-host.ts b/packages/aws-cdk/lib/cli/io-host/cli-io-host.ts index e9b25f650..3d06b3d77 100644 --- a/packages/aws-cdk/lib/cli/io-host/cli-io-host.ts +++ b/packages/aws-cdk/lib/cli/io-host/cli-io-host.ts @@ -203,7 +203,7 @@ export class CliIoHost implements IIoHost { } } - const telemetryEndpoint = process.env.TELEMETRY_ENDPOINT; + const telemetryEndpoint = process.env.TELEMETRY_ENDPOINT ?? 'https://cdk-cli-telemetry.us-east-1.api.aws/metrics'; if (canCollectTelemetry(args, context) && telemetryEndpoint) { try { sinks.push(new EndpointTelemetrySink({