Resolve merge conflict and update code according to PR#14661

Signed-off-by: Zijing Liu <liuzijing2014@gmail.com>

Author: liuzijing2014

vllm/v1/engine/async_llm.py

@@ -29,10 +29,7 @@
 from vllm.v1.engine.parallel_sampling import ParentRequest
 from vllm.v1.engine.processor import Processor
 from vllm.v1.executor.abstract import Executor
-from vllm.v1.metrics.loggers import (PROMETHEUS_LOGGING_LOGGER_NAME,
-                                     STANDARD_LOGGING_LOGGER_NAME,
-                                     LoggingStatLogger, PrometheusStatLogger,
-                                     StatLoggerBase)
+from vllm.v1.metrics.loggers import StatLoggerBase, setup_default_loggers
 from vllm.v1.metrics.stats import IterationStats, SchedulerStats
 
 logger = init_logger(__name__)
@@ -64,11 +61,9 @@ def __init__(
             if stat_loggers is not None:
                 self.stat_loggers = stat_loggers
             else:
-                if logger.isEnabledFor(logging.INFO):
-                    self.stat_loggers[STANDARD_LOGGING_LOGGER_NAME] = (
-                        LoggingStatLogger())
-                self.stat_loggers[PROMETHEUS_LOGGING_LOGGER_NAME] = (
-                    PrometheusStatLogger(vllm_config))
+                setup_default_loggers(vllm_config,
+                                      logger.isEnabledFor(logging.INFO),
+                                      self.stat_loggers)
 
         # Tokenizer (+ ensure liveness if running in another process).
         self.tokenizer = init_tokenizer_from_configs(

vllm/v1/metrics/loggers.py

@@ -431,3 +431,13 @@ def build_cudagraph_buckets(vllm_config: VllmConfig) -> list[int]:
         return buckets
     else:
         return [1, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8096]
+
+
+def setup_default_loggers(vllm_config: VllmConfig, enable_stats_log: bool,
+                          stat_loggers: dict[str, StatLoggerBase]):
+    """Setup logging and prometheus metrics."""
+    stat_loggers[PROMETHEUS_LOGGING_LOGGER_NAME] = (
+        PrometheusStatLogger(vllm_config))
+
+    if enable_stats_log:
+        stat_loggers[STANDARD_LOGGING_LOGGER_NAME] = (LoggingStatLogger())