chenchenghao/sglang
1
0
Fork 0
Code Issues Pull Requests Actions 12 Packages Projects Releases Wiki Activity

[model-gateway] optimize metric labels to avoid unnecessary allocations (#15095)

Browse Source
This commit is contained in:
Simo Lin
2025-12-13 21:10:45 -08:00
committed by GitHub
parent 0fa044ad63
commit 74ea45cc4b
4 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sgl-model-gateway/src/core/job_queue.rs
View File

@@ -58,7 +58,7 @@ pub enum Job {
impl Job {
/// Get job type as string for logging
pub fn job_type(&self) -> &str {
pub fn job_type(&self) -> &'static str {
match self {
Job::AddWorker { .. } => "AddWorker",
Job::UpdateWorker { .. } => "UpdateWorker",
@@ -237,13 +237,13 @@ impl JobQueue {
}
// Extract values before moving job
let job_type = job.job_type().to_string();
let job_type = job.job_type();
let worker_url = job.worker_url().to_string();
// Record pending status
self.status_map.insert(
worker_url.clone(),
JobStatus::pending(&job_type, &worker_url),
JobStatus::pending(job_type, &worker_url),
);
match self.tx.send(job).await {
@@ -286,14 +286,14 @@ impl JobQueue {
status_map: Arc<DashMap<String, JobStatus>>,
_permit: tokio::sync::OwnedSemaphorePermit,
) {
let job_type = job.job_type().to_string();
let job_type = job.job_type();
let worker_url = job.worker_url().to_string();
let start = std::time::Instant::now();
// Update to processing
status_map.insert(
worker_url.clone(),
JobStatus::processing(&job_type, &worker_url),
JobStatus::processing(job_type, &worker_url),
);
debug!("Processing job: type={}, worker={}", job_type, worker_url);
@@ -303,13 +303,13 @@ impl JobQueue {
Some(ctx) => {
let result = Self::execute_job(&job, &ctx).await;
let duration = start.elapsed();
Self::record_job_completion(&job_type, &worker_url, duration, &result, &status_map);
Self::record_job_completion(job_type, &worker_url, duration, &result, &status_map);
}
None => {
let error_msg = "AppContext dropped".to_string();
status_map.insert(
worker_url.clone(),
JobStatus::failed(&job_type, &worker_url, error_msg),
JobStatus::failed(job_type, &worker_url, error_msg),
);
error!(
"AppContext dropped, cannot process job: type={}, worker={}",
@@ -808,7 +808,7 @@ impl JobQueue {
/// Record job completion metrics and update status
fn record_job_completion(
job_type: &str,
job_type: &'static str,
worker_url: &str,
duration: Duration,
result: &Result<String, String>,

62
sgl-model-gateway/src/observability/metrics.rs
View File

@@ -241,9 +241,9 @@ pub fn start_prometheus(config: PrometheusConfig) {
pub struct RouterMetrics;
impl RouterMetrics {
pub fn record_request(route: &str) {
pub fn record_request(route: &'static str) {
counter!("sgl_router_requests_total",
"route" => route.to_string()
"route" => route
)
.increment(1);
}
@@ -252,27 +252,27 @@ impl RouterMetrics {
histogram!("sgl_router_request_duration_seconds").record(duration.as_secs_f64());
}
pub fn record_request_error(route: &str, error_type: &str) {
pub fn record_request_error(route: &'static str, error_type: &'static str) {
counter!("sgl_router_request_errors_total",
"route" => route.to_string(),
"error_type" => error_type.to_string()
"route" => route,
"error_type" => error_type
)
.increment(1);
}
// TODO unify metric names
pub fn record_attempt_http_response(route: &str, status_code: u16, error_code: &str) {
pub fn record_attempt_http_response(route: &'static str, status_code: u16, error_code: &str) {
counter!("sgl_router_attempt_http_responses_total",
"route" => route.to_string(),
"route" => route,
"status_code" => status_code.to_string(),
"error_code" => error_code.to_string()
)
.increment(1);
}
pub fn record_retry(route: &str) {
pub fn record_retry(route: &'static str) {
counter!("sgl_router_retries_total",
"route" => route.to_string()
"route" => route
)
.increment(1);
}
@@ -284,9 +284,9 @@ impl RouterMetrics {
.record(duration.as_secs_f64());
}
pub fn record_retries_exhausted(route: &str) {
pub fn record_retries_exhausted(route: &'static str) {
counter!("sgl_router_retries_exhausted_total",
"route" => route.to_string()
"route" => route
)
.increment(1);
}
@@ -309,9 +309,9 @@ impl RouterMetrics {
.increment(1);
}
pub fn record_policy_decision(policy: &str, worker: &str) {
pub fn record_policy_decision(policy: &'static str, worker: &str) {
counter!("sgl_router_policy_decisions_total",
"policy" => policy.to_string(),
"policy" => policy,
"worker" => worker.to_string()
)
.increment(1);
@@ -341,16 +341,16 @@ impl RouterMetrics {
gauge!("sgl_router_min_load").set(min_load as f64);
}
pub fn record_pd_request(route: &str) {
pub fn record_pd_request(route: &'static str) {
counter!("sgl_router_pd_requests_total",
"route" => route.to_string()
"route" => route
)
.increment(1);
}
pub fn record_pd_request_duration(route: &str, duration: Duration) {
pub fn record_pd_request_duration(route: &'static str, duration: Duration) {
histogram!("sgl_router_pd_request_duration_seconds",
"route" => route.to_string()
"route" => route
)
.record(duration.as_secs_f64());
}
@@ -369,9 +369,9 @@ impl RouterMetrics {
.increment(1);
}
pub fn record_pd_error(error_type: &str) {
pub fn record_pd_error(error_type: &'static str) {
counter!("sgl_router_pd_errors_total",
"error_type" => error_type.to_string()
"error_type" => error_type
)
.increment(1);
}
@@ -461,19 +461,19 @@ impl RouterMetrics {
.set(state_code as f64);
}
pub fn record_cb_state_transition(worker: &str, from: &str, to: &str) {
pub fn record_cb_state_transition(worker: &str, from: &'static str, to: &'static str) {
counter!("sgl_router_cb_state_transitions_total",
"worker" => worker.to_string(),
"from" => from.to_string(),
"to" => to.to_string()
"from" => from,
"to" => to
)
.increment(1);
}
pub fn record_cb_outcome(worker: &str, outcome: &str) {
pub fn record_cb_outcome(worker: &str, outcome: &'static str) {
counter!("sgl_router_cb_outcomes_total",
"worker" => worker.to_string(),
"outcome" => outcome.to_string()
"outcome" => outcome
)
.increment(1);
}
@@ -514,23 +514,23 @@ impl RouterMetrics {
gauge!("sgl_router_job_queue_depth").set(depth as f64);
}
pub fn record_job_duration(job_type: &str, duration: Duration) {
pub fn record_job_duration(job_type: &'static str, duration: Duration) {
histogram!("sgl_router_job_duration_seconds",
"job_type" => job_type.to_string()
"job_type" => job_type
)
.record(duration.as_secs_f64());
}
pub fn record_job_success(job_type: &str) {
pub fn record_job_success(job_type: &'static str) {
counter!("sgl_router_job_success_total",
"job_type" => job_type.to_string()
"job_type" => job_type
)
.increment(1);
}
pub fn record_job_failure(job_type: &str) {
pub fn record_job_failure(job_type: &'static str) {
counter!("sgl_router_job_failure_total",
"job_type" => job_type.to_string()
"job_type" => job_type
)
.increment(1);
}
@@ -875,7 +875,7 @@ mod tests {
fn test_very_long_metric_labels() {
let long_label = "a".repeat(1000);
RouterMetrics::record_request(&long_label);
RouterMetrics::record_request("/very_long_test_route");
RouterMetrics::set_worker_health(&long_label, false);
}

2
sgl-model-gateway/src/routers/http/pd_router.rs
View File

@@ -971,7 +971,7 @@ impl PDRouter {
&self,
client: &Client,
url: &str,
route: &str,
route: &'static str,
json_request: &Value,
headers: Option<&HeaderMap>,
connection_close: bool,

6
sgl-model-gateway/src/routers/http/router.rs
View File

@@ -159,7 +159,7 @@ impl Router {
&self,
headers: Option<&HeaderMap>,
typed_req: &T,
route: &str,
route: &'static str,
model_id: Option<&str>,
) -> Response {
let start = Instant::now();
@@ -210,7 +210,7 @@ impl Router {
&self,
headers: Option<&HeaderMap>,
typed_req: &T,
route: &str,
route: &'static str,
model_id: Option<&str>,
is_stream: bool,
text: &str,
@@ -418,7 +418,7 @@ impl Router {
&self,
headers: Option<&HeaderMap>,
typed_req: &T,
route: &str,
route: &'static str,
worker_url: &str,
is_stream: bool,
load_incremented: bool, // Whether load was incremented for this request