wrangler 2.0.18 → 2.0.19

package/src/pages/dev.tsx

@@ -8,6 +8,7 @@ import { getType } from "mime";
 import { getVarsForDev } from "../dev/dev-vars";
 import { FatalError } from "../errors";
 import { logger } from "../logger";
+import * as metrics from "../metrics";
 import { getRequestContextCheckOptions } from "../miniflare-cli/request-context";
 import openInBrowser from "../open-in-browser";
 import { buildFunctions } from "./build";
@@ -172,6 +173,7 @@ export const Handler = async ({
 				buildOutputDirectory: directory,
 				nodeCompat,
 			});
+			metrics.sendMetricsEvent("build pages functions");
 		} catch {}
 
 		watch([functionsDirectory], {
@@ -187,6 +189,7 @@ export const Handler = async ({
 				buildOutputDirectory: directory,
 				nodeCompat,
 			});
+			metrics.sendMetricsEvent("build pages functions");
 		});
 
 		miniflareArgs = {
@@ -318,6 +321,7 @@ export const Handler = async ({
 		// `startServer` might throw if user code contains errors
 		const server = await miniflare.startServer();
 		logger.log(`Serving at http://localhost:${port}/`);
+		metrics.sendMetricsEvent("run pages dev");
 
 		if (process.env.BROWSER !== "none") {
 			await openInBrowser(`http://localhost:${port}/`);

package/src/pages/projects.tsx

@@ -8,6 +8,7 @@ import { getConfigCache, saveToConfigCache } from "../config-cache";
 import { prompt } from "../dialogs";
 import { FatalError } from "../errors";
 import { logger } from "../logger";
+import * as metrics from "../metrics";
 import { requireAuth } from "../user";
 import { PAGES_CONFIG_CACHE_FILENAME } from "./constants";
 import { pagesBetaWarning } from "./utils";
@@ -44,6 +45,7 @@ export async function ListHandler() {
 	});
 
 	render(<Table data={data}></Table>, { patchConsole: false });
+	metrics.sendMetricsEvent("list pages projects");
 }
 
 export const listProjects = async ({
@@ -154,4 +156,5 @@ export async function CreateHandler({
 	logger.log(
 		`To deploy a folder of assets, run 'wrangler pages publish [directory]'.`
 	);
+	metrics.sendMetricsEvent("create pages project");
 }

package/src/pages/publish.tsx

@@ -12,6 +12,7 @@ import { getConfigCache, saveToConfigCache } from "../config-cache";
 import { prompt } from "../dialogs";
 import { FatalError } from "../errors";
 import { logger } from "../logger";
+import * as metrics from "../metrics";
 import { requireAuth } from "../user";
 import { buildFunctions } from "./build";
 import { PAGES_CONFIG_CACHE_FILENAME } from "./constants";
@@ -193,6 +194,7 @@ export const Handler = async ({
 				});
 
 				logger.log(`✨ Successfully created the '${projectName}' project.`);
+				metrics.sendMetricsEvent("create pages project");
 				break;
 			}
 		}
@@ -332,4 +334,5 @@ export const Handler = async ({
 	logger.log(
 		`✨ Deployment complete! Take a peek over at ${deploymentResponse.url}`
 	);
+	metrics.sendMetricsEvent("deploy pages project");
 };

package/src/pages/upload.tsx

@@ -282,9 +282,9 @@ export const upload = async (
 				});
 			} catch (e) {
 				if (attempts < MAX_UPLOAD_ATTEMPTS) {
-					// Linear backoff, 0 second first time, then 1 second etc.
+					// Exponential backoff, 1 second first time, then 2 second, then 4 second etc.
 					await new Promise((resolvePromise) =>
-						setTimeout(resolvePromise, attempts++ * 1000)
+						setTimeout(resolvePromise, Math.pow(2, attempts++) * 1000)
 					);
 
 					if ((e as { code: number }).code === 8000013) {

package/src/pubsub/pubsub-commands.tsx

@@ -3,6 +3,7 @@ import { readConfig } from "../config";
 import { confirm } from "../dialogs";
 import { CommandLineArgsError } from "../index";
 import { logger } from "../logger";
+import * as metrics from "../metrics";
 import { parseHumanDuration } from "../parse";
 import { requireAuth } from "../user";
 import * as pubsub from ".";
@@ -50,6 +51,9 @@ export function pubSubCommands(
 							logger.log(`Creating Pub/SubNamespace ${args.name}...`);
 							await pubsub.createPubSubNamespace(accountId, namespace);
 							logger.log(`Success! Created Pub/Sub Namespace ${args.name}`);
+							metrics.sendMetricsEvent("create pubsub namespace", {
+								sendMetrics: config.send_metrics,
+							});
 						}
 					)
 					.command(
@@ -63,6 +67,9 @@ export function pubSubCommands(
 							const accountId = await requireAuth(config);
 
 							logger.log(await pubsub.listPubSubNamespaces(accountId));
+							metrics.sendMetricsEvent("list pubsub namespaces", {
+								sendMetrics: config.send_metrics,
+							});
 						}
 					)
 					.command(
@@ -89,6 +96,9 @@ export function pubSubCommands(
 								logger.log(`Deleting namespace ${args.name}...`);
 								await pubsub.deletePubSubNamespace(accountId, args.name);
 								logger.log(`Deleted namespace ${args.name}.`);
+								metrics.sendMetricsEvent("delete pubsub namespace", {
+									sendMetrics: config.send_metrics,
+								});
 							}
 						}
 					)
@@ -111,6 +121,9 @@ export function pubSubCommands(
 							logger.log(
 								await pubsub.describePubSubNamespace(accountId, args.name)
 							);
+							metrics.sendMetricsEvent("view pubsub namespace", {
+								sendMetrics: config.send_metrics,
+							});
 						}
 					)
 					.epilogue(pubsub.pubSubBetaWarning);
@@ -178,6 +191,9 @@ export function pubSubCommands(
 					logger.log(
 						await pubsub.createPubSubBroker(accountId, args.namespace, broker)
 					);
+					metrics.sendMetricsEvent("create pubsub broker", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -247,6 +263,9 @@ export function pubSubCommands(
 						)
 					);
 					logger.log(`Successfully updated Pub/Sub Broker ${args.name}`);
+					metrics.sendMetricsEvent("update pubsub broker", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -268,6 +287,9 @@ export function pubSubCommands(
 					const accountId = await requireAuth(config);
 
 					logger.log(await pubsub.listPubSubBrokers(accountId, args.namespace));
+					metrics.sendMetricsEvent("list pubsub brokers", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -306,6 +328,9 @@ export function pubSubCommands(
 								args.name
 							);
 							logger.log(`Deleted Pub/Sub Broker ${args.name}.`);
+							metrics.sendMetricsEvent("delete pubsub broker", {
+								sendMetrics: config.send_metrics,
+							});
 						}
 					}
 				)
@@ -338,6 +363,9 @@ export function pubSubCommands(
 								args.name
 							)
 						);
+						metrics.sendMetricsEvent("view pubsub broker", {
+							sendMetrics: config.send_metrics,
+						});
 					}
 				);
 
@@ -413,6 +441,9 @@ export function pubSubCommands(
 							parsedExpiration
 						)
 					);
+					metrics.sendMetricsEvent("issue pubsub broker credentials", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -458,6 +489,9 @@ export function pubSubCommands(
 					);
 
 					logger.log(`Revoked ${args.jti.length} credential(s).`);
+					metrics.sendMetricsEvent("revoke pubsub broker credentials", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -502,6 +536,9 @@ export function pubSubCommands(
 					);
 
 					logger.log(`Unrevoked ${numTokens} credential(s)`);
+					metrics.sendMetricsEvent("unrevoke pubsub broker credentials", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -535,6 +572,9 @@ export function pubSubCommands(
 							args.name
 						)
 					);
+					metrics.sendMetricsEvent("list pubsub broker revoked credentials", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -567,6 +607,9 @@ export function pubSubCommands(
 							args.name
 						)
 					);
+					metrics.sendMetricsEvent("list pubsub broker public-keys", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 

package/src/worker-namespace.ts

@@ -1,6 +1,7 @@
 import { fetchResult } from "./cfetch";
 import { readConfig } from "./config";
 import { logger } from "./logger";
+import * as metrics from "./metrics";
 import { requireAuth } from "./user";
 import { printWranglerBanner } from ".";
 import type { ConfigPath } from ".";
@@ -113,6 +114,9 @@ export function workerNamespaceCommands(
 			const config = readConfig(args.config as ConfigPath, args);
 			const accountId = await requireAuth(config);
 			await listWorkerNamespaces(accountId);
+			metrics.sendMetricsEvent("list worker namespaces", {
+				sendMetrics: config.send_metrics,
+			});
 		})
 		.command(
 			"get <name>",
@@ -128,6 +132,9 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await getWorkerNamespaceInfo(accountId, args.name);
+				metrics.sendMetricsEvent("view worker namespace", {
+					sendMetrics: config.send_metrics,
+				});
 			}
 		)
 		.command(
@@ -145,6 +152,9 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await createWorkerNamespace(accountId, args.name);
+				metrics.sendMetricsEvent("create worker namespace", {
+					sendMetrics: config.send_metrics,
+				});
 			}
 		)
 		.command(
@@ -162,6 +172,9 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await deleteWorkerNamespace(accountId, args.name);
+				metrics.sendMetricsEvent("delete worker namespace", {
+					sendMetrics: config.send_metrics,
+				});
 			}
 		)
 		.command(
@@ -185,6 +198,9 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await renameWorkerNamespace(accountId, args.oldName, args.newName);
+				metrics.sendMetricsEvent("rename worker namespace", {
+					sendMetrics: config.send_metrics,
+				});
 			}
 		);
 }