fix(webapp): minimize server diagnostic data

Mono-RevId: 8231f6bfa53faa16e02ac04ee785d2bfd2f14742

Author: carderne

apps/webapp/app/routes/admin.api.v1.runs-replication.backfill.ts

@@ -53,7 +53,14 @@ export async function action({ request }: ActionFunctionArgs) {
       }))
     );
 
-    logger.info("Backfilled runs", { runs });
+    logger.info("Backfilled runs", {
+      runCount: runs.length,
+      runs: runs.map((run) => ({
+        id: run.id,
+        friendlyId: run.friendlyId,
+        status: run.status,
+      })),
+    });
 
     return json({
       success: true,

apps/webapp/app/runEngine/validators/triggerTaskValidator.ts

@@ -76,7 +76,8 @@ export class DefaultTriggerTaskValidator implements TriggerTaskValidator {
     // Check if the parent run is in a final state
     if (isFinalRunStatus(parentRun.status)) {
       logger.debug("Parent run is in a terminal state", {
-        parentRun,
+        parentRunId: parentRun.friendlyId,
+        status: parentRun.status,
       });
 
       return {

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

@@ -12,7 +12,7 @@ import type {
 import { SeverityNumber, Span_SpanKind, Status_StatusCode } from "@trigger.dev/otlp-importer";
 import type { MetricsV1Input } from "@internal/clickhouse";
 import { generateSpanId } from "./eventRepository/common.server";
-import { unwrapWorkerIdInMetadata } from "./workerIdUnwrap.server";
+import { unwrapWorkerId, unwrapWorkerIdInMetadata } from "./workerIdUnwrap.server";
 import type {
   CreatableEventKind,
   CreatableEventStatus,
@@ -303,7 +303,9 @@ export function convertMetricsToClickhouseRows(
     runId: resourceProperties.runId,
     attemptNumber: resourceProperties.attemptNumber,
     machineId: extractStringAttribute(resourceAttributes, SemanticInternalAttributes.MACHINE_ID),
-    workerId: extractStringAttribute(resourceAttributes, SemanticInternalAttributes.WORKER_ID),
+    workerId: unwrapWorkerId(
+      extractStringAttribute(resourceAttributes, SemanticInternalAttributes.WORKER_ID)
+    ),
     workerVersion: extractStringAttribute(
       resourceAttributes,
       SemanticInternalAttributes.WORKER_VERSION
@@ -417,7 +419,7 @@ function resolveDataPointContext(
     extractStringAttribute(dpAttributes, SemanticInternalAttributes.MACHINE_ID);
   const workerId =
     resourceCtx.workerId ??
-    extractStringAttribute(dpAttributes, SemanticInternalAttributes.WORKER_ID);
+    unwrapWorkerId(extractStringAttribute(dpAttributes, SemanticInternalAttributes.WORKER_ID));
   const workerVersion =
     resourceCtx.workerVersion ??
     extractStringAttribute(dpAttributes, SemanticInternalAttributes.WORKER_VERSION);

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

@@ -66,13 +66,28 @@ export class FinalizeDeploymentV2Service extends BaseService {
       throw new ServiceValidationError("Worker deployment is not in DEPLOYING status");
     }
 
+    const deploymentDiagnostics = {
+      id: deployment.id,
+      friendlyId: id,
+      status: deployment.status,
+      version: deployment.version,
+      imageReference: deployment.imageReference,
+      type: deployment.type,
+    };
+    const finalizeOptions = {
+      skipPromotion: body.skipPromotion,
+      imageDigest: body.imageDigest,
+      skipPushToRegistry: body.skipPushToRegistry,
+    };
+
     const finalizeService = new FinalizeDeploymentService();
 
     // If remote builds are not enabled, skip image push and go straight to template + finalize
     if (!remoteBuildsEnabled() || body.skipPushToRegistry) {
       if (body.skipPushToRegistry) {
         logger.debug("Skipping push to registry during deployment finalization", {
-          deployment,
+          deployment: deploymentDiagnostics,
+          finalizeOptions,
         });
       }
 
@@ -117,7 +132,10 @@ export class FinalizeDeploymentV2Service extends BaseService {
       throw new ServiceValidationError("Missing image reference");
     }
 
-    logger.debug("Pushing image to registry", { id, deployment, body });
+    logger.debug("Pushing image to registry", {
+      deployment: deploymentDiagnostics,
+      finalizeOptions,
+    });
 
     const pushResult = await executePushToRegistry(
       {
@@ -142,9 +160,8 @@ export class FinalizeDeploymentV2Service extends BaseService {
     }
 
     logger.debug("Image pushed to registry", {
-      id,
-      deployment,
-      body,
+      deployment: deploymentDiagnostics,
+      finalizeOptions,
       pushedImage: pushResult.image,
     });
 

apps/webapp/test/workerIdUnwrap.test.ts

@@ -1,5 +1,7 @@
 import { describe, expect, it } from "vitest";
 import { mintWorkloadDeploymentToken, SemanticInternalAttributes } from "@trigger.dev/core/v3";
+import type { ResourceMetrics } from "@trigger.dev/otlp-importer";
+import { convertMetricsToClickhouseRows } from "~/v3/otlpTransform.server";
 import { unwrapWorkerId, unwrapWorkerIdInMetadata } from "~/v3/workerIdUnwrap.server";
 
 const EXP = Math.floor(Date.UTC(2032, 0, 1) / 1000);
@@ -44,6 +46,45 @@ describe("unwrapWorkerId", () => {
   });
 });
 
+describe("metric worker IDs", () => {
+  it("stores the deployment friendly ID instead of a worker token", async () => {
+    const token = await mint("deployment_metric");
+    const resourceMetrics = {
+      resource: {
+        attributes: [
+          {
+            key: SemanticInternalAttributes.WORKER_ID,
+            value: { stringValue: token },
+          },
+        ],
+      },
+      scopeMetrics: [
+        {
+          metrics: [
+            {
+              name: "test.metric",
+              gauge: {
+                dataPoints: [
+                  {
+                    asDouble: 1,
+                    timeUnixNano: 0n,
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      ],
+    } as unknown as ResourceMetrics;
+
+    const [row] = convertMetricsToClickhouseRows(resourceMetrics, 1024);
+
+    expect(row?.attributes).toEqual({
+      trigger: { worker_id: "deployment_metric" },
+    });
+  });
+});
+
 describe("unwrapWorkerIdInMetadata", () => {
   it("unwraps a token worker.id in the metadata bag, leaving other keys untouched", async () => {
     const metadata = {

internal-packages/run-ops-database/scripts/migrate.mjs

@@ -11,7 +11,6 @@ import { fileURLToPath } from "node:url";
 const packageRoot = resolve(dirname(fileURLToPath(import.meta.url)), "..");
 
 const expand = (value) => value?.replace(/\$\{(\w+)\}/g, (_, k) => process.env[k] ?? "");
-const redact = (url) => url.replace(/:\/\/[^@]*@/, "://***@");
 
 const subcommand = process.argv[2] === "status" ? "status" : "deploy";
 
@@ -26,9 +25,7 @@ if (!databaseUrl) {
   process.exit(0);
 }
 
-console.log(
-  `Running \`prisma migrate ${subcommand}\` against the run-ops database (${redact(databaseUrl)})`
-);
+console.log(`Running \`prisma migrate ${subcommand}\` against the configured run-ops database`);
 
 const result = spawnSync("prisma", ["migrate", subcommand, "--schema", "prisma/schema.prisma"], {
   cwd: packageRoot,