Merge remote-tracking branch 'origin/main' into feat/ecr-support

Author: nicktrn

.changeset/polite-badgers-suffer.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+experimental processKeepAlive

.changeset/wet-dragons-boil.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Serialize metadata to prevent invalid metadata from breaking run completions

apps/supervisor/src/util.ts

@@ -1,5 +1,15 @@
 import { isMacOS, isWindows } from "std-env";
 
+export function normalizeDockerHostUrl(url: string) {
+  const $url = new URL(url);
+
+  if ($url.hostname === "localhost") {
+    $url.hostname = getDockerHostDomain();
+  }
+
+  return $url.toString();
+}
+
 export function getDockerHostDomain() {
   return isMacOS || isWindows ? "host.docker.internal" : "localhost";
 }

apps/supervisor/src/workloadManager/docker.ts

@@ -5,7 +5,7 @@ import {
   type WorkloadManagerOptions,
 } from "./types.js";
 import { env } from "../env.js";
-import { getDockerHostDomain, getRunnerId } from "../util.js";
+import { getDockerHostDomain, getRunnerId, normalizeDockerHostUrl } from "../util.js";
 import Docker from "dockerode";
 import { tryCatch } from "@trigger.dev/core";
 
@@ -78,7 +78,7 @@ export class DockerWorkloadManager implements WorkloadManager {
     ];
 
     if (this.opts.warmStartUrl) {
-      envVars.push(`TRIGGER_WARM_START_URL=${this.opts.warmStartUrl}`);
+      envVars.push(`TRIGGER_WARM_START_URL=${normalizeDockerHostUrl(this.opts.warmStartUrl)}`);
     }
 
     if (this.opts.metadataUrl) {

apps/webapp/app/env.server.ts

@@ -2,6 +2,7 @@ import { z } from "zod";
 import { isValidDatabaseUrl } from "./utils/db";
 import { isValidRegex } from "./utils/regex";
 import { BoolEnv } from "./utils/boolEnv";
+import { OTEL_ATTRIBUTE_PER_LINK_COUNT_LIMIT, OTEL_LINK_COUNT_LIMIT } from "@trigger.dev/core/v3";
 
 const EnvironmentSchema = z.object({
   NODE_ENV: z.union([z.literal("development"), z.literal("production"), z.literal("test")]),
@@ -282,6 +283,15 @@ const EnvironmentSchema = z.object({
   PROD_OTEL_LOG_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
   PROD_OTEL_LOG_MAX_QUEUE_SIZE: z.string().default("512"),
 
+  TRIGGER_OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT: z.string().default("256"),
+  TRIGGER_OTEL_LOG_ATTRIBUTE_COUNT_LIMIT: z.string().default("256"),
+  TRIGGER_OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT: z.string().default("131072"),
+  TRIGGER_OTEL_LOG_ATTRIBUTE_VALUE_LENGTH_LIMIT: z.string().default("131072"),
+  TRIGGER_OTEL_SPAN_EVENT_COUNT_LIMIT: z.string().default("10"),
+  TRIGGER_OTEL_LINK_COUNT_LIMIT: z.string().default("2"),
+  TRIGGER_OTEL_ATTRIBUTE_PER_LINK_COUNT_LIMIT: z.string().default("10"),
+  TRIGGER_OTEL_ATTRIBUTE_PER_EVENT_COUNT_LIMIT: z.string().default("10"),
+
   CHECKPOINT_THRESHOLD_IN_MS: z.coerce.number().int().default(30000),
 
   // Internal OTEL environment variables

apps/webapp/app/utils/timelineSpanEvents.ts

@@ -142,9 +142,6 @@ function getFriendlyNameForEvent(event: string, properties?: Record<string, any>
       return "Attempt created";
     }
     case "import": {
-      if (properties && typeof properties.file === "string") {
-        return `Importing ${properties.file}`;
-      }
       return "Importing task file";
     }
     case "lazy_payload": {

apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts

@@ -810,6 +810,7 @@ export const RuntimeEnvironmentForEnvRepoPayload = {
     apiKey: true,
     organizationId: true,
     branchName: true,
+    builtInEnvironmentVariableOverrides: true,
   },
 } as const;
 
@@ -1025,5 +1026,93 @@ async function resolveBuiltInProdVariables(
 async function resolveCommonBuiltInVariables(
   runtimeEnvironment: RuntimeEnvironmentForEnvRepo
 ): Promise<Array<EnvironmentVariable>> {
-  return [];
+  return [
+    {
+      key: "TRIGGER_OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT",
+      value: resolveBuiltInEnvironmentVariableOverrides(
+        "TRIGGER_OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT",
+        runtimeEnvironment,
+        String(env.TRIGGER_OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT)
+      ),
+    },
+    {
+      key: "TRIGGER_OTEL_LOG_ATTRIBUTE_COUNT_LIMIT",
+      value: resolveBuiltInEnvironmentVariableOverrides(
+        "TRIGGER_OTEL_LOG_ATTRIBUTE_COUNT_LIMIT",
+        runtimeEnvironment,
+        String(env.TRIGGER_OTEL_LOG_ATTRIBUTE_COUNT_LIMIT)
+      ),
+    },
+    {
+      key: "TRIGGER_OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT",
+      value: resolveBuiltInEnvironmentVariableOverrides(
+        "TRIGGER_OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT",
+        runtimeEnvironment,
+        String(env.TRIGGER_OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT)
+      ),
+    },
+    {
+      key: "TRIGGER_OTEL_LOG_ATTRIBUTE_VALUE_LENGTH_LIMIT",
+      value: resolveBuiltInEnvironmentVariableOverrides(
+        "TRIGGER_OTEL_LOG_ATTRIBUTE_VALUE_LENGTH_LIMIT",
+        runtimeEnvironment,
+        String(env.TRIGGER_OTEL_LOG_ATTRIBUTE_VALUE_LENGTH_LIMIT)
+      ),
+    },
+    {
+      key: "TRIGGER_OTEL_SPAN_EVENT_COUNT_LIMIT",
+      value: resolveBuiltInEnvironmentVariableOverrides(
+        "TRIGGER_OTEL_SPAN_EVENT_COUNT_LIMIT",
+        runtimeEnvironment,
+        String(env.TRIGGER_OTEL_SPAN_EVENT_COUNT_LIMIT)
+      ),
+    },
+    {
+      key: "TRIGGER_OTEL_LINK_COUNT_LIMIT",
+      value: resolveBuiltInEnvironmentVariableOverrides(
+        "TRIGGER_OTEL_LINK_COUNT_LIMIT",
+        runtimeEnvironment,
+        String(env.TRIGGER_OTEL_LINK_COUNT_LIMIT)
+      ),
+    },
+    {
+      key: "TRIGGER_OTEL_ATTRIBUTE_PER_LINK_COUNT_LIMIT",
+      value: resolveBuiltInEnvironmentVariableOverrides(
+        "TRIGGER_OTEL_ATTRIBUTE_PER_LINK_COUNT_LIMIT",
+        runtimeEnvironment,
+        String(env.TRIGGER_OTEL_ATTRIBUTE_PER_LINK_COUNT_LIMIT)
+      ),
+    },
+    {
+      key: "TRIGGER_OTEL_ATTRIBUTE_PER_EVENT_COUNT_LIMIT",
+      value: resolveBuiltInEnvironmentVariableOverrides(
+        "TRIGGER_OTEL_ATTRIBUTE_PER_EVENT_COUNT_LIMIT",
+        runtimeEnvironment,
+        String(env.TRIGGER_OTEL_ATTRIBUTE_PER_EVENT_COUNT_LIMIT)
+      ),
+    },
+  ];
+}
+
+function resolveBuiltInEnvironmentVariableOverrides(
+  key: string,
+  runtimeEnvironment: RuntimeEnvironmentForEnvRepo,
+  defaultValue: string
+) {
+  const overrides = runtimeEnvironment.builtInEnvironmentVariableOverrides;
+
+  if (!overrides) {
+    return defaultValue;
+  }
+
+  if (
+    !Array.isArray(overrides) &&
+    typeof overrides === "object" &&
+    key in overrides &&
+    typeof overrides[key] === "string"
+  ) {
+    return overrides[key];
+  }
+
+  return defaultValue;
 }