chore(cli): allow valid enum values in telemetry data

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-synth-telemetry-with-errors.integtest.ts

@@ -0,0 +1,127 @@
+import * as path from 'path';
+import * as fs from 'fs-extra';
+import { integTest, withDefaultFixture } from '../../../lib';
+
+jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
+
+integTest(
+  'cdk synth with telemetry and validation error leads to invoke failure',
+  withDefaultFixture(async (fixture) => {
+    const telemetryFile = path.join(fixture.integTestDir, 'telemetry.json');
+    const output = await fixture.cdk(['synth', '--unstable=telemetry', `--telemetry-file=${telemetryFile}`], {
+      allowErrExit: true,
+      modEnv: {
+        INTEG_STACK_SET: 'stage-with-errors',
+      },
+    });
+
+    expect(output).toContain('This is an error');
+
+    const json = fs.readJSONSync(telemetryFile);
+    expect(json).toEqual([
+      expect.objectContaining({
+        event: expect.objectContaining({
+          command: expect.objectContaining({
+            path: ['synth'],
+            parameters: {
+              verbose: 1,
+              unstable: '<redacted>',
+              ['telemetry-file']: '<redacted>',
+              lookups: true,
+              ['ignore-errors']: false,
+              json: false,
+              debug: false,
+              staging: true,
+              notices: true,
+              ['no-color']: false,
+              ci: expect.anything(), // changes based on where this is called
+              validation: true,
+              quiet: false,
+            },
+            config: {
+              bags: true,
+              fileNames: true,
+            },
+          }),
+          state: 'SUCCEEDED',
+          eventType: 'SYNTH',
+        }),
+        identifiers: expect.objectContaining({
+          installationId: expect.anything(),
+          sessionId: expect.anything(),
+          telemetryVersion: '1.0',
+          cdkCliVersion: expect.anything(),
+          region: expect.anything(),
+          eventId: expect.stringContaining(':1'),
+          timestamp: expect.anything(),
+        }),
+        environment: {
+          ci: expect.anything(),
+          os: {
+            platform: expect.anything(),
+            release: expect.anything(),
+          },
+          nodeVersion: expect.anything(),
+        },
+        project: {},
+        duration: {
+          total: expect.anything(),
+        },
+      }),
+      expect.objectContaining({
+        event: expect.objectContaining({
+          command: expect.objectContaining({
+            path: ['synth'],
+            parameters: {
+              verbose: 1,
+              unstable: '<redacted>',
+              ['telemetry-file']: '<redacted>',
+              lookups: true,
+              ['ignore-errors']: false,
+              json: false,
+              debug: false,
+              staging: true,
+              notices: true,
+              ['no-color']: false,
+              ci: expect.anything(), // changes based on where this is called
+              validation: true,
+              quiet: false,
+            },
+            config: {
+              bags: true,
+              fileNames: true,
+            },
+          }),
+          state: 'FAILED',
+          eventType: 'INVOKE',
+        }),
+        identifiers: expect.objectContaining({
+          installationId: expect.anything(),
+          sessionId: expect.anything(),
+          telemetryVersion: '1.0',
+          cdkCliVersion: expect.anything(),
+          region: expect.anything(),
+          eventId: expect.stringContaining(':2'),
+          timestamp: expect.anything(),
+        }),
+        environment: {
+          ci: expect.anything(),
+          os: {
+            platform: expect.anything(),
+            release: expect.anything(),
+          },
+          nodeVersion: expect.anything(),
+        },
+        project: {},
+        duration: {
+          total: expect.anything(),
+        },
+        error: {
+          name: 'AssemblyError',
+        },
+      }),
+    ]);
+    fs.unlinkSync(telemetryFile);
+  }),
+);
+

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-synth-telemetry.integtest.ts

@@ -0,0 +1,116 @@
+import * as path from 'path';
+import * as fs from 'fs-extra';
+import { integTest, withDefaultFixture } from '../../../lib';
+
+jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
+
+integTest(
+  'cdk synth with telemetry data',
+  withDefaultFixture(async (fixture) => {
+    const telemetryFile = path.join(fixture.integTestDir, 'telemetry.json');
+    await fixture.cdk(['synth', fixture.fullStackName('test-1'), '--unstable=telemetry', `--telemetry-file=${telemetryFile}`]);
+    const json = fs.readJSONSync(telemetryFile);
+    expect(json).toEqual([
+      expect.objectContaining({
+        event: expect.objectContaining({
+          command: expect.objectContaining({
+            path: ['synth', '$STACK1'],
+            parameters: {
+              verbose: 1,
+              unstable: '<redacted>',
+              ['telemetry-file']: '<redacted>',
+              lookups: true,
+              ['ignore-errors']: false,
+              json: false,
+              debug: false,
+              staging: true,
+              notices: true,
+              ['no-color']: false,
+              ci: expect.anything(), // changes based on where this is called
+              validation: true,
+              quiet: false,
+            },
+            config: {
+              bags: true,
+              fileNames: true,
+            },
+          }),
+          state: 'SUCCEEDED',
+          eventType: 'SYNTH',
+        }),
+        identifiers: expect.objectContaining({
+          installationId: expect.anything(),
+          sessionId: expect.anything(),
+          telemetryVersion: '1.0',
+          cdkCliVersion: expect.anything(),
+          region: expect.anything(),
+          eventId: expect.stringContaining(':1'),
+          timestamp: expect.anything(),
+        }),
+        environment: {
+          ci: expect.anything(),
+          os: {
+            platform: expect.anything(),
+            release: expect.anything(),
+          },
+          nodeVersion: expect.anything(),
+        },
+        project: {},
+        duration: {
+          total: expect.anything(),
+        },
+      }),
+      expect.objectContaining({
+        event: expect.objectContaining({
+          command: expect.objectContaining({
+            path: ['synth', '$STACK1'],
+            parameters: {
+              verbose: 1,
+              unstable: '<redacted>',
+              ['telemetry-file']: '<redacted>',
+              lookups: true,
+              ['ignore-errors']: false,
+              json: false,
+              debug: false,
+              staging: true,
+              notices: true,
+              ['no-color']: false,
+              ci: expect.anything(), // changes based on where this is called
+              validation: true,
+              quiet: false,
+            },
+            config: {
+              bags: true,
+              fileNames: true,
+            },
+          }),
+          state: 'SUCCEEDED',
+          eventType: 'INVOKE',
+        }),
+        identifiers: expect.objectContaining({
+          installationId: expect.anything(),
+          sessionId: expect.anything(),
+          telemetryVersion: '1.0',
+          cdkCliVersion: expect.anything(),
+          region: expect.anything(),
+          eventId: expect.stringContaining(':2'),
+          timestamp: expect.anything(),
+        }),
+        environment: {
+          ci: expect.anything(),
+          os: {
+            platform: expect.anything(),
+            release: expect.anything(),
+          },
+          nodeVersion: expect.anything(),
+        },
+        project: {},
+        duration: {
+          total: expect.anything(),
+        },
+      }),
+    ]);
+    fs.unlinkSync(telemetryFile);
+  }),
+);
+

packages/aws-cdk/README.md

@@ -1228,6 +1228,15 @@ cdk gc --unstable=gc
 The command will fail if `--unstable=gc` is not passed in, which acknowledges that the user
 is aware of the caveats in place for the feature.
 
+### `telemetry-file`
+
+Send your telemetry data to a local file (note that `--telemetry-file` is unstable, and must
+be passed in conjunction with `--unstable=telemetry`).
+
+```bash
+cdk list --telemetry-file=my/file/path --unstable=telemetry
+```
+
 ## Notices
 
 CDK Notices are important messages regarding security vulnerabilities, regressions, and usage of unsupported

packages/aws-cdk/lib/cli/cli-config.ts

@@ -42,6 +42,7 @@ export async function makeConfig(): Promise<CliConfig> {
       'no-color': { type: 'boolean', desc: 'Removes colors and other style from console output', default: false },
       'ci': { type: 'boolean', desc: 'Force CI detection. If CI=true then logs will be sent to stdout instead of stderr', default: YARGS_HELPERS.isCI() },
       'unstable': { type: 'array', desc: 'Opt in to unstable features. The flag indicates that the scope and API of a feature might still change. Otherwise the feature is generally production ready and fully supported. Can be specified multiple times.', default: [] },
+      'telemetry-file': { type: 'string', desc: 'Send telemetry data to a local file.', default: undefined },
     },
     commands: {
       'list': {

packages/aws-cdk/lib/cli/cli-type-registry.json

@@ -122,6 +122,10 @@
       "type": "array",
       "desc": "Opt in to unstable features. The flag indicates that the scope and API of a feature might still change. Otherwise the feature is generally production ready and fully supported. Can be specified multiple times.",
       "default": []
+    },
+    "telemetry-file": {
+      "type": "string",
+      "desc": "Send telemetry data to a local file."
     }
   },
   "commands": {

packages/aws-cdk/lib/cli/cli.ts

@@ -31,6 +31,7 @@ import { getMigrateScanType } from '../commands/migrate';
 import { execProgram, CloudExecutable } from '../cxapp';
 import type { StackSelector, Synthesizer } from '../cxapp';
 import { ProxyAgentProvider } from './proxy-agent';
+import type { ErrorDetails } from './telemetry/schema';
 import { isDeveloperBuildVersion, versionWithBuild, versionNumber } from './version';
 
 if (!process.stdout.isTTY) {
@@ -97,6 +98,12 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise<n
     caBundlePath: configuration.settings.get(['caBundlePath']),
   });
 
+  try {
+    await ioHost.startTelemetry(argv, configuration.context);
+  } catch (e: any) {
+    await ioHost.asIoHelper().defaults.trace(`Telemetry instantiation failed: ${e.message}`);
+  }
+
   const shouldDisplayNotices = configuration.settings.get(['notices']);
   // Notices either go to stderr, or nowhere
   ioHost.noticesDestination = shouldDisplayNotices ? 'stderr' : 'drop';
@@ -125,6 +132,8 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise<n
     pluginHost: GLOBAL_PLUGIN_HOST,
   }, configuration.settings.get(['profile']));
 
+  await ioHost.telemetry?.attachRegion(sdkProvider.defaultRegion);
+
   let outDirLock: IReadLock | undefined;
   const cloudExecutable = new CloudExecutable({
     configuration,
@@ -195,6 +204,10 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise<n
       throw new ToolkitError('You must either specify a list of Stacks or the `--all` argument');
     }
 
+    if (args['telemetry-file'] && !configuration.settings.get(['unstable']).includes('telemetry')) {
+      throw new ToolkitError('Unstable feature use: \'telemetry-file\' is unstable. It must be opted in via \'--unstable\', e.g. \'cdk deploy --unstable=telemetry --telemetry-file=my/file/path\'');
+    }
+
     args.STACKS = args.STACKS ?? (args.STACK ? [args.STACK] : []);
     args.ENVIRONMENTS = args.ENVIRONMENTS ?? [];
 
@@ -645,17 +658,28 @@ function determineHotswapMode(hotswap?: boolean, hotswapFallback?: boolean, watc
 
 /* c8 ignore start */ // we never call this in unit tests
 export function cli(args: string[] = process.argv.slice(2)) {
+  let error: ErrorDetails | undefined;
   exec(args)
     .then(async (value) => {
       if (typeof value === 'number') {
         process.exitCode = value;
       }
     })
-    .catch((err) => {
+    .catch(async (err) => {
       // Log the stack trace if we're on a developer workstation. Otherwise this will be into a minified
       // file and the printed code line and stack trace are huge and useless.
       prettyPrintError(err, isDeveloperBuildVersion());
+      error = err;
       process.exitCode = 1;
+    })
+    .finally(async () => {
+      if (!error && process.exitCode === 1) {
+        // The existence of an error determines if telemetry is successful or not so we create a
+        // dummy error in the event that exit code is 1 but no error is thrown
+        error = { name: 'ExitCode1Error' };
+      }
+
+      await CliIoHost.get()?.telemetry?.end(error);
     });
 }
 /* c8 ignore stop */

packages/aws-cdk/lib/cli/convert-to-user-input.ts

@@ -34,6 +34,7 @@ export function convertYargsToUserInput(args: any): UserInput {
     noColor: args.noColor,
     ci: args.ci,
     unstable: args.unstable,
+    telemetryFile: args.telemetryFile,
   };
   let commandOptions;
   switch (args._[0] as Command) {
@@ -324,6 +325,7 @@ export function convertConfigToUserInput(config: any): UserInput {
     noColor: config.noColor,
     ci: config.ci,
     unstable: config.unstable,
+    telemetryFile: config.telemetryFile,
   };
   const listOptions = {
     long: config.list?.long,