From a33b92477b2a96baa1347a7b0505bcc254f0a42b Mon Sep 17 00:00:00 2001
From: Robert Shaw <rshaw@neuralmagic.com>
Date: Wed, 1 May 2024 12:42:56 +0000
Subject: [PATCH 1/2] fixes 307 redirect

---
 vllm/engine/metrics.py                | 2 +-
 vllm/entrypoints/openai/api_server.py | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/vllm/engine/metrics.py b/vllm/engine/metrics.py
index 45bfad03ec867..3c4aac91549a9 100644
--- a/vllm/engine/metrics.py
+++ b/vllm/engine/metrics.py
@@ -119,7 +119,7 @@ def __init__(self, labelnames: List[str], max_model_len: int):
             buckets=[1, 2, 5, 10, 20],
         )
         self.counter_request_success = Counter(
-            name="vllm:request_success",
+            name="vllm:request_success_total",
             documentation="Count of successfully processed requests.",
             labelnames=labelnames + [Metrics.labelname_finish_reason])
 
diff --git a/vllm/entrypoints/openai/api_server.py b/vllm/entrypoints/openai/api_server.py
index af9ba7a3bc825..4427e87472a1b 100644
--- a/vllm/entrypoints/openai/api_server.py
+++ b/vllm/entrypoints/openai/api_server.py
@@ -2,6 +2,7 @@
 import importlib
 import inspect
 import os
+import re
 from contextlib import asynccontextmanager
 from http import HTTPStatus
 
@@ -12,6 +13,7 @@
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse, Response, StreamingResponse
 from prometheus_client import make_asgi_app
+from starlette.routing import Mount
 
 import vllm
 from vllm.engine.arg_utils import AsyncEngineArgs
@@ -55,8 +57,10 @@ def parse_args():
 
 
 # Add prometheus asgi middleware to route /metrics requests
-metrics_app = make_asgi_app()
-app.mount("/metrics", metrics_app)
+route = Mount("/metrics", make_asgi_app())
+# Avoid 307 Redirect
+route.path_regex = re.compile('^/metrics(?P<path>.*)$')
+app.routes.append(route)
 
 
 @app.exception_handler(RequestValidationError)

From f5aa08997155c8f6ea1567d4fc2f968fe43206e7 Mon Sep 17 00:00:00 2001
From: Robert Shaw
 <114415538+robertgshaw2-neuralmagic@users.noreply.github.com>
Date: Wed, 1 May 2024 09:52:27 -0400
Subject: [PATCH 2/2] Update api_server.py

---
 vllm/entrypoints/openai/api_server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vllm/entrypoints/openai/api_server.py b/vllm/entrypoints/openai/api_server.py
index 4427e87472a1b..40103f70a31a3 100644
--- a/vllm/entrypoints/openai/api_server.py
+++ b/vllm/entrypoints/openai/api_server.py
@@ -58,7 +58,7 @@ def parse_args():
 
 # Add prometheus asgi middleware to route /metrics requests
 route = Mount("/metrics", make_asgi_app())
-# Avoid 307 Redirect
+# Workaround for 307 Redirect for /metrics
 route.path_regex = re.compile('^/metrics(?P<path>.*)$')
 app.routes.append(route)