Actually collect worker_id and then make it a link to deployments when pretty formatting in Query. Also update the core columns for metrics in Query.

Author: ericallam

apps/webapp/app/components/code/TSQLResultsTable.tsx

@@ -300,6 +300,8 @@ function getDisplayLength(value: unknown, column: OutputColumnMetadata): number
         return typeof value === "string" ? Math.min(value.length, 20) : 12;
       case "queue":
         return typeof value === "string" ? Math.min(value.length, 25) : 15;
+      case "deploymentId":
+        return typeof value === "string" ? Math.min(value.length, 25) : 20;
     }
   }
 
@@ -644,6 +646,19 @@ function CellValue({
         }
         return <span>{String(value)}</span>;
       }
+      case "deploymentId": {
+        if (typeof value === "string" && value.startsWith("deployment_")) {
+          return (
+            <SimpleTooltip
+              content="Jump to deployment"
+              disableHoverableContent
+              hidden={!hovered}
+              button={<TextLink to={`/deployments/${value}`}>{value}</TextLink>}
+            />
+          );
+        }
+        return <span>{String(value)}</span>;
+      }
     }
   }
 

apps/webapp/app/env.server.ts

@@ -384,6 +384,7 @@ const EnvironmentSchema = z
     DEV_OTEL_LOG_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
     DEV_OTEL_LOG_MAX_QUEUE_SIZE: z.string().default("512"),
     DEV_OTEL_METRICS_EXPORT_INTERVAL_MILLIS: z.string().optional(),
+    DEV_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS: z.string().optional(),
     DEV_OTEL_METRICS_COLLECTION_INTERVAL_MILLIS: z.string().optional(),
 
     PROD_OTEL_BATCH_PROCESSING_ENABLED: z.string().default("0"),
@@ -396,6 +397,7 @@ const EnvironmentSchema = z
     PROD_OTEL_LOG_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
     PROD_OTEL_LOG_MAX_QUEUE_SIZE: z.string().default("512"),
     PROD_OTEL_METRICS_EXPORT_INTERVAL_MILLIS: z.string().optional(),
+    PROD_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS: z.string().optional(),
     PROD_OTEL_METRICS_COLLECTION_INTERVAL_MILLIS: z.string().optional(),
 
     TRIGGER_OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT: z.string().default("1024"),

apps/webapp/app/routes/deployments.$deploymentParam.ts

@@ -0,0 +1,70 @@
+import { redirect, type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { redirectWithErrorMessage } from "~/models/message.server";
+import { requireUser } from "~/services/session.server";
+import { rootPath, v3DeploymentPath } from "~/utils/pathBuilder";
+
+const ParamsSchema = z.object({
+  deploymentParam: z.string(),
+});
+
+export async function loader({ params, request }: LoaderFunctionArgs) {
+  const user = await requireUser(request);
+
+  const { deploymentParam } = ParamsSchema.parse(params);
+
+  const deployment = await prisma.workerDeployment.findFirst({
+    where: {
+      friendlyId: deploymentParam,
+      project: {
+        organization: {
+          members: {
+            some: {
+              userId: user.id,
+            },
+          },
+        },
+      },
+    },
+    select: {
+      shortCode: true,
+      environment: {
+        select: {
+          slug: true,
+        },
+      },
+      project: {
+        select: {
+          slug: true,
+          organization: {
+            select: {
+              slug: true,
+            },
+          },
+        },
+      },
+    },
+  });
+
+  if (!deployment) {
+    return redirectWithErrorMessage(
+      rootPath(),
+      request,
+      "Deployment either doesn't exist or you don't have permission to view it",
+      {
+        ephemeral: false,
+      }
+    );
+  }
+
+  return redirect(
+    v3DeploymentPath(
+      { slug: deployment.project.organization.slug },
+      { slug: deployment.project.slug },
+      { slug: deployment.environment.slug },
+      { shortCode: deployment.shortCode },
+      0
+    )
+  );
+}

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

@@ -964,16 +964,17 @@ async function resolveBuiltInDevVariables(runtimeEnvironment: RuntimeEnvironment
   }
 
   if (env.DEV_OTEL_METRICS_EXPORT_INTERVAL_MILLIS) {
-    result.push(
-      {
-        key: "TRIGGER_OTEL_METRICS_EXPORT_INTERVAL_MILLIS",
-        value: env.DEV_OTEL_METRICS_EXPORT_INTERVAL_MILLIS,
-      },
-      {
-        key: "TRIGGER_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS",
-        value: env.DEV_OTEL_METRICS_EXPORT_INTERVAL_MILLIS,
-      }
-    );
+    result.push({
+      key: "TRIGGER_OTEL_METRICS_EXPORT_INTERVAL_MILLIS",
+      value: env.DEV_OTEL_METRICS_EXPORT_INTERVAL_MILLIS,
+    });
+  }
+
+  if (env.DEV_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS) {
+    result.push({
+      key: "TRIGGER_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS",
+      value: env.DEV_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS,
+    });
   }
 
   if (env.DEV_OTEL_METRICS_COLLECTION_INTERVAL_MILLIS) {
@@ -1115,16 +1116,17 @@ async function resolveBuiltInProdVariables(
   }
 
   if (env.PROD_OTEL_METRICS_EXPORT_INTERVAL_MILLIS) {
-    result.push(
-      {
-        key: "TRIGGER_OTEL_METRICS_EXPORT_INTERVAL_MILLIS",
-        value: env.PROD_OTEL_METRICS_EXPORT_INTERVAL_MILLIS,
-      },
-      {
-        key: "TRIGGER_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS",
-        value: env.PROD_OTEL_METRICS_EXPORT_INTERVAL_MILLIS,
-      }
-    );
+    result.push({
+      key: "TRIGGER_OTEL_METRICS_EXPORT_INTERVAL_MILLIS",
+      value: env.PROD_OTEL_METRICS_EXPORT_INTERVAL_MILLIS,
+    });
+  }
+
+  if (env.PROD_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS) {
+    result.push({
+      key: "TRIGGER_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS",
+      value: env.PROD_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS,
+    });
   }
 
   if (env.PROD_OTEL_METRICS_COLLECTION_INTERVAL_MILLIS) {

apps/webapp/app/v3/querySchemas.ts

@@ -503,13 +503,15 @@ export const metricsSchema: TableSchema = {
       ...column("UInt64", {
         description: "Number of data points in this bucket",
         example: "6",
+        coreColumn: true,
       }),
     },
     sum_value: {
       name: "sum_value",
       ...column("Float64", {
         description: "Sum of values in this bucket",
         example: "0.45",
+        coreColumn: true,
       }),
     },
     max_value: {
@@ -525,6 +527,7 @@ export const metricsSchema: TableSchema = {
       ...column("Float64", {
         description: "Minimum value in this bucket",
         example: "0.12",
+        coreColumn: true,
       }),
     },
     last_value: {
@@ -543,6 +546,7 @@ export const metricsSchema: TableSchema = {
         description: "The run ID associated with this metric",
         customRenderType: "runId",
         example: "run_cm1a2b3c4d5e6f7g8h9i",
+        coreColumn: true,
       }),
       expression: "attributes.trigger.run_id",
     },
@@ -586,7 +590,8 @@ export const metricsSchema: TableSchema = {
       name: "worker_id",
       ...column("String", {
         description: "The worker ID that produced this metric",
-        example: "worker-abc123",
+        customRenderType: "deploymentId",
+        example: "deployment_cm1a2b3c4d5e",
       }),
       expression: "attributes.trigger.worker_id",
     },

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

@@ -596,7 +596,7 @@ export class DevRunController {
     const { taskRunProcess, isReused } = await this.opts.taskRunProcessPool.getProcess(
       this.opts.worker.manifest,
       {
-        id: "unmanaged",
+        id: this.opts.worker.serverWorker.id,
         contentHash: this.opts.worker.build.contentHash,
         version: this.opts.worker.serverWorker?.version,
         engine: "V2",

packages/cli-v3/src/entryPoints/managed/taskRunProcessProvider.ts

@@ -251,7 +251,7 @@ export class TaskRunProcessProvider {
       workerManifest: this.workerManifest,
       env: processEnv,
       serverWorker: {
-        id: "managed",
+        id: this.env.TRIGGER_DEPLOYMENT_ID,
         contentHash: this.env.TRIGGER_CONTENT_HASH,
         version: this.env.TRIGGER_DEPLOYMENT_VERSION,
         engine: "V2",