miniflare 0.0.0-e1d2fd668 → 0.0.0-e2b3306e1

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

@@ -8632,7 +8632,7 @@ var PerformanceTimer = class {
 
 // ../workers-shared/utils/sentry.ts
 var import_toucan_js = __toESM(require_index_cjs());
-function setupSentry(request, context, dsn, clientId, clientSecret) {
+function setupSentry(request, context, dsn, clientId, clientSecret, coloMetadata, accountId, scriptId) {
   if (!(dsn && clientId && clientSecret))
     return;
   let sentry = new import_toucan_js.Toucan({
@@ -8659,27 +8659,58 @@ function setupSentry(request, context, dsn, clientId, clientSecret) {
         "CF-Access-Client-Secret": clientSecret
       }
     }
-  }), colo = request.cf?.colo ?? "UNKNOWN";
-  sentry.setTag("colo", colo);
-  let userAgent = request.headers.get("user-agent") ?? "UA UNKNOWN";
-  return sentry.setUser({ userAgent, colo }), sentry;
+  });
+  return coloMetadata && (sentry.setTag("colo", coloMetadata.coloId), sentry.setTag("metal", coloMetadata.metalId)), accountId && scriptId && (sentry.setTag("accountId", accountId), sentry.setTag("scriptId", scriptId)), sentry.setUser({ id: accountId?.toString() }), sentry;
+}
+
+// ../workers-shared/utils/tracing.ts
+function mockJaegerBindingSpan() {
+  return {
+    addLogs: () => {
+    },
+    setTags: () => {
+    },
+    end: () => {
+    },
+    isRecording: !0
+  };
+}
+function mockJaegerBinding() {
+  return {
+    enterSpan: (_, span, ...args) => span(mockJaegerBindingSpan(), ...args),
+    getSpanContext: () => ({
+      traceId: "test-trace",
+      spanId: "test-span",
+      parentSpanId: "test-parent-span",
+      traceFlags: 0
+    }),
+    runWithSpanContext: (_, callback, ...args) => callback(...args),
+    traceId: "test-trace",
+    spanId: "test-span",
+    parentSpanId: "test-parent-span",
+    cfTraceIdHeader: "test-trace:test-span:0"
+  };
 }
 
 // ../workers-shared/router-worker/src/analytics.ts
 var Analytics = class {
   data = {};
+  readyAnalytics;
+  hasWritten = !1;
+  constructor(readyAnalytics) {
+    this.readyAnalytics = readyAnalytics;
+  }
   setData(newData) {
     this.data = { ...this.data, ...newData };
   }
   getData(key) {
     return this.data[key];
   }
-  write(env, readyAnalytics, hostname) {
-    readyAnalytics && readyAnalytics.logEvent({
+  write() {
+    this.hasWritten || this.readyAnalytics && (this.hasWritten = !0, this.readyAnalytics.logEvent({
       version: 1,
-      accountId: 0,
-      // TODO: need to plumb through
-      indexId: hostname,
+      accountId: this.data.accountId,
+      indexId: this.data.scriptId?.toString(),
       doubles: [
         this.data.requestTime ?? -1,
         // double1
@@ -8687,8 +8718,9 @@ var Analytics = class {
         // double2
         this.data.metalId ?? -1,
         // double3
-        this.data.coloTier ?? -1
+        this.data.coloTier ?? -1,
         // double4
+        this.data.userWorkerAhead === void 0 ? -1 : Number(this.data.userWorkerAhead)
       ],
       blobs: [
         this.data.hostname?.substring(0, 256),
@@ -8702,37 +8734,65 @@ var Analytics = class {
         this.data.coloRegion
         // blob5
       ]
-    });
+    }));
   }
 };
 
 // ../workers-shared/router-worker/src/index.ts
 var src_default = {
   async fetch(request, env, ctx) {
-    let sentry, analytics = new Analytics(), performance = new PerformanceTimer(env.UNSAFE_PERFORMANCE), startTimeMs = performance.now();
+    let sentry, userWorkerInvocation = !1, analytics = new Analytics(env.ANALYTICS), performance = new PerformanceTimer(env.UNSAFE_PERFORMANCE), startTimeMs = performance.now();
     try {
-      sentry = setupSentry(
+      env.JAEGER || (env.JAEGER = mockJaegerBinding()), sentry = setupSentry(
         request,
         ctx,
         env.SENTRY_DSN,
         env.SENTRY_ACCESS_CLIENT_ID,
-        env.SENTRY_ACCESS_CLIENT_SECRET
+        env.SENTRY_ACCESS_CLIENT_SECRET,
+        env.COLO_METADATA,
+        env.CONFIG?.account_id,
+        env.CONFIG?.script_id
       );
       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({
+      env.COLO_METADATA && env.VERSION_METADATA && env.CONFIG && analytics.setData({
+        accountId: env.CONFIG.account_id,
+        scriptId: env.CONFIG.script_id,
         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
+        version: env.VERSION_METADATA.id,
+        userWorkerAhead: env.CONFIG.invoke_user_worker_ahead_of_assets
       });
       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));
+      if (env.CONFIG.invoke_user_worker_ahead_of_assets) {
+        if (!env.CONFIG.has_user_worker)
+          throw new Error(
+            "Fetch for user worker without having a user worker binding"
+          );
+        return analytics.setData({ dispatchtype: "worker" /* WORKER */ }), await env.JAEGER.enterSpan("dispatch_worker", async (span) => (span.setTags({
+          hasUserWorker: !0,
+          asset: "ignored",
+          dispatchType: "worker" /* WORKER */
+        }), userWorkerInvocation = !0, env.USER_WORKER.fetch(maybeSecondRequest)));
+      }
+      let assetsExist = await env.ASSET_WORKER.unstable_canFetch(request);
+      return env.CONFIG.has_user_worker && !assetsExist ? (analytics.setData({ dispatchtype: "worker" /* WORKER */ }), await env.JAEGER.enterSpan("dispatch_worker", async (span) => (span.setTags({
+        hasUserWorker: env.CONFIG.has_user_worker || !1,
+        asset: assetsExist,
+        dispatchType: "worker" /* WORKER */
+      }), userWorkerInvocation = !0, env.USER_WORKER.fetch(maybeSecondRequest)))) : (analytics.setData({ dispatchtype: "asset" /* ASSETS */ }), await env.JAEGER.enterSpan("dispatch_assets", async (span) => (span.setTags({
+        hasUserWorker: env.CONFIG.has_user_worker || !1,
+        asset: assetsExist,
+        dispatchType: "asset" /* ASSETS */
+      }), env.ASSET_WORKER.fetch(maybeSecondRequest))));
     } catch (err) {
+      if (userWorkerInvocation)
+        return;
       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);
+      analytics.setData({ requestTime: performance.now() - startTimeMs }), analytics.write();
     }
   }
 };