diff --git a/rock/admin/metrics/monitor.py b/rock/admin/metrics/monitor.py index 84e7b943..f099e038 100644 --- a/rock/admin/metrics/monitor.py +++ b/rock/admin/metrics/monitor.py @@ -9,6 +9,7 @@ from rock import env_vars from rock.admin.metrics.constants import MetricsConstants +from rock.admin.metrics.gc_view_instrument_match import patch_view_instrument_match from rock.utils import get_uniagent_endpoint @@ -21,6 +22,7 @@ def __init__( role: str = "test", export_interval_millis: int = 10000, ): + patch_view_instrument_match() self._init_basic_attributes(host, port, env, role) self._init_telemetry(export_interval_millis) self.counters: dict[str, Counter] = {} @@ -28,12 +30,12 @@ def __init__( self._register_metrics() @classmethod - def create(cls) -> "MetricsMonitor": + def create(cls, export_interval_millis: int = 20000) -> "MetricsMonitor": host, port = get_uniagent_endpoint() env = env_vars.ROCK_ADMIN_ENV role = env_vars.ROCK_ADMIN_ROLE logging.info(f"Initializing MetricsCollector with host={host}, port={port}, " f"env={env}, role={role}") - return cls(host=host, port=port, env=env, role=role) + return cls(host=host, port=port, env=env, role=role, export_interval_millis=export_interval_millis) def _register_metrics(self): """Register all monitoring metrics""" diff --git a/rock/sandbox/base_manager.py b/rock/sandbox/base_manager.py index 58c1751c..734702b8 100644 --- a/rock/sandbox/base_manager.py +++ b/rock/sandbox/base_manager.py @@ -30,7 +30,7 @@ def __init__( self.rock_config = rock_config self._executor = get_executor() self._redis_provider = redis_provider - self.metrics_monitor = MetricsMonitor.create() + self.metrics_monitor = MetricsMonitor.create(export_interval_millis=20_000) self._report_interval = 10 self._check_job_interval = 180 self._sandbox_meta = {} diff --git a/rock/sandbox/service/sandbox_proxy_service.py b/rock/sandbox/service/sandbox_proxy_service.py index bdab17e4..823c104a 100644 --- a/rock/sandbox/service/sandbox_proxy_service.py +++ b/rock/sandbox/service/sandbox_proxy_service.py @@ -44,7 +44,7 @@ class SandboxProxyService: def __init__(self, rock_config: RockConfig, redis_provider: RedisProvider | None = None): self._redis_provider = redis_provider - self.metrics_monitor = MetricsMonitor.create() + self.metrics_monitor = MetricsMonitor.create(export_interval_millis=20_000) self.oss_config: OssConfig = rock_config.oss self.proxy_config: ProxyServiceConfig = rock_config.proxy_service logger.info(f"proxy config: {self.proxy_config}")