[model-gateway] Add Layer 3 worker metrics (smg_worker_*) (#15130)
This commit is contained in:
@@ -1,13 +1,13 @@
|
||||
//! Step to remove workers from worker registry.
|
||||
|
||||
use std::sync::Arc;
|
||||
use std::{collections::HashSet, sync::Arc};
|
||||
|
||||
use async_trait::async_trait;
|
||||
use tracing::{debug, warn};
|
||||
|
||||
use crate::{
|
||||
app_context::AppContext,
|
||||
observability::metrics::RouterMetrics,
|
||||
observability::metrics::{RouterMetrics, SmgMetrics},
|
||||
workflow::{StepExecutor, StepResult, WorkflowContext, WorkflowError, WorkflowResult},
|
||||
};
|
||||
|
||||
@@ -27,6 +27,20 @@ impl StepExecutor for RemoveFromWorkerRegistryStep {
|
||||
worker_urls.len()
|
||||
);
|
||||
|
||||
// Collect unique worker configurations before removal for pool size updates
|
||||
let unique_configs: HashSet<_> = worker_urls
|
||||
.iter()
|
||||
.filter_map(|url| app_context.worker_registry.get_by_url(url))
|
||||
.map(|w| {
|
||||
let meta = w.metadata();
|
||||
(
|
||||
meta.worker_type.clone(),
|
||||
meta.connection_mode.clone(),
|
||||
w.model_id().to_string(),
|
||||
)
|
||||
})
|
||||
.collect();
|
||||
|
||||
let mut removed_count = 0;
|
||||
for worker_url in worker_urls.iter() {
|
||||
if app_context
|
||||
@@ -49,9 +63,34 @@ impl StepExecutor for RemoveFromWorkerRegistryStep {
|
||||
debug!("Removed {} worker(s) from registry", removed_count);
|
||||
}
|
||||
|
||||
// Update active workers metric
|
||||
// Update active workers metric (legacy)
|
||||
RouterMetrics::set_active_workers(app_context.worker_registry.len());
|
||||
|
||||
// Update Layer 3 worker pool size metrics for unique configurations
|
||||
for (worker_type, connection_mode, model_id) in unique_configs {
|
||||
// Get labels before moving values into get_workers_filtered
|
||||
let worker_type_label = worker_type.as_metric_label();
|
||||
let connection_mode_label = connection_mode.as_metric_label();
|
||||
|
||||
let pool_size = app_context
|
||||
.worker_registry
|
||||
.get_workers_filtered(
|
||||
Some(&model_id),
|
||||
Some(worker_type),
|
||||
Some(connection_mode),
|
||||
None,
|
||||
false,
|
||||
)
|
||||
.len();
|
||||
|
||||
SmgMetrics::set_worker_pool_size(
|
||||
worker_type_label,
|
||||
connection_mode_label,
|
||||
&model_id,
|
||||
pool_size,
|
||||
);
|
||||
}
|
||||
|
||||
Ok(StepResult::Success)
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
//! Unified worker registration step.
|
||||
|
||||
use std::sync::Arc;
|
||||
use std::{collections::HashSet, sync::Arc};
|
||||
|
||||
use async_trait::async_trait;
|
||||
use tracing::debug;
|
||||
@@ -8,7 +8,7 @@ use tracing::debug;
|
||||
use crate::{
|
||||
app_context::AppContext,
|
||||
core::Worker,
|
||||
observability::metrics::RouterMetrics,
|
||||
observability::metrics::{RouterMetrics, SmgMetrics},
|
||||
workflow::{StepExecutor, StepResult, WorkflowContext, WorkflowResult},
|
||||
};
|
||||
|
||||
@@ -37,9 +37,47 @@ impl StepExecutor for RegisterWorkersStep {
|
||||
worker_ids.push(worker_id);
|
||||
}
|
||||
|
||||
// Update active workers metric
|
||||
// Update active workers metric (legacy)
|
||||
RouterMetrics::set_active_workers(app_context.worker_registry.len());
|
||||
|
||||
// Collect unique worker configurations to avoid redundant metric updates
|
||||
let unique_configs: HashSet<_> = workers
|
||||
.iter()
|
||||
.map(|w| {
|
||||
let meta = w.metadata();
|
||||
(
|
||||
meta.worker_type.clone(),
|
||||
meta.connection_mode.clone(),
|
||||
w.model_id().to_string(),
|
||||
)
|
||||
})
|
||||
.collect();
|
||||
|
||||
// Update Layer 3 worker pool size metrics per unique type/connection/model
|
||||
for (worker_type, connection_mode, model_id) in unique_configs {
|
||||
// Get labels before moving values into get_workers_filtered
|
||||
let worker_type_label = worker_type.as_metric_label();
|
||||
let connection_mode_label = connection_mode.as_metric_label();
|
||||
|
||||
let pool_size = app_context
|
||||
.worker_registry
|
||||
.get_workers_filtered(
|
||||
Some(&model_id),
|
||||
Some(worker_type),
|
||||
Some(connection_mode),
|
||||
None,
|
||||
false,
|
||||
)
|
||||
.len();
|
||||
|
||||
SmgMetrics::set_worker_pool_size(
|
||||
worker_type_label,
|
||||
connection_mode_label,
|
||||
&model_id,
|
||||
pool_size,
|
||||
);
|
||||
}
|
||||
|
||||
context.set("worker_ids", worker_ids);
|
||||
Ok(StepResult::Success)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user