Hooks now all use the new types, and adding some spans

Author: ericallam

apps/webapp/app/components/runs/v3/RunIcon.tsx

@@ -78,6 +78,28 @@ export function RunIcon({ name, className, spanName }: TaskIconProps) {
       return <InformationCircleIcon className={cn(className, "text-rose-500")} />;
     case "fatal":
       return <HandRaisedIcon className={cn(className, "text-rose-800")} />;
+    case "task-middleware":
+      return <InformationCircleIcon className={cn(className, "text-text-dimmed")} />;
+    case "task-fn-run":
+      return <InformationCircleIcon className={cn(className, "text-text-dimmed")} />;
+    case "task-hook-init":
+      return <InformationCircleIcon className={cn(className, "text-text-dimmed")} />;
+    case "task-hook-onStart":
+      return <InformationCircleIcon className={cn(className, "text-text-dimmed")} />;
+    case "task-hook-onSuccess":
+      return <InformationCircleIcon className={cn(className, "text-text-dimmed")} />;
+    case "task-hook-onFailure":
+      return <InformationCircleIcon className={cn(className, "text-text-dimmed")} />;
+    case "task-hook-onComplete":
+      return <InformationCircleIcon className={cn(className, "text-text-dimmed")} />;
+    case "task-hook-onWait":
+      return <InformationCircleIcon className={cn(className, "text-text-dimmed")} />;
+    case "task-hook-onResume":
+      return <InformationCircleIcon className={cn(className, "text-text-dimmed")} />;
+    case "task-hook-catchError":
+      return <InformationCircleIcon className={cn(className, "text-text-dimmed")} />;
+    case "task-hook-cleanup":
+      return <InformationCircleIcon className={cn(className, "text-text-dimmed")} />;
   }
 
   return <InformationCircleIcon className={cn(className, "text-text-dimmed")} />;

packages/cli-v3/src/entryPoints/dev-run-worker.ts

@@ -1,26 +1,30 @@
 import type { Tracer } from "@opentelemetry/api";
 import type { Logger } from "@opentelemetry/api-logs";
 import {
+  AnyOnCatchErrorHookFunction,
+  AnyOnFailureHookFunction,
+  AnyOnInitHookFunction,
+  AnyOnStartHookFunction,
+  AnyOnSuccessHookFunction,
   apiClientManager,
   clock,
   ExecutorToWorkerMessageCatalog,
   type HandleErrorFunction,
+  lifecycleHooks,
+  localsAPI,
   logger,
   LogLevel,
+  resourceCatalog,
   runMetadata,
   runtime,
-  resourceCatalog,
+  runTimelineMetrics,
   TaskRunErrorCodes,
   TaskRunExecution,
   timeout,
   TriggerConfig,
   waitUntil,
   WorkerManifest,
   WorkerToExecutorMessageCatalog,
-  runTimelineMetrics,
-  lifecycleHooks,
-  lifecycleHooksAdapters,
-  localsAPI,
 } from "@trigger.dev/core/v3";
 import { TriggerTracer } from "@trigger.dev/core/v3/tracer";
 import {
@@ -32,17 +36,17 @@ import {
   logLevels,
   ManagedRuntimeManager,
   OtelTaskLogger,
+  StandardLifecycleHooksManager,
+  StandardLocalsManager,
   StandardMetadataManager,
   StandardResourceCatalog,
+  StandardRunTimelineMetricsManager,
   StandardWaitUntilManager,
   TaskExecutor,
   TracingDiagnosticLogLevel,
   TracingSDK,
   usage,
   UsageTimeoutManager,
-  StandardRunTimelineMetricsManager,
-  StandardLifecycleHooksManager,
-  StandardLocalsManager,
 } from "@trigger.dev/core/v3/workers";
 import { ZodIpcConnection } from "@trigger.dev/core/v3/zodIpc";
 import { readFile } from "node:fs/promises";
@@ -184,35 +188,35 @@ async function bootstrap() {
   if (config.init) {
     lifecycleHooks.registerGlobalInitHook({
       id: "config",
-      fn: lifecycleHooksAdapters.createInitHookAdapter(config.init),
+      fn: config.init as AnyOnInitHookFunction,
     });
   }
 
   if (config.onStart) {
     lifecycleHooks.registerGlobalStartHook({
       id: "config",
-      fn: lifecycleHooksAdapters.createStartHookAdapter(config.onStart),
+      fn: config.onStart as AnyOnStartHookFunction,
     });
   }
 
   if (config.onSuccess) {
     lifecycleHooks.registerGlobalSuccessHook({
       id: "config",
-      fn: lifecycleHooksAdapters.createSuccessHookAdapter(config.onSuccess),
+      fn: config.onSuccess as AnyOnSuccessHookFunction,
     });
   }
 
   if (config.onFailure) {
     lifecycleHooks.registerGlobalFailureHook({
       id: "config",
-      fn: lifecycleHooksAdapters.createFailureHookAdapter(config.onFailure),
+      fn: config.onFailure as AnyOnFailureHookFunction,
     });
   }
 
   if (handleError) {
     lifecycleHooks.registerGlobalCatchErrorHook({
       id: "config",
-      fn: lifecycleHooksAdapters.createHandleErrorHookAdapter(handleError),
+      fn: handleError as AnyOnCatchErrorHookFunction,
     });
   }
 

packages/cli-v3/src/entryPoints/managed-run-worker.ts

@@ -1,26 +1,30 @@
 import type { Tracer } from "@opentelemetry/api";
 import type { Logger } from "@opentelemetry/api-logs";
 import {
+  AnyOnCatchErrorHookFunction,
+  AnyOnFailureHookFunction,
+  AnyOnInitHookFunction,
+  AnyOnStartHookFunction,
+  AnyOnSuccessHookFunction,
+  apiClientManager,
   clock,
+  ExecutorToWorkerMessageCatalog,
   type HandleErrorFunction,
+  lifecycleHooks,
+  localsAPI,
   logger,
   LogLevel,
-  runtime,
   resourceCatalog,
+  runMetadata,
+  runtime,
+  runTimelineMetrics,
   TaskRunErrorCodes,
   TaskRunExecution,
-  WorkerToExecutorMessageCatalog,
-  TriggerConfig,
-  WorkerManifest,
-  ExecutorToWorkerMessageCatalog,
   timeout,
-  runMetadata,
+  TriggerConfig,
   waitUntil,
-  apiClientManager,
-  runTimelineMetrics,
-  lifecycleHooks,
-  lifecycleHooksAdapters,
-  localsAPI,
+  WorkerManifest,
+  WorkerToExecutorMessageCatalog,
 } from "@trigger.dev/core/v3";
 import { TriggerTracer } from "@trigger.dev/core/v3/tracer";
 import {
@@ -30,20 +34,20 @@ import {
   getEnvVar,
   getNumberEnvVar,
   logLevels,
+  ManagedRuntimeManager,
   OtelTaskLogger,
   ProdUsageManager,
+  StandardLifecycleHooksManager,
+  StandardLocalsManager,
+  StandardMetadataManager,
   StandardResourceCatalog,
+  StandardRunTimelineMetricsManager,
+  StandardWaitUntilManager,
   TaskExecutor,
   TracingDiagnosticLogLevel,
   TracingSDK,
   usage,
   UsageTimeoutManager,
-  StandardMetadataManager,
-  StandardWaitUntilManager,
-  ManagedRuntimeManager,
-  StandardRunTimelineMetricsManager,
-  StandardLifecycleHooksManager,
-  StandardLocalsManager,
 } from "@trigger.dev/core/v3/workers";
 import { ZodIpcConnection } from "@trigger.dev/core/v3/zodIpc";
 import { readFile } from "node:fs/promises";
@@ -194,35 +198,35 @@ async function bootstrap() {
   if (config.init) {
     lifecycleHooks.registerGlobalInitHook({
       id: "config",
-      fn: lifecycleHooksAdapters.createInitHookAdapter(config.init),
+      fn: config.init as AnyOnInitHookFunction,
     });
   }
 
   if (config.onStart) {
     lifecycleHooks.registerGlobalStartHook({
       id: "config",
-      fn: lifecycleHooksAdapters.createStartHookAdapter(config.onStart),
+      fn: config.onStart as AnyOnStartHookFunction,
     });
   }
 
   if (config.onSuccess) {
     lifecycleHooks.registerGlobalSuccessHook({
       id: "config",
-      fn: lifecycleHooksAdapters.createSuccessHookAdapter(config.onSuccess),
+      fn: config.onSuccess as AnyOnSuccessHookFunction,
     });
   }
 
   if (config.onFailure) {
     lifecycleHooks.registerGlobalFailureHook({
       id: "config",
-      fn: lifecycleHooksAdapters.createFailureHookAdapter(config.onFailure),
+      fn: config.onFailure as AnyOnFailureHookFunction,
     });
   }
 
   if (handleError) {
     lifecycleHooks.registerGlobalCatchErrorHook({
       id: "config",
-      fn: lifecycleHooksAdapters.createHandleErrorHookAdapter(handleError),
+      fn: handleError as AnyOnCatchErrorHookFunction,
     });
   }
 

packages/core/src/v3/config.ts

@@ -1,15 +1,16 @@
 import type { Instrumentation } from "@opentelemetry/instrumentation";
 import type { SpanExporter } from "@opentelemetry/sdk-trace-base";
 import type { BuildExtension } from "./build/extensions.js";
-import type { MachinePresetName } from "./schemas/common.js";
-import type { LogLevel } from "./logger/taskLogger.js";
 import type {
-  FailureFnParams,
-  InitFnParams,
-  StartFnParams,
-  SuccessFnParams,
-} from "./types/index.js";
-import type { BuildRuntime, RetryOptions } from "./index.js";
+  AnyOnFailureHookFunction,
+  AnyOnInitHookFunction,
+  AnyOnStartHookFunction,
+  AnyOnSuccessHookFunction,
+  BuildRuntime,
+  RetryOptions,
+} from "./index.js";
+import type { LogLevel } from "./logger/taskLogger.js";
+import type { MachinePresetName } from "./schemas/common.js";
 
 export type CompatibilityFlag = "run_engine_v2";
 
@@ -215,23 +216,31 @@ export type TriggerConfig = {
 
   /**
    * Run before a task is executed, for all tasks. This is useful for setting up any global state that is needed for all tasks.
+   *
+   * @deprecated, please use tasks.init instead
    */
-  init?: (payload: unknown, params: InitFnParams) => any | Promise<any>;
+  init?: AnyOnInitHookFunction;
 
   /**
    * onSuccess is called after the run function has successfully completed.
+   *
+   * @deprecated, please use tasks.onSuccess instead
    */
-  onSuccess?: (payload: unknown, output: unknown, params: SuccessFnParams<any>) => Promise<void>;
+  onSuccess?: AnyOnSuccessHookFunction;
 
   /**
    * onFailure is called after a task run has failed (meaning the run function threw an error and won't be retried anymore)
+   *
+   * @deprecated, please use tasks.onFailure instead
    */
-  onFailure?: (payload: unknown, error: unknown, params: FailureFnParams<any>) => Promise<void>;
+  onFailure?: AnyOnFailureHookFunction;
 
   /**
    * onStart is called the first time a task is executed in a run (not before every retry)
+   *
+   * @deprecated, please use tasks.onStart instead
    */
-  onStart?: (payload: unknown, params: StartFnParams) => Promise<void>;
+  onStart?: AnyOnStartHookFunction;
 
   /**
    * @deprecated Use a custom build extension to add post install commands

packages/core/src/v3/lifecycle-hooks-api.ts

@@ -32,5 +32,3 @@ export type {
   AnyOnCleanupHookFunction,
   TaskCleanupHookParams,
 } from "./lifecycleHooks/types.js";
-
-export * as lifecycleHooksAdapters from "./lifecycleHooks/adapters.js";