@cedarjs/cli 8.0.0-canary.3599 → 8.0.0-canary.3601

package/dist/commands/execHandler.js

@@ -1,7 +1,5 @@
 import fs from "node:fs";
 import path from "node:path";
-import { context } from "@opentelemetry/api";
-import { suppressTracing } from "@opentelemetry/core";
 import { Listr } from "listr2";
 import { Parser } from "yargs/helpers";
 import { colors as c } from "@cedarjs/cli-helpers/colors";
@@ -103,9 +101,7 @@ No script called \`${name}\` in the ./scripts folder.
     renderer: args.silent ? "silent" : "verbose"
   });
   try {
-    await context.with(suppressTracing(context.active()), async () => {
-      await tasks.run();
-    });
+    await tasks.run();
   } catch {
     process.exit(1);
   }

package/dist/index.js

@@ -1,14 +1,17 @@
 #!/usr/bin/env node
 import fs from "node:fs";
 import path from "path";
-import { trace, SpanStatusCode } from "@opentelemetry/api";
 import { hideBin, Parser } from "yargs/helpers";
 import yargs from "yargs/yargs";
 import { colors as c } from "@cedarjs/cli-helpers/colors";
 import { loadEnvFiles } from "@cedarjs/cli-helpers/loadEnvFiles";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { findUp, getConfigPath } from "@cedarjs/project-config";
-import { telemetryMiddleware } from "@cedarjs/telemetry";
+import {
+  startTelemetry,
+  shutdownTelemetry,
+  telemetryMiddleware
+} from "@cedarjs/telemetry/cli";
 import * as buildCommand from "./commands/build.js";
 import * as checkCommand from "./commands/check.js";
 import * as consoleCommand from "./commands/console.js";
@@ -33,7 +36,6 @@ import * as upgradeCommand from "./commands/upgrade/upgrade.js";
 import { exitWithError } from "./lib/exit.js";
 import * as updateCheck from "./lib/updateCheck.js";
 import { loadPlugins } from "./plugin.js";
-import { startTelemetry, shutdownTelemetry } from "./telemetry/index.js";
 const {
   telemetry,
   help,
@@ -72,31 +74,26 @@ if (process.cwd() !== cwd) {
 }
 loadEnvFiles();
 async function main() {
+  const pkgJson = await import("../package.json", { with: { type: "json" } });
   if (telemetry) {
-    startTelemetry();
+    startTelemetry({ cedarVersion: pkgJson.default["version"] });
   }
-  const tracer = trace.getTracer("redwoodjs");
-  await tracer.startActiveSpan("cli", async (span) => {
-    const telemetryTimeoutTimer = setTimeout(() => {
-      shutdownTelemetry();
-    }, 5 * 6e4);
-    if (version) {
-      recordTelemetryAttributes({ command: "--version" });
-    }
-    if (help) {
-      recordTelemetryAttributes({ command: "--help" });
-    }
-    try {
-      await runYargs();
-    } catch (error) {
-      exitWithError(error);
-    }
-    if (span?.isRecording()) {
-      span?.setStatus({ code: SpanStatusCode.OK });
-      span?.end();
-    }
-    clearTimeout(telemetryTimeoutTimer);
-  });
+  const telemetryTimeoutTimer = setTimeout(() => {
+    shutdownTelemetry();
+  }, 5 * 6e4);
+  telemetryTimeoutTimer.unref();
+  if (version) {
+    recordTelemetryAttributes({ command: "--version" });
+  }
+  if (help) {
+    recordTelemetryAttributes({ command: "--help" });
+  }
+  try {
+    await runYargs();
+  } catch (error) {
+    exitWithError(error);
+  }
+  clearTimeout(telemetryTimeoutTimer);
   if (telemetry) {
     shutdownTelemetry();
   }
@@ -125,7 +122,7 @@ async function runYargs() {
     "yarn cedar exec migrateUsers --load-env-files stripe nakama",
     "Run a script, also loading env vars from '.env.stripe' and '.env.nakama'"
   ).option("telemetry", {
-    describe: "Whether to send anonymous usage telemetry to RedwoodJS",
+    describe: "Whether to send anonymous usage telemetry to CedarJS",
     boolean: true
     // hidden: true,
   }).example(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "8.0.0-canary.3599",
+  "version": "8.0.0-canary.3601",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,24 +36,18 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.12",
     "@babel/types": "7.29.11",
-    "@cedarjs/api-server": "8.0.0-canary.3599",
-    "@cedarjs/babel-config": "8.0.0-canary.3599",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3599",
-    "@cedarjs/internal": "8.0.0-canary.3599",
-    "@cedarjs/prerender": "8.0.0-canary.3599",
-    "@cedarjs/project-config": "8.0.0-canary.3599",
-    "@cedarjs/structure": "8.0.0-canary.3599",
-    "@cedarjs/telemetry": "8.0.0-canary.3599",
-    "@cedarjs/utils": "8.0.0-canary.3599",
-    "@cedarjs/vite": "8.0.0-canary.3599",
-    "@cedarjs/web-server": "8.0.0-canary.3599",
+    "@cedarjs/api-server": "8.0.0-canary.3601",
+    "@cedarjs/babel-config": "8.0.0-canary.3601",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3601",
+    "@cedarjs/internal": "8.0.0-canary.3601",
+    "@cedarjs/prerender": "8.0.0-canary.3601",
+    "@cedarjs/project-config": "8.0.0-canary.3601",
+    "@cedarjs/structure": "8.0.0-canary.3601",
+    "@cedarjs/telemetry": "8.0.0-canary.3601",
+    "@cedarjs/utils": "8.0.0-canary.3601",
+    "@cedarjs/vite": "8.0.0-canary.3601",
+    "@cedarjs/web-server": "8.0.0-canary.3601",
     "@listr2/prompt-adapter-enquirer": "4.4.3",
-    "@opentelemetry/api": "1.9.1",
-    "@opentelemetry/core": "2.12.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.223.0",
-    "@opentelemetry/resources": "2.12.0",
-    "@opentelemetry/sdk-trace-node": "2.12.0",
-    "@opentelemetry/semantic-conventions": "1.43.0",
     "@prisma/internals": "7.10.1",
     "ansis": "4.4.0",
     "archiver": "7.0.1",
@@ -93,7 +87,7 @@
     "yargs": "18.2.0"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "8.0.0-canary.3599",
+    "@cedarjs/framework-tools": "8.0.0-canary.3601",
     "@prisma/dmmf": "7.10.1",
     "@types/archiver": "^7.0.0",
     "memfs": "4.80.0",

package/dist/telemetry/exporter.js

@@ -1,70 +0,0 @@
-import fs from "node:fs";
-import path from "path";
-import { getPaths } from "@cedarjs/project-config";
-class CustomFileExporter {
-  /**
-   * @type string
-   * @private
-   */
-  #storageFileName;
-  /**
-   * @type string
-   * @private
-   */
-  #storageFilePath;
-  /**
-   * @type boolean
-   * @private
-   */
-  #isShutdown = false;
-  constructor() {
-    this.#storageFileName = `${Date.now()}.json`;
-    this.#storageFilePath = path.join(
-      getPaths().generated.base,
-      "telemetry",
-      this.#storageFileName
-    );
-    fs.mkdirSync(path.dirname(this.#storageFilePath), { recursive: true });
-    fs.writeFileSync(this.#storageFilePath, "[");
-  }
-  /**
-   * Called to export sampled {@link ReadableSpan}s.
-   * @param spans the list of sampled Spans to be exported.
-   */
-  export(spans, resultCallback) {
-    for (const span of spans) {
-      fs.appendFileSync(
-        this.#storageFilePath,
-        JSON.stringify(
-          span,
-          (key, value) => {
-            if (key === "_spanProcessor") {
-              return void 0;
-            }
-            return value;
-          },
-          2
-        )
-      );
-      fs.appendFileSync(this.#storageFilePath, ",");
-    }
-    resultCallback({ code: 0 });
-  }
-  /** Stops the exporter. */
-  async shutdown() {
-    if (!this.#isShutdown) {
-      fs.truncateSync(
-        this.#storageFilePath,
-        fs.statSync(this.#storageFilePath).size - 1
-      );
-      fs.appendFileSync(this.#storageFilePath, "]");
-      this.#isShutdown = true;
-    }
-  }
-  /** Immediately export all spans */
-  forceFlush() {
-  }
-}
-export {
-  CustomFileExporter
-};

package/dist/telemetry/index.js

@@ -1,85 +0,0 @@
-import path from "path";
-import { diag, DiagConsoleLogger, DiagLogLevel } from "@opentelemetry/api";
-import opentelemetry from "@opentelemetry/api";
-import {
-  NodeTracerProvider,
-  SimpleSpanProcessor,
-  SamplingDecision
-} from "@opentelemetry/sdk-trace-node";
-import { hideBin } from "yargs/helpers";
-import { getNodeRunnerArgs } from "@cedarjs/cli-helpers/packageManager/exec";
-import { spawnBackgroundProcess } from "../lib/background.js";
-import { CustomFileExporter } from "./exporter.js";
-let traceProvider;
-let traceProcessor;
-let traceExporter;
-let isStarted = false;
-let isShutdown = false;
-async function startTelemetry() {
-  if (isStarted) {
-    return;
-  }
-  isStarted = true;
-  try {
-    diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.ERROR);
-    traceExporter = new CustomFileExporter();
-    traceProcessor = new SimpleSpanProcessor(traceExporter);
-    traceProvider = new NodeTracerProvider({
-      sampler: {
-        shouldSample: () => {
-          return {
-            decision: isShutdown ? SamplingDecision.NOT_RECORD : SamplingDecision.RECORD_AND_SAMPLED
-          };
-        },
-        toString: () => {
-          return "AlwaysSampleWhenNotShutdown";
-        }
-      },
-      spanProcessors: [traceProcessor]
-    });
-    traceProvider.register();
-    const cleanArgv = hideBin(process.argv);
-    if (!cleanArgv.includes("sb") && !cleanArgv.includes("storybook")) {
-      for (const signal of ["SIGTERM", "SIGINT", "SIGHUP"]) {
-        process.on(signal, () => {
-          if (process.listenerCount(signal) === 1) {
-            process.exit();
-          }
-        });
-      }
-    } else {
-      process.on("shutdown-telemetry", () => {
-        shutdownTelemetry();
-      });
-    }
-    process.on("exit", () => {
-      shutdownTelemetry();
-    });
-  } catch (error) {
-    console.error("Telemetry error");
-    console.error(error);
-  }
-}
-function shutdownTelemetry() {
-  if (isShutdown || !isStarted) {
-    return;
-  }
-  isShutdown = true;
-  try {
-    while (opentelemetry.trace.getActiveSpan()?.isRecording()) {
-      opentelemetry.trace.getActiveSpan()?.end();
-    }
-    traceExporter?.shutdown();
-    const [cmd, args] = getNodeRunnerArgs(
-      path.join(import.meta.dirname, "send.js")
-    );
-    spawnBackgroundProcess("telemetry", cmd, args);
-  } catch (error) {
-    console.error("Telemetry error");
-    console.error(error);
-  }
-}
-export {
-  shutdownTelemetry,
-  startTelemetry
-};

package/dist/telemetry/resource.js

@@ -1,94 +0,0 @@
-import fs from "node:fs";
-import os from "node:os";
-import path from "path";
-import { SemanticResourceAttributes } from "@opentelemetry/semantic-conventions";
-import ci from "ci-info";
-import envinfo from "envinfo";
-import { v4 as uuidv4, validate as validateUUID } from "uuid";
-import { getPaths, getRawConfig } from "@cedarjs/project-config";
-import { RWProject } from "@cedarjs/structure/dist/model/RWProject";
-async function getResources() {
-  const packageJson = await import("../../package.json", { with: { type: "json" } });
-  const packageName = packageJson.default["name"];
-  const packageVersion = packageJson.default["version"];
-  let UID = uuidv4();
-  try {
-    const telemetryFile = path.join(getPaths().generated.base, "telemetry.txt");
-    if (!fs.existsSync(telemetryFile)) {
-      fs.mkdirSync(path.dirname(telemetryFile), { recursive: true });
-      fs.writeFileSync(telemetryFile, "");
-    }
-    if (fs.statSync(telemetryFile).mtimeMs < Date.now() - 864e5) {
-      fs.writeFileSync(telemetryFile, UID);
-    } else {
-      const storedUID = fs.readFileSync(telemetryFile, { encoding: "utf8" });
-      if (storedUID && validateUUID(storedUID)) {
-        UID = storedUID;
-      } else {
-        fs.writeFileSync(telemetryFile, UID);
-      }
-    }
-  } catch {
-  }
-  const info = JSON.parse(
-    await envinfo.run(
-      {
-        System: ["OS", "Shell"],
-        Binaries: ["Node", "Yarn", "npm"],
-        npmPackages: "@cedarjs/*",
-        IDEs: ["VSCode"]
-      },
-      { json: true }
-    )
-  );
-  const shell = info.System?.Shell;
-  if (shell?.path?.match("/")) {
-    info.System.Shell.name = info.System.Shell.path.split("/").pop();
-  } else if (shell?.path.match("\\")) {
-    info.System.Shell.name = info.System.Shell.path.split("\\").pop();
-  }
-  const cpuCount = os.availableParallelism();
-  const memoryGb = Math.round(os.totalmem() / 1073741824);
-  let developmentEnvironment = void 0;
-  if (Object.keys(process.env).some((key) => key.startsWith("GITPOD_"))) {
-    developmentEnvironment = "gitpod";
-  }
-  const experiments = Object.keys(getRawConfig()["experimental"] || {});
-  const project = new RWProject();
-  const routes = project.getRouter().routes;
-  const prerenderedRoutes = routes.filter(
-    (route) => route.hasPrerender
-  );
-  const complexity = [
-    routes.length,
-    prerenderedRoutes.length,
-    project.services.length,
-    project.cells.length,
-    project.pages.length
-  ].join(".");
-  const sides = project.sides.join(",");
-  return {
-    [SemanticResourceAttributes.SERVICE_NAME]: packageName,
-    [SemanticResourceAttributes.SERVICE_VERSION]: packageVersion,
-    [SemanticResourceAttributes.OS_TYPE]: info.System?.OS?.split(" ")[0],
-    [SemanticResourceAttributes.OS_VERSION]: info.System?.OS?.split(" ")[1],
-    "shell.name": info.System?.Shell?.name,
-    "node.version": info.Binaries?.Node?.version,
-    "yarn.version": info.Binaries?.Yarn?.version,
-    "npm.version": info.Binaries?.npm?.version,
-    "vscode.version": info.IDEs?.VSCode?.version,
-    "cpu.count": cpuCount,
-    "memory.gb": memoryGb,
-    "env.node_env": process.env.NODE_ENV || void 0,
-    "ci.redwood": !!process.env.CEDAR_CI,
-    "ci.isci": ci.isCI,
-    "dev.environment": developmentEnvironment,
-    complexity,
-    sides,
-    experiments: JSON.stringify(experiments),
-    uid: UID
-  };
-}
-export {
-  getResources
-};

package/dist/telemetry/send.js

@@ -1,92 +0,0 @@
-import fs from "node:fs";
-import path from "path";
-import { ExportResultCode } from "@opentelemetry/core";
-import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
-import {
-  defaultResource,
-  resourceFromAttributes
-} from "@opentelemetry/resources";
-import { getPaths } from "@cedarjs/project-config";
-import { getResources } from "./resource.js";
-async function main() {
-  console.log(
-    "You can disable telemetry by:\n - setting the 'CEDAR_DISABLE_TELEMETRY' environment variable\n - passing the '--no-telemetry' flag when using the CLI"
-  );
-  console.log(
-    "Information about Cedar telemetry can be found at:\n - https://telemetry.redwoodjs.com\n"
-  );
-  const telemetryDir = path.join(getPaths().generated.base, "telemetry");
-  fs.mkdirSync(telemetryDir, { recursive: true });
-  const telemetryFiles = fs.readdirSync(
-    path.join(getPaths().generated.base, "telemetry")
-  );
-  console.time("Computed resource information");
-  const customResourceData = await getResources();
-  console.timeEnd("Computed resource information");
-  const resource = defaultResource().merge(
-    resourceFromAttributes(customResourceData)
-  );
-  const url = process.env.CEDAR_REDIRECT_TELEMETRY || process.env.REDWOOD_REDIRECT_TELEMETRY || "https://quark.quantumparticle.io/v1/traces";
-  const traceExporter = new OTLPTraceExporter({
-    url
-  });
-  console.log(`Sending telemetry data to '${url}'`);
-  for (const [index, file] of telemetryFiles.entries()) {
-    if (file.startsWith("_")) {
-      continue;
-    }
-    console.log(`Sending data from telemetry file '${file}'`);
-    let spans = [];
-    try {
-      spans = JSON.parse(fs.readFileSync(path.join(telemetryDir, file), "utf8"));
-    } catch (error) {
-      console.error(`Error reading telemetry file '${file}'`);
-      console.error(error);
-      console.error("Deleting this file to prevent further errors");
-      fs.unlinkSync(path.join(telemetryDir, file));
-      continue;
-    }
-    if (!Array.isArray(spans)) {
-      console.error(
-        `Telemetry file '${file}' does not contain an array of spans. Deleting this file to prevent further errors.`
-      );
-      fs.unlinkSync(path.join(telemetryDir, file));
-      continue;
-    }
-    for (const span of spans) {
-      span.resource = resource;
-      span.attributes ??= span._attributes ?? {};
-      span.spanContext = () => span._spanContext;
-      span.events = [];
-    }
-    traceExporter.export(
-      spans,
-      ({ code, error }) => {
-        if (code !== ExportResultCode.SUCCESS) {
-          console.error("Encountered:");
-          console.error(error);
-          console.error("while exporting the following spans:");
-          console.error(spans);
-        }
-      }
-    );
-    fs.writeFileSync(
-      path.join(telemetryDir, `_${file}`),
-      JSON.stringify(spans, null, 2)
-    );
-    fs.unlinkSync(path.join(telemetryDir, file));
-    telemetryFiles[index] = `_${file}`;
-  }
-  traceExporter.shutdown();
-  console.log(
-    "Keeping the lastest 8 telemetry files for visibility/transparency."
-  );
-  const sortedTelemetryFiles = telemetryFiles.sort((a, b) => {
-    return parseInt(b.split(".")[0].replace("_", "")) - parseInt(a.split(".")[0].replace("_", ""));
-  });
-  for (let i = 8; i < sortedTelemetryFiles.length; i++) {
-    console.log(`Removing telemetry file '${sortedTelemetryFiles[i]}'`);
-    fs.unlinkSync(path.join(telemetryDir, sortedTelemetryFiles[i]));
-  }
-}
-main();