miniflare 0.0.0-ecef68635 → 0.0.0-eec2a7074

package/dist/src/workers/assets/router.worker.js

@@ -8619,6 +8619,17 @@ var require_index_cjs = __commonJS({
   }
 });
 
+// ../workers-shared/utils/performance.ts
+var PerformanceTimer = class {
+  performanceTimer;
+  constructor(performanceTimer) {
+    this.performanceTimer = performanceTimer;
+  }
+  now() {
+    return this.performanceTimer ? this.performanceTimer.timeOrigin + this.performanceTimer.now() : Date.now();
+  }
+};
+
 // ../workers-shared/utils/sentry.ts
 var import_toucan_js = __toESM(require_index_cjs());
 function setupSentry(request, context, dsn, clientId, clientSecret) {
@@ -8654,20 +8665,74 @@ function setupSentry(request, context, dsn, clientId, clientSecret) {
   return sentry.setUser({ userAgent, colo }), sentry;
 }
 
+// ../workers-shared/router-worker/src/analytics.ts
+var Analytics = class {
+  data = {};
+  setData(newData) {
+    this.data = { ...this.data, ...newData };
+  }
+  getData(key) {
+    return this.data[key];
+  }
+  write(env, readyAnalytics, hostname) {
+    readyAnalytics && readyAnalytics.logEvent({
+      version: 1,
+      accountId: 0,
+      // TODO: need to plumb through
+      indexId: hostname,
+      doubles: [
+        this.data.requestTime ?? -1,
+        // double1
+        this.data.coloId ?? -1,
+        // double2
+        this.data.metalId ?? -1,
+        // double3
+        this.data.coloTier ?? -1
+        // double4
+      ],
+      blobs: [
+        this.data.hostname?.substring(0, 256),
+        // blob1 - trim to 256 bytes
+        this.data.dispatchtype,
+        // blob2
+        this.data.error?.substring(0, 256),
+        // blob3 - trim to 256 bytes
+        this.data.version,
+        // blob4
+        this.data.coloRegion
+        // blob5
+      ]
+    });
+  }
+};
+
 // ../workers-shared/router-worker/src/index.ts
 var src_default = {
   async fetch(request, env, ctx) {
-    let sentry, maybeSecondRequest = request.clone();
+    let sentry, analytics = new Analytics(), performance = new PerformanceTimer(env.UNSAFE_PERFORMANCE), startTimeMs = performance.now();
     try {
-      return sentry = setupSentry(
+      sentry = setupSentry(
         request,
         ctx,
         env.SENTRY_DSN,
         env.SENTRY_ACCESS_CLIENT_ID,
         env.SENTRY_ACCESS_CLIENT_SECRET
-      ), env.CONFIG.has_user_worker ? await env.ASSET_WORKER.unstable_canFetch(request) ? await env.ASSET_WORKER.fetch(maybeSecondRequest) : env.USER_WORKER.fetch(maybeSecondRequest) : await env.ASSET_WORKER.fetch(request);
+      );
+      let url = new URL(request.url);
+      sentry && (sentry.setUser({ username: url.hostname }), sentry.setTag("colo", env.COLO_METADATA.coloId), sentry.setTag("metal", env.COLO_METADATA.metalId)), env.COLO_METADATA && env.VERSION_METADATA && analytics.setData({
+        coloId: env.COLO_METADATA.coloId,
+        metalId: env.COLO_METADATA.metalId,
+        coloTier: env.COLO_METADATA.coloTier,
+        coloRegion: env.COLO_METADATA.coloRegion,
+        hostname: url.hostname,
+        version: env.VERSION_METADATA.id
+      });
+      let maybeSecondRequest = request.clone();
+      return env.CONFIG.has_user_worker ? await env.ASSET_WORKER.unstable_canFetch(request) ? (analytics.setData({ dispatchtype: "asset" /* ASSETS */ }), await env.ASSET_WORKER.fetch(maybeSecondRequest)) : (analytics.setData({ dispatchtype: "worker" /* WORKER */ }), env.USER_WORKER.fetch(maybeSecondRequest)) : (analytics.setData({ dispatchtype: "asset" /* ASSETS */ }), await env.ASSET_WORKER.fetch(request));
     } catch (err) {
-      throw sentry && sentry.captureException(err), err;
+      throw err instanceof Error && analytics.setData({ error: err.message }), sentry && sentry.captureException(err), err;
+    } finally {
+      analytics.setData({ requestTime: performance.now() - startTimeMs }), analytics.write(env.ENVIRONMENT, env.ANALYTICS);
     }
   }
 };