Add --labels flag, fix slot acquisition, fix p4_connect.act schema

sebastianrath · sebastianrath · commit 18a90c9004e7 · 2026-04-09T10:01:08.000-04:00
- Add --labels CLI flag for agent runtime label declaration
- Send labels in heartbeat for server-side seeding
- Cap slot acquisition at 256 with ephemeral UUID fallback
- Fix p4_connect.act type from 'orchestrator' to 'generic'
diff --git a/agent/models.go b/agent/models.go
@@ -75,6 +75,7 @@ type StatusReport struct {
 // HeartbeatRequest is sent periodically with agent metrics.
 type HeartbeatRequest struct {
 	UUID          string  `json:"uuid,omitempty"`
+	Labels        string  `json:"labels,omitempty"`
 	CPUPercent    float64 `json:"cpu_percent"`
 	MemPercent    float64 `json:"mem_percent"`
 	MemUsedBytes  int64   `json:"mem_used_bytes"`
diff --git a/agent/worker.go b/agent/worker.go
@@ -24,6 +24,7 @@ type Worker struct {
 	client       *Client
 	docker       DockerConfig
 	vcsOpts      vcs.Options
+	labels       string
 	pollInterval time.Duration
 	uuid         string
 	log          *logrus.Entry
@@ -32,11 +33,12 @@ type Worker struct {
 	lastCounters *RawCounters
 }
 
-func NewWorker(client *Client, docker DockerConfig, vcsOpts vcs.Options) *Worker {
+func NewWorker(client *Client, docker DockerConfig, vcsOpts vcs.Options, labels string) *Worker {
 	return &Worker{
 		client:       client,
 		docker:       docker,
 		vcsOpts:      vcsOpts,
+		labels:       labels,
 		pollInterval: 1 * time.Second,
 		uuid:         loadOrGenerateUUID(),
 		log:          logrus.WithField("component", "agent"),
@@ -586,13 +588,13 @@ func (w *Worker) buildHeartbeatRequest() HeartbeatRequest {
 	snap, err := Snapshot()
 	if err != nil {
 		w.log.WithError(err).Warn("metrics snapshot error")
-		return HeartbeatRequest{UUID: w.uuid}
+		return HeartbeatRequest{UUID: w.uuid, Labels: w.labels}
 	}
 
 	w.metricsMu.Lock()
 	defer w.metricsMu.Unlock()
 
-	req := HeartbeatRequest{UUID: w.uuid}
+	req := HeartbeatRequest{UUID: w.uuid, Labels: w.labels}
 	if w.lastCounters != nil {
 		// CPU percent
 		if snap.CPUInstant {
diff --git a/cmd/cmd_agent.go b/cmd/cmd_agent.go
@@ -16,6 +16,7 @@ import (
 var (
 	flagAgentServer             string
 	flagAgentToken              string
+	flagAgentLabels             string
 	flagAgentDockerDisabled     bool
 	flagAgentDockerDefaultImage string
 	flagAgentP4Client           string
@@ -35,6 +36,7 @@ func init() {
 	if os.Getenv("ACT_AGENT_TOKEN") == "" {
 		cmdAgent.MarkFlagRequired("token")
 	}
+	cmdAgent.Flags().StringVar(&flagAgentLabels, "labels", envOr("ACT_AGENT_LABELS", ""), "Comma-separated labels for job matching (env: ACT_AGENT_LABELS)")
 	cmdAgent.Flags().BoolVar(&flagAgentDockerDisabled, "docker-disabled", envOrBool("ACT_AGENT_DOCKER_DISABLED", false), "Disable Docker execution, always run natively")
 	cmdAgent.Flags().StringVar(&flagAgentDockerDefaultImage, "docker-default-image", envOr("ACT_AGENT_DOCKER_DEFAULT_IMAGE", ""), "Force this Docker image for all scripts")
 	cmdAgent.Flags().StringVar(&flagAgentP4Client, "p4-client", envOr("ACT_AGENT_P4CLIENT", ""), "Reuse an existing Perforce workspace instead of creating a temporary one (env: ACT_AGENT_P4CLIENT)")
@@ -68,7 +70,7 @@ func cmdAgentRun(cmd *cobra.Command, args []string) {
 			DefaultImage: flagAgentDockerDefaultImage,
 		}, vcs.Options{
 			P4Client: flagAgentP4Client,
-		})
+		}, flagAgentLabels)
 
 		log.WithField("server", serverURL).Info("connecting")
 		err := w.Run(ctx)
diff --git a/tests_e2e/scripts/p4_connect.act b/tests_e2e/scripts/p4_connect.act
@@ -2,7 +2,7 @@ editor:
   version:
     created: v1.0.0
 entry: start
-type: orchestrator
+type: generic
 nodes:
   - id: start
     type: core/start@v1
