Merge branch 'main' into self-hosting-docs-updates

Author: nicktrn

.changeset/heavy-jobs-push.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/build": patch
+---
+
+Puppeteer extension: set the PUPPETEER_EXECUTABLE_PATH env var

.changeset/real-bags-joke.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/core": patch
+---
+
+Add otel propagation headers "below" the API fetch span, to attribute the child runs with the proper parent span ID

.changeset/short-tomatoes-beam.md

@@ -69,7 +69,15 @@ export class OrgIntegrationRepository {
         return new WebClient(
           options?.forceBotToken
             ? secret.botAccessToken
-            : secret.userAccessToken ?? secret.botAccessToken
+            : secret.userAccessToken ?? secret.botAccessToken,
+          {
+            retryConfig: {
+              retries: 2,
+              randomize: true,
+              maxTimeout: 5000,
+              maxRetryTime: 10000,
+            },
+          }
         ) as AuthenticatedClientForIntegration<TService>;
       }
       default: {

.changeset/yellow-knives-attack.md

@@ -835,7 +835,8 @@ export class EventRepository {
     options: TraceEventOptions & { incomplete?: boolean },
     callback: (
       e: EventBuilder,
-      traceContext: Record<string, string | undefined>
+      traceContext: Record<string, string | undefined>,
+      traceparent?: { traceId: string; spanId: string }
     ) => Promise<TResult>
   ): Promise<TResult> {
     const propagatedContext = extractContextFromCarrier(options.context ?? {});
@@ -892,7 +893,7 @@ export class EventRepository {
       },
     };
 
-    const result = await callback(eventBuilder, traceContext);
+    const result = await callback(eventBuilder, traceContext, propagatedContext?.traceparent);
 
     const duration = process.hrtime.bigint() - start;
 

apps/webapp/app/models/orgIntegration.server.ts

@@ -73,6 +73,8 @@ type FoundAlert = Prisma.Result<
   >;
 };
 
+class SkipRetryError extends Error {}
+
 export class DeliverAlertService extends BaseService {
   public async call(alertId: string) {
     const alert: FoundAlert | null = await this._prisma.projectAlert.findFirst({
@@ -136,22 +138,34 @@ export class DeliverAlertService extends BaseService {
       alert.failedAttempt = finishedAttempt;
     }
 
-    switch (alert.channel.type) {
-      case "EMAIL": {
-        await this.#sendEmail(alert);
-        break;
-      }
-      case "SLACK": {
-        await this.#sendSlack(alert);
-        break;
-      }
-      case "WEBHOOK": {
-        await this.#sendWebhook(alert);
-        break;
+    try {
+      switch (alert.channel.type) {
+        case "EMAIL": {
+          await this.#sendEmail(alert);
+          break;
+        }
+        case "SLACK": {
+          await this.#sendSlack(alert);
+          break;
+        }
+        case "WEBHOOK": {
+          await this.#sendWebhook(alert);
+          break;
+        }
+        default: {
+          assertNever(alert.channel.type);
+        }
       }
-      default: {
-        assertNever(alert.channel.type);
+    } catch (error) {
+      if (error instanceof SkipRetryError) {
+        logger.error("[DeliverAlert] Skipping retry", {
+          reason: error.message,
+        });
+
+        return;
       }
+
+      throw error;
     }
 
     await this._prisma.projectAlert.update({
@@ -617,7 +631,7 @@ export class DeliverAlertService extends BaseService {
                 type: "section",
                 text: {
                   type: "mrkdwn",
-                  text: `\`\`\`${error.stackTrace ?? error.message}\`\`\``,
+                  text: this.#wrapInCodeBlock(error.stackTrace ?? error.message),
                 },
               },
               {
@@ -729,7 +743,7 @@ export class DeliverAlertService extends BaseService {
                 type: "section",
                 text: {
                   type: "mrkdwn",
-                  text: `\`\`\`${error.stackTrace ?? error.message}\`\`\``,
+                  text: this.#wrapInCodeBlock(error.stackTrace ?? error.message),
                 },
               },
               {
@@ -829,7 +843,7 @@ export class DeliverAlertService extends BaseService {
                 type: "section",
                 text: {
                   type: "mrkdwn",
-                  text: `\`\`\`${preparedError.stack ?? preparedError.message}\`\`\``,
+                  text: this.#wrapInCodeBlock(preparedError.stack ?? preparedError.message),
                 },
               },
               {
@@ -1010,6 +1024,14 @@ export class DeliverAlertService extends BaseService {
           message,
         });
 
+        if (error.data.error === "invalid_blocks") {
+          logger.error("[DeliverAlert] Slack invalid blocks", {
+            error,
+          });
+
+          throw new SkipRetryError("Slack invalid blocks");
+        }
+
         throw new Error("Slack platform error");
       }
 
@@ -1047,6 +1069,25 @@ export class DeliverAlertService extends BaseService {
     };
   }
 
+  #wrapInCodeBlock(text: string, maxLength = 3000) {
+    return `\`\`\`${this.#truncateSlackText(text, maxLength - 10)}\`\`\``;
+  }
+
+  #truncateSlackText(text: string, length = 3000) {
+    if (text.length > length) {
+      logger.debug("[DeliverAlert] Truncating slack text", {
+        length,
+        originalLength: text.length,
+      });
+
+      const truncationSuffix = "\n\ntruncated - check dashboard for complete error message";
+
+      return text.slice(0, length - truncationSuffix.length) + truncationSuffix;
+    }
+
+    return text;
+  }
+
   static async enqueue(
     alertId: string,
     tx: PrismaClientOrTransaction,

apps/webapp/app/v3/eventRepository.server.ts

@@ -240,7 +240,7 @@ export class TriggerTaskService extends BaseService {
           incomplete: true,
           immediate: true,
         },
-        async (event, traceContext) => {
+        async (event, traceContext, traceparent) => {
           const run = await autoIncrementCounter.incrementInTransaction(
             `v3-run:${environment.id}:${taskId}`,
             async (num, tx) => {
@@ -307,6 +307,8 @@ export class TriggerTaskService extends BaseService {
                   traceContext: traceContext,
                   traceId: event.traceId,
                   spanId: event.spanId,
+                  parentSpanId:
+                    options.parentAsLinkType === "replay" ? undefined : traceparent?.spanId,
                   lockedToVersionId: lockedToBackgroundWorker?.id,
                   concurrencyKey: body.options?.concurrencyKey,
                   queue: queueName,

apps/webapp/app/v3/services/alerts/deliverAlert.server.ts

@@ -1,5 +1,12 @@
 # @trigger.dev/build
 
+## 3.0.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@3.0.7`
+
 ## 3.0.6
 
 ### Patch Changes

apps/webapp/app/v3/services/triggerTask.server.ts

@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/build",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "trigger.dev build extensions",
   "license": "MIT",
   "publishConfig": {
@@ -65,7 +65,7 @@
     "check-exports": "attw --pack ."
   },
   "dependencies": {
-    "@trigger.dev/core": "workspace:3.0.6",
+    "@trigger.dev/core": "workspace:3.0.7",
     "pkg-types": "^1.1.3",
     "tinyglobby": "^0.2.2",
     "tsconfck": "3.1.3"

packages/build/CHANGELOG.md

@@ -29,6 +29,12 @@ class PuppeteerExtension implements BuildExtension {
       image: {
         instructions,
       },
+      deploy: {
+        env: {
+          PUPPETEER_EXECUTABLE_PATH: "/usr/bin/google-chrome-stable",
+        },
+        override: true,
+      },
     });
   }
 }

packages/build/package.json

@@ -1,5 +1,15 @@
 # trigger.dev
 
+## 3.0.7
+
+### Patch Changes
+
+- Fix resolving external packages that are ESM only by falling back to mlly resolvePathSync. This will fix mupdf ([#1346](https://github.com/triggerdotdev/trigger.dev/pull/1346))
+- Add the "dev.vars" file to the list of auto-loaded dotenv files in the dev CLI command ([#1340](https://github.com/triggerdotdev/trigger.dev/pull/1340))
+- Updated dependencies:
+  - `@trigger.dev/build@3.0.7`
+  - `@trigger.dev/core@3.0.7`
+
 ## 3.0.6
 
 ### Patch Changes

packages/build/src/extensions/puppeteer.ts

@@ -1,6 +1,6 @@
 {
   "name": "trigger.dev",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "A Command-Line Interface for Trigger.dev (v3) projects",
   "type": "module",
   "license": "MIT",
@@ -87,8 +87,8 @@
     "@opentelemetry/sdk-trace-base": "1.25.1",
     "@opentelemetry/sdk-trace-node": "1.25.1",
     "@opentelemetry/semantic-conventions": "1.25.1",
-    "@trigger.dev/build": "workspace:3.0.6",
-    "@trigger.dev/core": "workspace:3.0.6",
+    "@trigger.dev/build": "workspace:3.0.7",
+    "@trigger.dev/core": "workspace:3.0.7",
     "c12": "^1.11.1",
     "chalk": "^5.2.0",
     "cli-table3": "^0.6.3",

packages/cli-v3/CHANGELOG.md

@@ -228,7 +228,7 @@ function validateConfig(config: TriggerConfig, warn = true) {
   if (config.additionalFiles && config.additionalFiles.length > 0) {
     warn &&
       prettyWarning(
-        `The "additionalFiles" option is deprecated and will be removed. Use the "additionalFiles" build extension instead. See https://trigger.dev/docs/guides/new-build-system-preview#additionalfiles for more information.`
+        `The "additionalFiles" option is deprecated and will be removed. Use the "additionalFiles" build extension instead. See https://trigger.dev/docs/config/config-file#additionalfiles for more information.`
       );
 
     config.build ??= {};
@@ -239,7 +239,7 @@ function validateConfig(config: TriggerConfig, warn = true) {
   if (config.additionalPackages && config.additionalPackages.length > 0) {
     warn &&
       prettyWarning(
-        `The "additionalPackages" option is deprecated and will be removed. Use the "additionalPackages" build extension instead. See https://trigger.dev/docs/guides/new-build-system-preview#additionalpackages for more information.`
+        `The "additionalPackages" option is deprecated and will be removed. Use the "additionalPackages" build extension instead. See https://trigger.dev/docs/config/config-file#additionalpackages for more information.`
       );
 
     config.build ??= {};
@@ -275,7 +275,7 @@ function validateConfig(config: TriggerConfig, warn = true) {
   if ("resolveEnvVars" in config && typeof config.resolveEnvVars === "function") {
     warn &&
       prettyWarning(
-        `The "resolveEnvVars" option is deprecated and will be removed. Use the "syncEnvVars" build extension instead. See https://trigger.dev/docs/guides/new-build-system-preview#resolveenvvars for more information.`
+        `The "resolveEnvVars" option is deprecated and will be removed. Use the "syncEnvVars" build extension instead. See https://trigger.dev/docs/config/config-file#syncenvvars for more information.`
       );
 
     const resolveEnvVarsFn = config.resolveEnvVars as ResolveEnvironmentVariablesFunction;

packages/cli-v3/package.json

@@ -1,5 +1,7 @@
 # internal-platform
 
+## 3.0.7
+
 ## 3.0.6
 
 ### Patch Changes

packages/cli-v3/src/config.ts

@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/core",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "Core code used across the Trigger.dev SDK and platform",
   "license": "MIT",
   "publishConfig": {

packages/core/CHANGELOG.md

@@ -4,7 +4,7 @@ import { RetryOptions } from "../schemas/index.js";
 import { calculateNextRetryDelay } from "../utils/retries.js";
 import { ApiConnectionError, ApiError, ApiSchemaValidationError } from "./errors.js";
 
-import { Attributes, Span } from "@opentelemetry/api";
+import { Attributes, Span, context, propagation } from "@opentelemetry/api";
 import { SemanticInternalAttributes } from "../semanticInternalAttributes.js";
 import { TriggerTracer } from "../tracer.js";
 import { accessoryAttributes } from "../utils/styleAttributes.js";
@@ -184,9 +184,11 @@ async function _doZodFetch<TResponseBodySchema extends z.ZodTypeAny>(
   requestInit?: PromiseOrValue<RequestInit>,
   options?: ZodFetchOptions
 ): Promise<ZodFetchResult<z.output<TResponseBodySchema>>> {
-  const $requestInit = await requestInit;
+  let $requestInit = await requestInit;
 
   return traceZodFetch({ url, requestInit: $requestInit, options }, async (span) => {
+    $requestInit = injectPropagationHeadersIfInWorker($requestInit);
+
     const result = await _doZodFetchWithRetries(schema, url, $requestInit, options);
 
     if (options?.onResponseBody && span) {
@@ -577,3 +579,23 @@ export function isEmptyObj(obj: Object | null | undefined): boolean {
 export function hasOwn(obj: Object, key: string): boolean {
   return Object.prototype.hasOwnProperty.call(obj, key);
 }
+
+// If the requestInit has a header x-trigger-worker = true, then we will do
+// propagation.inject(context.active(), headers);
+// and return the new requestInit.
+function injectPropagationHeadersIfInWorker(requestInit?: RequestInit): RequestInit | undefined {
+  const headers = new Headers(requestInit?.headers);
+
+  if (headers.get("x-trigger-worker") !== "true") {
+    return requestInit;
+  }
+
+  const headersObject = Object.fromEntries(headers.entries());
+
+  propagation.inject(context.active(), headersObject);
+
+  return {
+    ...requestInit,
+    headers: new Headers(headersObject),
+  };
+}

packages/core/package.json

@@ -1,4 +1,3 @@
-import { context, propagation } from "@opentelemetry/api";
 import { z } from "zod";
 import {
   AddTagsRequestBody,
@@ -509,7 +508,6 @@ export class ApiClient {
     // Only inject the context if we are inside a task
     if (taskContext.isInsideTask) {
       headers["x-trigger-worker"] = "true";
-      propagation.inject(context.active(), headers);
 
       if (spanParentAsLink) {
         headers["x-trigger-span-parent-as-link"] = "1";