normalize into camelcase

Author: emily-shen

packages/wrangler/src/__tests__/metrics.test.ts

@@ -279,11 +279,11 @@ describe("metrics", () => {
 							"array",
 							"number",
 							"positional",
-							"xgradualrollouts",
-							"xversions",
+							"xGradualRollouts",
+							"xVersions",
 						],
 						argsCombination:
-							"array, number, positional, xgradualrollouts, xversions",
+							"array, number, positional, xGradualRollouts, xVersions",
 						command: "wrangler command subcommand",
 						args: {
 							...reusedGlobalArgs,
@@ -309,11 +309,11 @@ describe("metrics", () => {
 							"array",
 							"number",
 							"positional",
-							"xgradualrollouts",
-							"xversions",
+							"xGradualRollouts",
+							"xVersions",
 						],
 						argsCombination:
-							"array, number, positional, xgradualrollouts, xversions",
+							"array, number, positional, xGradualRollouts, xVersions",
 						command: "wrangler command subcommand",
 						args: {
 							...reusedGlobalArgs,
@@ -361,11 +361,11 @@ describe("metrics", () => {
 							"array",
 							"number",
 							"positional",
-							"xgradualrollouts",
-							"xversions",
+							"xGradualRollouts",
+							"xVersions",
 						],
 						argsCombination:
-							"array, number, positional, xgradualrollouts, xversions",
+							"array, number, positional, xGradualRollouts, xVersions",
 						command: "wrangler command subcommand",
 						args: {
 							...reusedGlobalArgs,
@@ -392,11 +392,11 @@ describe("metrics", () => {
 							"array",
 							"number",
 							"positional",
-							"xgradualrollouts",
-							"xversions",
+							"xGradualRollouts",
+							"xVersions",
 						],
 						argsCombination:
-							"array, number, positional, xgradualrollouts, xversions",
+							"array, number, positional, xGradualRollouts, xVersions",
 						command: "wrangler command subcommand",
 						args: {
 							...reusedGlobalArgs,

packages/wrangler/src/metrics/metrics-dispatcher.ts

@@ -41,7 +41,8 @@ export function getMetricsDispatcher(options: MetricsConfigOptions) {
 	/** We redact strings in arg values, unless they are named here */
 	const allowList = {
 		// applies to all commands
-		"*": ["format", "log-level", "logLevel"],
+		// use camelCase version
+		"*": ["format", "logLevel"],
 		// specific commands
 		tail: ["status"],
 	};
@@ -86,7 +87,7 @@ export function getMetricsDispatcher(options: MetricsConfigOptions) {
 				return;
 			}
 			printMetricsBanner();
-			const argsUsed = normaliseArgs(properties.args ?? {});
+			const argsUsed = sanitiseUserInput(properties.args ?? {});
 			const argsCombination = argsUsed.sort().join(", ");
 			const commonEventProperties: CommonEventProperties = {
 				amplitude_session_id,
@@ -201,9 +202,15 @@ export function getMetricsDispatcher(options: MetricsConfigOptions) {
 
 export type Properties = Record<string, unknown>;
 
+const normalise = (arg: string) => {
+	const camelize = (str: string) =>
+		str.replace(/-./g, (x) => x[1].toUpperCase());
+	return camelize(arg.replace("experimental", "x"));
+};
+
 const exclude = new Set(["$0", "_"]);
 /** just some pretty naive cleaning so we don't send "experimental-versions", "experimentalVersions", "x-versions" and "xVersions" etc. */
-const normaliseArgs = (argsWithValues: Record<string, unknown>) => {
+const sanitiseUserInput = (argsWithValues: Record<string, unknown>) => {
 	const result: string[] = [];
 	const args = Object.keys(argsWithValues);
 	for (const arg of args) {
@@ -216,10 +223,8 @@ const normaliseArgs = (argsWithValues: Record<string, unknown>) => {
 		) {
 			continue;
 		}
-		const normalisedArg = arg
-			.replace("experimental", "x")
-			.replaceAll("-", "")
-			.toLowerCase();
+
+		const normalisedArg = normalise(arg);
 		if (result.includes(normalisedArg)) {
 			continue;
 		}
@@ -248,7 +253,7 @@ export const redactArgValues = (
 		if (
 			typeof value === "number" ||
 			typeof value === "boolean" ||
-			allowedKeys.includes(key)
+			allowedKeys.includes(normalise(key))
 		) {
 			result[key] = value;
 		} else if (typeof value === "string") {