fix: register trace context before restore/warm-start, sanitize logged headers

Author: nicktrn

apps/supervisor/src/index.ts

@@ -220,6 +220,27 @@ class ManagedSupervisor {
 
       const { checkpoint, ...rest } = message;
 
+      // Register trace context early so snapshot spans work for all paths
+      // (cold create, restore, warm start). Re-registration on restore is safe
+      // since dequeue always provides fresh context.
+      if (this.isComputeMode && env.COMPUTE_TRACE_SPANS_ENABLED) {
+        const traceparent =
+          message.run.traceContext &&
+          "traceparent" in message.run.traceContext &&
+          typeof message.run.traceContext.traceparent === "string"
+            ? message.run.traceContext.traceparent
+            : undefined;
+
+        if (traceparent) {
+          this.workloadServer.registerRunTraceContext(message.run.friendlyId, {
+            traceparent,
+            envId: message.environment.id,
+            orgId: message.organization.id,
+            projectId: message.project.id,
+          });
+        }
+      }
+
       if (checkpoint) {
         this.logger.debug("Restoring run", { runId: message.run.id });
 
@@ -293,24 +314,6 @@ class ManagedSupervisor {
         return;
       }
 
-      if (this.isComputeMode && env.COMPUTE_TRACE_SPANS_ENABLED) {
-        const traceparent =
-          message.run.traceContext &&
-          "traceparent" in message.run.traceContext &&
-          typeof message.run.traceContext.traceparent === "string"
-            ? message.run.traceContext.traceparent
-            : undefined;
-
-        if (traceparent) {
-          this.workloadServer.registerRunTraceContext(message.run.friendlyId, {
-            traceparent,
-            envId: message.environment.id,
-            orgId: message.organization.id,
-            projectId: message.project.id,
-          });
-        }
-      }
-
       try {
         if (!message.deployment.friendlyId) {
           // mostly a type guard, deployments always exists for deployed environments

apps/supervisor/src/workloadServer/index.ts

@@ -282,16 +282,18 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
         {
           paramsSchema: WorkloadActionParams,
           handler: async ({ reply, params, req }) => {
-            this.logger.debug("Suspend request", { params, headers: req.headers });
-
             const runnerId = this.runnerIdFromRequest(req);
             const deploymentVersion = this.deploymentVersionFromRequest(req);
             const projectRef = this.projectRefFromRequest(req);
 
+            this.logger.debug("Suspend request", { params, runnerId, deploymentVersion, projectRef });
+
             if (!runnerId || !deploymentVersion || !projectRef) {
               this.logger.error("Invalid headers for suspend request", {
                 ...params,
-                headers: req.headers,
+                runnerId,
+                deploymentVersion,
+                projectRef,
               });
               reply.json(
                 {