fix(create-cloudflare): report effective telemetry status

edmundhung · edmundhung · commit 17fa0756a981 · 2026-08-11T10:51:21.000+01:00
diff --git a/packages/create-cloudflare/src/__tests__/metrics.test.ts b/packages/create-cloudflare/src/__tests__/metrics.test.ts
@@ -567,6 +567,8 @@ describe("runTelemetryCommand", () => {
 
 	afterEach(() => {
 		vi.useRealTimers();
+		vi.clearAllMocks();
+		vi.unstubAllEnvs();
 	});
 
 	test("run telemetry status when c3permission is disabled", async ({
@@ -607,6 +609,36 @@ describe("runTelemetryCommand", () => {
 		`);
 	});
 
+	test("run telemetry status when DO_NOT_TRACK is enabled", ({ expect }) => {
+		vi.stubEnv("DO_NOT_TRACK", "1");
+
+		runTelemetryCommand("status");
+
+		expect(readMetricsConfig).not.toHaveBeenCalled();
+		expect(writeMetricsConfig).not.toHaveBeenCalled();
+		expect(normalizeOutput(std.out)).toMatchInlineSnapshot(`
+			"Status: Disabled (set by DO_NOT_TRACK)
+
+			"
+		`);
+	});
+
+	test("run telemetry status when CREATE_CLOUDFLARE_TELEMETRY_DISABLED is enabled", ({
+		expect,
+	}) => {
+		vi.stubEnv("CREATE_CLOUDFLARE_TELEMETRY_DISABLED", "1");
+
+		runTelemetryCommand("status");
+
+		expect(readMetricsConfig).not.toHaveBeenCalled();
+		expect(writeMetricsConfig).not.toHaveBeenCalled();
+		expect(normalizeOutput(std.out)).toMatchInlineSnapshot(`
+			"Status: Disabled (set by CREATE_CLOUDFLARE_TELEMETRY_DISABLED)
+
+			"
+		`);
+	});
+
 	test("run telemetry enable when c3permission is disabled", async ({
 		expect,
 	}) => {
diff --git a/packages/create-cloudflare/src/metrics.ts b/packages/create-cloudflare/src/metrics.ts
@@ -59,6 +59,23 @@ export function getPlatform() {
 	}
 }
 
+function resolveTelemetryStatus():
+	| { enabled: boolean; source: string }
+	| undefined {
+	if (isDoNotTrackEnabled()) {
+		return { enabled: false, source: "DO_NOT_TRACK" };
+	}
+
+	if (process.env.CREATE_CLOUDFLARE_TELEMETRY_DISABLED === "1") {
+		return {
+			enabled: false,
+			source: "CREATE_CLOUDFLARE_TELEMETRY_DISABLED",
+		};
+	}
+
+	return undefined;
+}
+
 export function createReporter() {
 	const events: Array<Promise<void>> = [];
 	const als = new AsyncLocalStorage<{
@@ -67,7 +84,9 @@ export function createReporter() {
 
 	const config = readMetricsConfig() ?? {};
 	const isFirstUsage = config.c3permission === undefined;
-	const isEnabled = isTelemetryEnabled();
+	const isEnabled =
+		resolveTelemetryStatus()?.enabled ??
+		(sparrow.hasSparrowSourceKey() && getC3Permission(config).enabled);
 	const deviceId = getDeviceId(config);
 	const packageManager = detectPackageManager();
 	const platform = getPlatform();
@@ -110,17 +129,6 @@ export function createReporter() {
 		events.push(request);
 	}
 
-	function isTelemetryEnabled() {
-		if (
-			isDoNotTrackEnabled() ||
-			process.env.CREATE_CLOUDFLARE_TELEMETRY_DISABLED === "1"
-		) {
-			return false;
-		}
-
-		return sparrow.hasSparrowSourceKey() && getC3Permission(config).enabled;
-	}
-
 	async function waitForAllEventsSettled(): Promise<void> {
 		await Promise.allSettled(events);
 	}
@@ -296,8 +304,9 @@ function updateC3Permission(enabled: boolean) {
 	writeMetricsConfig(config);
 }
 
-function logTelemetryStatus(enabled: boolean) {
-	logRaw(`Status: ${enabled ? "Enabled" : "Disabled"}`);
+function logTelemetryStatus(enabled: boolean, source?: string) {
+	const sourceMessage = source === undefined ? "" : ` (set by ${source})`;
+	logRaw(`Status: ${enabled ? "Enabled" : "Disabled"}${sourceMessage}`);
 	logRaw("");
 }
 
@@ -320,9 +329,10 @@ export const runTelemetryCommand = (
 			break;
 		}
 		case "status": {
-			const telemetry = getC3Permission();
+			const telemetry = resolveTelemetryStatus();
+			const enabled = telemetry?.enabled ?? getC3Permission().enabled;
 
-			logTelemetryStatus(telemetry.enabled);
+			logTelemetryStatus(enabled, telemetry?.source);
 			break;
 		}
 	}
