Merge pull request #2698 from hashicorp/fix-watch-telemetry

fix(cli): fix watch telemetry
hashicorp · Mar 8, 2023 · 304ef28 · 304ef28
2 parents 01b3c04 + 5934c1d
commit 304ef28
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/packages/@cdktf/cli-core/src/lib/cdktf-project.ts b/packages/@cdktf/cli-core/src/lib/cdktf-project.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MPL-2.0
 import { AbortController, AbortSignal } from "node-abort-controller"; // polyfill until we update to node 16
 import { Errors, ensureAllSettledBeforeThrowing, logger } from "@cdktf/commons";
-import { SynthesizedStack, SynthStack } from "./synth-stack";
+import { SynthesizedStack, SynthOrigin, SynthStack } from "./synth-stack";
 import { printAnnotations } from "./synth";
 import {
  CdktfStack,
@@ -120,6 +120,7 @@ export type CdktfProjectOptions = {
  onUpdate: (update: ProjectUpdate) => void;
  onLog?: (log: LogMessage) => void;
  workingDirectory?: string;
+ synthOrigin?: SynthOrigin;
 };
 export class CdktfProject {
  public stacks?: SynthesizedStack[];
@@ -131,6 +132,7 @@ export class CdktfProject {
  private onUpdate: (update: ProjectUpdate) => void;
  private onLog?: (log: LogMessage) => void;
  private abortSignal: AbortSignal;
+ private synthOrigin?: SynthOrigin;
 
  // Set during deploy / destroy
  public stacksToRun: CdktfStack[] = [];
@@ -146,6 +148,7 @@ export class CdktfProject {
  onUpdate,
  onLog,
  workingDirectory = process.cwd(),
+ synthOrigin,
  }: CdktfProjectOptions) {
  this.synthCommand = synthCommand;
  this.outDir = outDir;
@@ -154,6 +157,7 @@ export class CdktfProject {
  this.onLog = onLog;
  const ac = new AbortController();
  this.abortSignal = ac.signal;
+ this.synthOrigin = synthOrigin;
 
  this.hardAbort = ac.abort.bind(ac);
  this.ioHandler = new CdktfProjectIOHandler();
@@ -338,7 +342,9 @@ export class CdktfProject {
  this.abortSignal,
  this.synthCommand,
  this.outDir,
- this.workingDirectory
+ this.workingDirectory,
+ false,
+ this.synthOrigin
  );
 
  printAnnotations(stacks);

diff --git a/packages/@cdktf/cli-core/src/lib/synth-stack.ts b/packages/@cdktf/cli-core/src/lib/synth-stack.ts
@@ -61,7 +61,7 @@ interface ManifestJson {
  stacks: StackManifest[];
 }
 
-type SynthOrigin = "watch";
+export type SynthOrigin = "watch";
 
 export class SynthStack {
  public static async synth(

diff --git a/packages/@cdktf/cli-core/src/lib/watch.ts b/packages/@cdktf/cli-core/src/lib/watch.ts
@@ -8,7 +8,7 @@ import {
 } from "./cdktf-project";
 import * as fs from "fs";
 import * as chokidar from "chokidar";
-import { logger, Errors } from "@cdktf/commons";
+import { logger, Errors, sendTelemetry } from "@cdktf/commons";
 import { CdktfStack } from "./cdktf-stack";
 
 // In this very first iteration we will find out which files to watch by asking the user to provide the files
@@ -109,6 +109,7 @@ export async function watch(
  async function run() {
  logger.debug("Running cdktf deploy");
  const project = new CdktfProject({
+ synthOrigin: "watch",
  ...projectOptions,
  onLog: (log) => {
  if (projectOptions.onLog) {
@@ -172,4 +173,6 @@ export async function watch(
  watcher.on("all", onFileChange);
  // initially run once
  onFileChange();
+
+ await sendTelemetry("watch", { event: "start" });
 }
diff --git a/tools/generate-function-bindings/scripts/constants.ts b/tools/generate-function-bindings/scripts/constants.ts
@@ -3,4 +3,4 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-export const FUNCTIONS_METADATA_FILE = "functions.json";
+export const FUNCTIONS_METADATA_FILE = "functions.json";
diff --git a/tools/generate-function-bindings/scripts/fetch-metadata.ts b/tools/generate-function-bindings/scripts/fetch-metadata.ts
@@ -19,4 +19,4 @@ async function fetchMetadata() {
  await fs.writeFile(out, prettier.format(json, { parser: "json" }));
 }
 
-fetchMetadata();
+fetchMetadata();