new fix for prometheus ports (#670)

* Properly fix unique Prometheus ports per service (redo of #649)

PR #649 fixed port conflicts only in the bazel run scripts, meaning the
problem persisted when services were launched directly via their bazel
targets. This commit fixes it at the source by overriding
metrics_prometheus_port in each service's config class, so the correct
port is used regardless of how the service is started.

Port assignments (core stays at the base default of 9464):
  - worker:            9465
  - delayed_job_monitor: 9466
  - backend_listener:  9467
  - backend_worker:    9468

Kubernetes manifests are updated to match these new defaults.

Also fixes a pre-existing port name collision: the oauth2-proxy sidecar
declared its metrics port as "metrics", conflicting with the OSMO
service container port of the same name in the same pod. Renamed to
"oauth2-metrics" across all three chart sidecar helpers (service,
router, web-ui).

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

* Revert run script port overrides made redundant by previous commit

The --metrics_prometheus_port flags added to the bazel run scripts by
#649 are now superseded by the per-service config class defaults. Remove
them to keep the scripts clean.

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

* Add oauth2-metrics endpoint to service PodMonitor

The oauth2-proxy sidecar port was renamed from "metrics" to
"oauth2-metrics" to avoid a pod-level port name collision. Add a
corresponding PodMonitor endpoint so Prometheus continues scraping
oauth2-proxy metrics when the sidecar is enabled.

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

* Fix pylint missing-class-docstring in WorkerConfig

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

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: cypres

deployments/charts/backend-operator/templates/backend-listener.yaml

@@ -75,7 +75,7 @@ spec:
           runAsUser: 1001
         ports:
         - name: metrics
-          containerPort: 9464
+          containerPort: 9467
         command:
         - backend_listener
         args:

deployments/charts/backend-operator/templates/backend-worker.yaml

@@ -75,7 +75,7 @@ spec:
           runAsUser: 1001
         ports:
         - name: metrics
-          containerPort: 9464
+          containerPort: 9468
         command:
         - backend_worker
         args:

deployments/charts/router/templates/_sidecar-helpers.tpl

@@ -119,7 +119,7 @@ OAuth2 Proxy sidecar container
   ports:
   - name: http
     containerPort: {{ .Values.sidecars.oauth2Proxy.httpPort }}
-  - name: metrics
+  - name: oauth2-metrics
     containerPort: {{ .Values.sidecars.oauth2Proxy.metricsPort }}
   livenessProbe:
     httpGet:

deployments/charts/service/templates/_sidecar-helpers.tpl

@@ -245,7 +245,7 @@ OAuth2 Proxy sidecar container
   ports:
   - name: http
     containerPort: {{ .Values.sidecars.oauth2Proxy.httpPort }}
-  - name: metrics
+  - name: oauth2-metrics
     containerPort: {{ .Values.sidecars.oauth2Proxy.metricsPort }}
   livenessProbe:
     httpGet:

deployments/charts/service/templates/api-monitor.yaml

@@ -28,6 +28,11 @@ spec:
     port: envoy-admin
     path: /stats/prometheus
   {{- end }}
+  {{- if .Values.sidecars.oauth2Proxy.enabled }}
+  - interval: 15s
+    port: oauth2-metrics
+    path: /metrics
+  {{- end }}
   selector:
     matchExpressions:
     - { key: app,

deployments/charts/service/templates/delayed-job-monitor.yaml

@@ -63,7 +63,7 @@ spec:
           runAsUser: 1001
         ports:
         - name: metrics
-          containerPort: 9464
+          containerPort: 9466
         command:
         - delayed_job_monitor
         imagePullPolicy: {{ .Values.services.delayedJobMonitor.imagePullPolicy }}

deployments/charts/service/templates/worker.yaml

@@ -76,7 +76,7 @@ spec:
           runAsUser: 1001
         ports:
         - name: metrics
-          containerPort: 9464
+          containerPort: 9465
         imagePullPolicy: {{ .Values.services.worker.imagePullPolicy }}
         args:
         - --metrics_otel_collector_component

deployments/charts/web-ui/templates/_sidecar-helpers.tpl

@@ -169,7 +169,7 @@ OAuth2 Proxy sidecar container
   ports:
   - name: http
     containerPort: {{ .Values.sidecars.oauth2Proxy.httpPort }}
-  - name: metrics
+  - name: oauth2-metrics
     containerPort: {{ .Values.sidecars.oauth2Proxy.metricsPort }}
   livenessProbe:
     httpGet:

run/start_backend_bazel.py

@@ -123,7 +123,6 @@ def _start_backend_operator(service_type: Literal['listener', 'worker'], emoji:
 
     host_ip = get_host_ip()
 
-    metrics_port = '9467' if service_type == 'listener' else '9468'
     cmd = [
         'bazel', 'run', f'@osmo_workspace//src/operator:{service_name}',
         '--',
@@ -132,8 +131,7 @@ def _start_backend_operator(service_type: Literal['listener', 'worker'], emoji:
         '--backend', 'default',
         '--namespace', 'default',
         '--username', 'testuser',
-        '--progress_folder_path', '/tmp/osmo/operator',
-        '--metrics_prometheus_port', metrics_port
+        '--progress_folder_path', '/tmp/osmo/operator'
     ]
 
     process = run_command_with_logging(

run/start_service_bazel.py

@@ -315,8 +315,7 @@ def _start_service_worker():
         'bazel', 'run', '@osmo_workspace//src/service/worker:worker_binary',
         '--',
         '--method=dev',
-        '--progress_file', '/tmp/osmo/service/last_progress_worker',
-        '--metrics_prometheus_port', '9465'
+        '--progress_file', '/tmp/osmo/service/last_progress_worker'
     ]
 
     process = run_command_with_logging(
@@ -388,8 +387,7 @@ def _start_delayed_job_monitor():
         '@osmo_workspace//src/service/delayed_job_monitor:delayed_job_monitor_binary',
         '--',
         '--method=dev',
-        '--progress_file', '/tmp/osmo/service/last_progress_delayed_job_monitor',
-        '--metrics_prometheus_port', '9466'
+        '--progress_file', '/tmp/osmo/service/last_progress_delayed_job_monitor'
     ]
 
     process = run_command_with_logging(