prometheus: redo fix by using dev mode (#673)

* Revert "new fix for prometheus ports (#670)"

This reverts commit 122af26.

* Revert "Assign unique Prometheus metrics ports per service in bazel mode (#649)"

This reverts commit ef45396.

* Fix OAuth2 metrics

* Skip Prometheus metrics server in dev mode for all services

Prevents port conflicts when running multiple services locally with
--method=dev. Consistent with the pattern already applied to worker.py.

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

* Skip metrics server startup when otel metrics are disabled

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

* Revert "Skip Prometheus metrics server in dev mode for all services"

This reverts commit 9211ccc.

* Disable metrics by default

---------

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: 9467
+          containerPort: 9464
         command:
         - backend_listener
         args:

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

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

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

@@ -63,7 +63,7 @@ spec:
           runAsUser: 1001
         ports:
         - name: metrics
-          containerPort: 9466
+          containerPort: 9464
         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: 9465
+          containerPort: 9464
         imagePullPolicy: {{ .Values.services.worker.imagePullPolicy }}
         args:
         - --metrics_otel_collector_component

src/operator/utils/objects.py

@@ -50,11 +50,6 @@ class BackendBaseConfig(logging.LoggingConfig, login.LoginConfig,
 
 class BackendListenerConfig(BackendBaseConfig, metrics.MetricsCreatorConfig):
     """Configuration for the backend listener service that monitors Kubernetes resources"""
-    metrics_prometheus_port: int = pydantic.Field(
-        command_line='metrics_prometheus_port',
-        env='METRICS_PROMETHEUS_PORT',
-        default=9467,
-        description='The port on which the Prometheus scrape endpoint is exposed.')
     include_namespace_usage: List[str] = pydantic.Field(
         command_line='include_namespace_usage',
         default=[],
@@ -166,11 +161,6 @@ class BackendListenerConfig(BackendBaseConfig, metrics.MetricsCreatorConfig):
 
 class BackendWorkerConfig(BackendBaseConfig, metrics.MetricsCreatorConfig):
     """Configuration for the backend worker service that executes jobs"""
-    metrics_prometheus_port: int = pydantic.Field(
-        command_line='metrics_prometheus_port',
-        env='METRICS_PROMETHEUS_PORT',
-        default=9468,
-        description='The port on which the Prometheus scrape endpoint is exposed.')
     test_runner_namespace: str = pydantic.Field(
         command_line='test_runner_namespace',
         default='osmo-test',

src/service/delayed_job_monitor/delayed_job_monitor.py

@@ -40,11 +40,6 @@ class DelayedJobMonitorConfig(connectors.RedisConfig, connectors.PostgresConfig,
                               src.lib.utils.logging.LoggingConfig, static_config.StaticConfig,
                               metrics.MetricsCreatorConfig):
     """Configuration for DelayedJobMonitor."""
-    metrics_prometheus_port: int = pydantic.Field(
-        command_line='metrics_prometheus_port',
-        env='METRICS_PROMETHEUS_PORT',
-        default=9466,
-        description='The port on which the Prometheus scrape endpoint is exposed.')
     # The amount of time the monitor waits before polling again (in seconds)
     poll_interval: int = pydantic.Field(
         command_line='poll_interval',

src/service/worker/worker.py

@@ -45,12 +45,6 @@
 class WorkerConfig(connectors.RedisConfig, connectors.PostgresConfig,
                    src.lib.utils.logging.LoggingConfig, static_config.StaticConfig,
                    metrics.MetricsCreatorConfig):
-    """Configuration for the OSMO service worker."""
-    metrics_prometheus_port: int = pydantic.Field(
-        command_line='metrics_prometheus_port',
-        env='METRICS_PROMETHEUS_PORT',
-        default=9465,
-        description='The port on which the Prometheus scrape endpoint is exposed.')
     progress_file: str = pydantic.Field(
         command_line='progress_file',
         env='OSMO_PROGRESS_FILE',

src/utils/metrics/metrics.py

@@ -59,7 +59,7 @@ class MetricsCreatorConfig(pydantic.BaseModel):
     metrics_otel_enable: bool = pydantic.Field(
         command_line='metrics_otel_enable',
         env='METRICS_OTEL_ENABLE',
-        default=True,
+        default=False,
         description='If set false, will disable metrics')
 
 class MetricCreator: