feat(gitlab): runner configuration and OTel trace correlation

- fix: use project name as runner name instead of hostname
- feat: correlate CI job logs with OTel traces via journald; when both
  GitLab runner and OTel are configured, Podman uses the journald log
  driver so CI job output is captured by systemd journal; otelcol gains
  a journald/gitlab-jobs receiver that parses job_id, project_id, and
  runner_token for cross-stream correlation

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: adrianriobo

pkg/integrations/gitlab/glrunner.go

@@ -44,12 +44,13 @@ func (args *GitLabRunnerArgs) GetUserDataValues() *integrations.UserDataValues {
 		return nil
 	}
 	return &integrations.UserDataValues{
-		Name:       args.Name,
-		Token:      args.AuthToken, // Use auth token (set by Pulumi during deployment)
-		CliURL:     downloadURL(),
-		RepoURL:    args.URL,
-		Unsecure:   args.Unsecure,
-		Concurrent: args.Concurrent,
+		Name:          args.Name,
+		Token:         args.AuthToken, // Use auth token (set by Pulumi during deployment)
+		CliURL:        downloadURL(),
+		RepoURL:       args.URL,
+		Unsecure:      args.Unsecure,
+		Concurrent:    args.Concurrent,
+		LogToJournald: args.LogToJournald,
 	}
 }
 

pkg/integrations/gitlab/snippet-darwin.sh

@@ -8,6 +8,7 @@ sudo gitlab-runner register \
   --non-interactive \
   --url "{{ .RepoURL }}" \
   --token "{{ .Token }}" \
+  --name "{{ .Name }}" \
   --executor "shell"
 
 # Install and start as LaunchDaemon

pkg/integrations/gitlab/snippet-windows.ps1

@@ -7,6 +7,7 @@ C:\GitLab-Runner\gitlab-runner.exe register `
   --non-interactive `
   --url "{{ .RepoURL }}" `
   --token "{{ .Token }}" `
+  --name "{{ .Name }}" `
   --executor "shell"
 
 # Install and start as Windows service

pkg/integrations/gitlab/types.go

@@ -26,6 +26,7 @@ type GitLabRunnerArgs struct {
 	Arch        *Arch     // Target architecture
 	User        string    // OS user to run as (only used when Unsecure is true)
 	AuthToken   string    // Runner authentication token (set by Pulumi during deployment)
-	Unsecure    bool      // When false (default) a dedicated gitlab-runner system user is created; when true the runner service runs as User
-	Concurrent  int       // Maximum number of concurrent jobs (written to config.toml; 0 means leave at default of 1)
+	Unsecure      bool // When false (default) a dedicated gitlab-runner system user is created; when true the runner service runs as User
+	Concurrent    int  // Maximum number of concurrent jobs (written to config.toml; 0 means leave at default of 1)
+	LogToJournald bool // When true, sets Podman log_driver=journald so CI job output is captured by systemd journal for OTel correlation
 }

pkg/integrations/integrations.go

@@ -6,16 +6,17 @@ import (
 )
 
 type UserDataValues struct {
-	CliURL     string
-	User       string
-	Name       string
-	Token      string
-	Labels     string
-	Port       string
-	RepoURL    string
-	Executor   string
-	Unsecure   bool
-	Concurrent int
+	CliURL         string
+	User           string
+	Name           string
+	Token          string
+	Labels         string
+	Port           string
+	RepoURL        string
+	Executor       string
+	Unsecure       bool
+	Concurrent     int
+	LogToJournald  bool
 }
 
 type IntegrationConfig interface {

pkg/integrations/otelcol/snippet-linux.sh

@@ -143,10 +143,31 @@ receivers:
     - type: remove
       id: remove_file_name
       field: attributes["log.file.name"]
+    - type: regex_parser
+      id: parse_job_id
+      parse_from: body
+      regex: '\bjob=(?P<job_id>\d+)'
+      on_error: send
+    - type: regex_parser
+      id: parse_runner_token
+      parse_from: body
+      regex: '\brunner=(?P<runner_token>\w+)'
+      on_error: send
     attributes:
       index: "{{.Index}}"
       _sourceCategory: gitlab-runner
       _sourceHost: ${env:HOSTNAME}
+  journald/gitlab-jobs:
+    operators:
+    - type: regex_parser
+      id: parse_container_name
+      parse_from: attributes["CONTAINER_NAME"]
+      regex: '^runner-(?P<runner_token>.+?)-project-(?P<project_id>\d+)-concurrent-(?P<concurrent_id>\d+)-(?P<job_id>\d+)$'
+      on_error: send
+    attributes:
+      index: "{{.Index}}"
+      _sourceCategory: gitlab-runner-jobs
+      _sourceHost: ${env:HOSTNAME}
 {{- end}}
 processors:
   filter/drop_null_bytes:
@@ -185,7 +206,7 @@ service:
       level: "basic"
   pipelines:
     logs:
-      receivers: [filelog/syslog, filelog/secure, filelog/audit{{if .MonitorGitLabRunner}}, filelog/gitlab-runner{{end}}]
+      receivers: [filelog/syslog, filelog/secure, filelog/audit{{if .MonitorGitLabRunner}}, filelog/gitlab-runner, journald/gitlab-jobs{{end}}]
       processors: [filter/drop_null_bytes, resource, batch]
       exporters: [otlphttp]
 OTELEOF

pkg/manager/context/context.go

@@ -191,7 +191,7 @@ func manageIntegration(c *Context, ca *ContextArgs) error {
 		cirrus.Init(ca.CirrusPWArgs)
 	}
 	if ca.GLRunnerArgs != nil {
-		ca.GLRunnerArgs.Name = c.RunID()
+		ca.GLRunnerArgs.Name = c.ProjectName()
 		gitlab.Init(ca.GLRunnerArgs)
 	}
 	return nil