trigger.dev 3.0.0-beta.37 → 3.0.0-beta.38

package/dist/workers/dev/worker-facade.js

@@ -9,7 +9,9 @@ import {
   getEnvVar,
   logLevels,
   OtelTaskLogger,
-  ConsoleInterceptor
+  ConsoleInterceptor,
+  usage,
+  DevUsageManager
 } from "@trigger.dev/core/v3/workers";
 import {
   TaskRunErrorCodes,
@@ -27,6 +29,7 @@ __WORKER_SETUP__;
 __IMPORTED_PROJECT_CONFIG__;
 var durableClock = new DurableClock();
 clock.setGlobalClock(durableClock);
+usage.setGlobalUsageManager(new DevUsageManager());
 var tracer = new TriggerTracer({ tracer: otelTracer, logger: otelLogger });
 var consoleInterceptor = new ConsoleInterceptor(
   otelLogger,
@@ -76,6 +79,9 @@ var handler = new ZodMessageHandler({
             error: {
               type: "INTERNAL_ERROR",
               code: TaskRunErrorCodes.TASK_ALREADY_RUNNING
+            },
+            usage: {
+              durationMs: 0
             }
           }
         });
@@ -93,6 +99,9 @@ var handler = new ZodMessageHandler({
             error: {
               type: "INTERNAL_ERROR",
               code: TaskRunErrorCodes.COULD_NOT_FIND_EXECUTOR
+            },
+            usage: {
+              durationMs: 0
             }
           }
         });
@@ -109,10 +118,17 @@ var handler = new ZodMessageHandler({
       try {
         _execution = execution;
         _isRunning = true;
-        const result = await executor.execute(execution, metadata, traceContext);
+        const measurement = usage.start();
+        const { result } = await executor.execute(execution, metadata, traceContext, measurement);
+        const usageSample = usage.stop(measurement);
         return sender.send("TASK_RUN_COMPLETED", {
           execution,
-          result
+          result: {
+            ...result,
+            usage: {
+              durationMs: usageSample.cpuTime
+            }
+          }
         });
       } finally {
         _execution = void 0;

package/dist/workers/dev/worker-setup.js

@@ -8,7 +8,7 @@ import { ZodMessageSender } from "@trigger.dev/core/v3/zodMessageHandler";
 import "source-map-support/register.js";
 
 // package.json
-var version = "3.0.0-beta.37";
+var version = "3.0.0-beta.38";
 
 // src/workers/dev/worker-setup.ts
 __SETUP_IMPORTED_PROJECT_CONFIG__;

package/dist/workers/prod/entry-point.js

@@ -686,7 +686,10 @@ var TaskRunProcess = class {
     const killParentProcess = kill && !killChildProcess;
     console.log("Cleaning up task run process", {
       killChildProcess,
-      killParentProcess
+      killParentProcess,
+      ipc: this._ipc,
+      childPid: this._childPid,
+      realChildPid: this._child?.pid
     });
     await this._ipc?.sendWithAck(
       "CLEANUP",

package/dist/workers/prod/worker-facade.js

@@ -6,12 +6,15 @@ import {
   taskCatalog
 } from "@trigger.dev/core/v3";
 import {
-  TaskExecutor,
+  ConsoleInterceptor,
+  DevUsageManager,
   DurableClock,
+  OtelTaskLogger,
+  ProdUsageManager,
+  TaskExecutor,
   getEnvVar,
   logLevels,
-  OtelTaskLogger,
-  ConsoleInterceptor
+  usage
 } from "@trigger.dev/core/v3/workers";
 import { ZodIpcConnection } from "@trigger.dev/core/v3/zodIpc";
 import { ZodSchemaParsedError } from "@trigger.dev/core/v3/zodMessageHandler";
@@ -25,6 +28,15 @@ import {
 import { ProdRuntimeManager } from "@trigger.dev/core/v3/prod";
 __WORKER_SETUP__;
 __IMPORTED_PROJECT_CONFIG__;
+var heartbeatIntervalMs = getEnvVar("USAGE_HEARTBEAT_INTERVAL_MS");
+var usageEventUrl = getEnvVar("USAGE_EVENT_URL");
+var triggerJWT = getEnvVar("TRIGGER_JWT");
+var prodUsageManager = new ProdUsageManager(new DevUsageManager(), {
+  heartbeatIntervalMs: heartbeatIntervalMs ? parseInt(heartbeatIntervalMs, 10) : void 0,
+  url: usageEventUrl,
+  jwt: triggerJWT
+});
+usage.setGlobalUsageManager(prodUsageManager);
 var durableClock = new DurableClock();
 clock.setGlobalClock(durableClock);
 var tracer = new TriggerTracer({ tracer: otelTracer, logger: otelLogger });
@@ -106,10 +118,17 @@ var zodIpc = new ZodIpcConnection({
       try {
         _execution = execution;
         _isRunning = true;
-        const result = await executor.execute(execution, metadata, traceContext);
-        return sender.send("TASK_RUN_COMPLETED", {
+        const measurement = usage.start();
+        const { result } = await executor.execute(execution, metadata, traceContext, measurement);
+        const usageSample = usage.stop(measurement);
+        return await sender.send("TASK_RUN_COMPLETED", {
           execution,
-          result
+          result: {
+            ...result,
+            usage: {
+              durationMs: usageSample.cpuTime
+            }
+          }
         });
       } finally {
         _execution = void 0;
@@ -124,11 +143,11 @@ var zodIpc = new ZodIpcConnection({
     },
     CLEANUP: async ({ flush, kill }, sender) => {
       if (kill) {
-        await tracingSDK.flush();
+        await Promise.all([prodUsageManager.flush(), tracingSDK.flush()]);
         await sender.send("READY_TO_DISPOSE", void 0);
       } else {
         if (flush) {
-          await tracingSDK.flush();
+          await Promise.all([prodUsageManager.flush(), tracingSDK.flush()]);
         }
       }
     }
@@ -140,10 +159,23 @@ var prodRuntimeManager = new ProdRuntimeManager(zodIpc, {
   waitThresholdInMs: parseInt(process.env.TRIGGER_RUNTIME_WAIT_THRESHOLD_IN_MS ?? "30000", 10)
 });
 runtime.setGlobalRuntimeManager(prodRuntimeManager);
-var TASK_METADATA = taskCatalog.getAllTaskMetadata();
-zodIpc.send("TASKS_READY", { tasks: TASK_METADATA }).catch((err) => {
+var taskMetadata = taskCatalog.getAllTaskMetadata();
+if (typeof importedConfig?.machine === "string") {
+  taskMetadata = taskMetadata.map((task) => {
+    if (typeof task.machine?.preset !== "string") {
+      return {
+        ...task,
+        machine: {
+          preset: importedConfig.machine
+        }
+      };
+    }
+    return task;
+  });
+}
+zodIpc.send("TASKS_READY", { tasks: taskMetadata }).catch((err) => {
   if (err instanceof ZodSchemaParsedError) {
-    zodIpc.send("TASKS_FAILED_TO_PARSE", { zodIssues: err.error.issues, tasks: TASK_METADATA });
+    zodIpc.send("TASKS_FAILED_TO_PARSE", { zodIssues: err.error.issues, tasks: taskMetadata });
   } else {
     console.error("Failed to send TASKS_READY message", err);
   }

package/dist/workers/prod/worker-setup.js

@@ -1,5 +1,5 @@
 // package.json
-var version = "3.0.0-beta.37";
+var version = "3.0.0-beta.38";
 
 // src/workers/prod/worker-setup.ts
 import { taskCatalog } from "@trigger.dev/core/v3";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trigger.dev",
-  "version": "3.0.0-beta.37",
+  "version": "3.0.0-beta.38",
   "description": "A Command-Line Interface for Trigger.dev (v3) projects",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -51,9 +51,9 @@
     "tsup": "^8.0.1",
     "type-fest": "^3.6.0",
     "typescript": "^5.3.3",
-    "vitest": "^0.34.4",
+    "vitest": "^1.6.0",
     "xdg-app-paths": "^8.3.0",
-    "@trigger.dev/core-apps": "3.0.0-beta.37",
+    "@trigger.dev/core-apps": "3.0.0-beta.38",
     "@trigger.dev/tsconfig": "0.0.0"
   },
   "dependencies": {
@@ -72,7 +72,7 @@
     "@opentelemetry/sdk-trace-base": "^1.22.0",
     "@opentelemetry/sdk-trace-node": "^1.22.0",
     "@opentelemetry/semantic-conventions": "^1.22.0",
-    "@trigger.dev/core": "3.0.0-beta.37",
+    "@trigger.dev/core": "3.0.0-beta.38",
     "@types/degit": "^2.8.3",
     "chalk": "^5.2.0",
     "chokidar": "^3.5.3",
@@ -129,6 +129,7 @@
     "dev:test": "nodemon -w src/Containerfile.prod -x npm run build:prod-containerfile",
     "clean": "rimraf dist",
     "start": "node dist/index.js",
-    "test": "vitest"
+    "test": "vitest",
+    "test:e2e": "vitest --run -c e2e/vite.config.js"
   }
 }