From 491da059c185544dfcd7fb4981e9cc2b639b1b2e Mon Sep 17 00:00:00 2001 From: WillTaylorDev Date: Fri, 6 Dec 2024 13:23:04 -0500 Subject: [PATCH] Instrument analytics for invoke_user_worker_ahead_of_assets (#7465) --- .changeset/funny-impalas-run.md | 5 +++++ packages/workers-shared/router-worker/src/analytics.ts | 5 +++++ packages/workers-shared/router-worker/src/index.ts | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .changeset/funny-impalas-run.md diff --git a/.changeset/funny-impalas-run.md b/.changeset/funny-impalas-run.md new file mode 100644 index 0000000000000..395e35799ef08 --- /dev/null +++ b/.changeset/funny-impalas-run.md @@ -0,0 +1,5 @@ +--- +"@cloudflare/workers-shared": minor +--- + +Instrument analytics around assets.serve_directly diff --git a/packages/workers-shared/router-worker/src/analytics.ts b/packages/workers-shared/router-worker/src/analytics.ts index 7bdc267cbde0c..d878c878e6b0b 100644 --- a/packages/workers-shared/router-worker/src/analytics.ts +++ b/packages/workers-shared/router-worker/src/analytics.ts @@ -19,6 +19,8 @@ type Data = { metalId?: number; // double4 - Colo tier (e.g. tier 1, tier 2, tier 3) coloTier?: number; + // double5 - Run user worker ahead of assets + userWorkerAhead?: boolean; // -- Blobs -- // blob1 - Hostname of the request @@ -63,6 +65,9 @@ export class Analytics { this.data.coloId ?? -1, // double2 this.data.metalId ?? -1, // double3 this.data.coloTier ?? -1, // double4 + this.data.userWorkerAhead === undefined // double5 + ? -1 + : Number(this.data.userWorkerAhead), ], blobs: [ this.data.hostname?.substring(0, 256), // blob1 - trim to 256 bytes diff --git a/packages/workers-shared/router-worker/src/index.ts b/packages/workers-shared/router-worker/src/index.ts index 59d4d4d6a1a76..a174e4481b087 100644 --- a/packages/workers-shared/router-worker/src/index.ts +++ b/packages/workers-shared/router-worker/src/index.ts @@ -44,7 +44,7 @@ export default { sentry.setTag("metal", env.COLO_METADATA.metalId); } - if (env.COLO_METADATA && env.VERSION_METADATA) { + if (env.COLO_METADATA && env.VERSION_METADATA && env.CONFIG) { analytics.setData({ coloId: env.COLO_METADATA.coloId, metalId: env.COLO_METADATA.metalId, @@ -52,6 +52,7 @@ export default { coloRegion: env.COLO_METADATA.coloRegion, hostname: url.hostname, version: env.VERSION_METADATA.id, + userWorkerAhead: env.CONFIG.invoke_user_worker_ahead_of_assets, }); }