miniflare 0.0.0-ecef68635 → 0.0.0-eec2a7074

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

@@ -8622,6 +8622,17 @@ var require_index_cjs = __commonJS({
 // ../workers-shared/asset-worker/src/index.ts
 import { WorkerEntrypoint } from "cloudflare:workers";
 
+// ../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) {
@@ -8657,6 +8668,55 @@ function setupSentry(request, context, dsn, clientId, clientSecret) {
   return sentry.setUser({ userAgent, colo }), sentry;
 }
 
+// ../workers-shared/asset-worker/src/analytics.ts
+var Analytics = class {
+  data = {};
+  readyAnalytics;
+  constructor(readyAnalytics) {
+    this.readyAnalytics = readyAnalytics;
+  }
+  setData(newData) {
+    this.data = { ...this.data, ...newData };
+  }
+  getData(key) {
+    return this.data[key];
+  }
+  write(hostname) {
+    this.readyAnalytics && this.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.userAgent?.substring(0, 256),
+        // blob2 - trim to 256 bytes
+        this.data.htmlHandling,
+        // blob3
+        this.data.notFoundHandling,
+        // blob4
+        this.data.error?.substring(0, 256),
+        // blob5 - trim to 256 bytes
+        this.data.version,
+        // blob6
+        this.data.coloRegion
+        // blob7
+      ]
+    });
+  }
+};
+
 // ../workers-shared/asset-worker/src/assets-manifest.ts
 var AssetsManifest = class {
   data;
@@ -9204,23 +9264,45 @@ async function getAssetWithMetadataFromKV(assetsKVNamespace, assetKey, retries =
 // ../workers-shared/asset-worker/src/index.ts
 var src_default = class extends WorkerEntrypoint {
   async fetch(request) {
-    let sentry;
+    let sentry, analytics = new Analytics(this.env.ANALYTICS), performance = new PerformanceTimer(this.env.UNSAFE_PERFORMANCE), startTimeMs = performance.now();
     try {
-      return sentry = setupSentry(
+      sentry = setupSentry(
         request,
         this.ctx,
         this.env.SENTRY_DSN,
         this.env.SENTRY_ACCESS_CLIENT_ID,
         this.env.SENTRY_ACCESS_CLIENT_SECRET
-      ), handleRequest(
+      );
+      let config = applyConfigurationDefaults(this.env.CONFIG), userAgent = request.headers.get("user-agent") ?? "UA UNKNOWN";
+      if (sentry) {
+        let colo = this.env.COLO_METADATA.coloId;
+        sentry.setTag("colo", this.env.COLO_METADATA.coloId), sentry.setTag("metal", this.env.COLO_METADATA.metalId), sentry.setUser({ userAgent, colo });
+      }
+      if (this.env.COLO_METADATA && this.env.VERSION_METADATA) {
+        let url = new URL(request.url);
+        analytics.setData({
+          coloId: this.env.COLO_METADATA.coloId,
+          metalId: this.env.COLO_METADATA.metalId,
+          coloTier: this.env.COLO_METADATA.coloTier,
+          coloRegion: this.env.COLO_METADATA.coloRegion,
+          version: this.env.VERSION_METADATA.id,
+          hostname: url.hostname,
+          htmlHandling: config.html_handling,
+          notFoundHandling: config.not_found_handling,
+          userAgent
+        });
+      }
+      return handleRequest(
         request,
-        applyConfigurationDefaults(this.env.CONFIG),
+        config,
         this.unstable_exists.bind(this),
         this.unstable_getByETag.bind(this)
       );
     } catch (err) {
       let response = new InternalServerErrorResponse(err);
-      return sentry && sentry.captureException(err), response;
+      return sentry && sentry.captureException(err), err instanceof Error && analytics.setData({ error: err.message }), response;
+    } finally {
+      analytics.setData({ requestTime: performance.now() - startTimeMs }), analytics.write();
     }
   }
   async unstable_canFetch(request) {