refactor(gateway): shorten logging targets from sgl_model_gateway to smg (#16328)
This commit is contained in:
@@ -217,7 +217,7 @@ impl AuditLogger {
|
|||||||
|
|
||||||
// Log the event
|
// Log the event
|
||||||
info!(
|
info!(
|
||||||
target: "sgl_model_gateway::audit",
|
target: "smg::audit",
|
||||||
timestamp = %event.timestamp.to_rfc3339(),
|
timestamp = %event.timestamp.to_rfc3339(),
|
||||||
principal = %event.principal,
|
principal = %event.principal,
|
||||||
auth_method = %event.auth_method,
|
auth_method = %event.auth_method,
|
||||||
|
|||||||
@@ -280,7 +280,7 @@ impl<B> MakeSpan<B> for RequestSpan {
|
|||||||
// Don't try to extract request ID here - it won't be available yet
|
// Don't try to extract request ID here - it won't be available yet
|
||||||
// The RequestIdLayer runs after TraceLayer creates the span
|
// The RequestIdLayer runs after TraceLayer creates the span
|
||||||
info_span!(
|
info_span!(
|
||||||
target: "sgl_model_gateway::otel-trace",
|
target: "smg::otel-trace",
|
||||||
"http_request",
|
"http_request",
|
||||||
method = %request.method(),
|
method = %request.method(),
|
||||||
uri = %request.uri(),
|
uri = %request.uri(),
|
||||||
@@ -289,7 +289,7 @@ impl<B> MakeSpan<B> for RequestSpan {
|
|||||||
status_code = Empty,
|
status_code = Empty,
|
||||||
latency = Empty,
|
latency = Empty,
|
||||||
error = Empty,
|
error = Empty,
|
||||||
module = "sgl_model_gateway"
|
module = "smg"
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -314,7 +314,7 @@ impl<B> OnRequest<B> for RequestLogger {
|
|||||||
|
|
||||||
// Log the request start
|
// Log the request start
|
||||||
info!(
|
info!(
|
||||||
target: "sgl_model_gateway::request",
|
target: "smg::request",
|
||||||
"started processing request"
|
"started processing request"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -353,17 +353,17 @@ impl<B> OnResponse<B> for ResponseLogger {
|
|||||||
let _enter = span.enter();
|
let _enter = span.enter();
|
||||||
if status.is_server_error() {
|
if status.is_server_error() {
|
||||||
error!(
|
error!(
|
||||||
target: "sgl_model_gateway::response",
|
target: "smg::response",
|
||||||
"request failed with server error"
|
"request failed with server error"
|
||||||
);
|
);
|
||||||
} else if status.is_client_error() {
|
} else if status.is_client_error() {
|
||||||
warn!(
|
warn!(
|
||||||
target: "sgl_model_gateway::response",
|
target: "smg::response",
|
||||||
"request failed with client error"
|
"request failed with client error"
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
info!(
|
info!(
|
||||||
target: "sgl_model_gateway::response",
|
target: "smg::response",
|
||||||
"finished processing request"
|
"finished processing request"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ use super::otel_trace::is_otel_enabled;
|
|||||||
/// Module path used by CustomOtelFilter to identify events for OTEL export.
|
/// Module path used by CustomOtelFilter to identify events for OTEL export.
|
||||||
#[inline]
|
#[inline]
|
||||||
pub const fn get_module_path() -> &'static str {
|
pub const fn get_module_path() -> &'static str {
|
||||||
"sgl_model_gateway::observability::events"
|
"smg::observability::events"
|
||||||
}
|
}
|
||||||
|
|
||||||
pub trait Event {
|
pub trait Event {
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ use super::otel_trace::get_otel_layer;
|
|||||||
use crate::config::TraceConfig;
|
use crate::config::TraceConfig;
|
||||||
|
|
||||||
const TIME_FORMAT: &str = "%Y-%m-%d %H:%M:%S";
|
const TIME_FORMAT: &str = "%Y-%m-%d %H:%M:%S";
|
||||||
const DEFAULT_LOG_TARGET: &str = "sgl_model_gateway";
|
const DEFAULT_LOG_TARGET: &str = "smg";
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct LoggingConfig {
|
pub struct LoggingConfig {
|
||||||
@@ -36,7 +36,7 @@ impl Default for LoggingConfig {
|
|||||||
json_format: false,
|
json_format: false,
|
||||||
log_dir: None,
|
log_dir: None,
|
||||||
colorize: true,
|
colorize: true,
|
||||||
log_file_name: "sgl-model-gateway".to_string(),
|
log_file_name: "smg".to_string(),
|
||||||
log_targets: Some(vec![DEFAULT_LOG_TARGET.to_string()]),
|
log_targets: Some(vec![DEFAULT_LOG_TARGET.to_string()]),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,8 +38,8 @@ static ALLOWED_TARGETS: OnceLock<[&'static str; 3]> = OnceLock::new();
|
|||||||
fn get_allowed_targets() -> &'static [&'static str; 3] {
|
fn get_allowed_targets() -> &'static [&'static str; 3] {
|
||||||
ALLOWED_TARGETS.get_or_init(|| {
|
ALLOWED_TARGETS.get_or_init(|| {
|
||||||
[
|
[
|
||||||
"sgl_model_gateway::otel-trace",
|
"smg::otel-trace",
|
||||||
"sgl_model_gateway::observability::otel_trace",
|
"smg::observability::otel_trace",
|
||||||
events_module_path(),
|
events_module_path(),
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
@@ -118,7 +118,7 @@ pub fn otel_tracing_init(enable: bool, otlp_endpoint: Option<&str>) -> Result<()
|
|||||||
|
|
||||||
let resource = Resource::default().merge(&Resource::new(vec![KeyValue::new(
|
let resource = Resource::default().merge(&Resource::new(vec![KeyValue::new(
|
||||||
"service.name",
|
"service.name",
|
||||||
"sgl-router",
|
"smg",
|
||||||
)]));
|
)]));
|
||||||
|
|
||||||
let provider = TracerProvider::builder()
|
let provider = TracerProvider::builder()
|
||||||
@@ -130,7 +130,7 @@ pub fn otel_tracing_init(enable: bool, otlp_endpoint: Option<&str>) -> Result<()
|
|||||||
.set(provider.clone())
|
.set(provider.clone())
|
||||||
.map_err(|_| anyhow::anyhow!("Provider already initialized"))?;
|
.map_err(|_| anyhow::anyhow!("Provider already initialized"))?;
|
||||||
|
|
||||||
let tracer = provider.tracer("sgl-router");
|
let tracer = provider.tracer("smg");
|
||||||
|
|
||||||
TRACER
|
TRACER
|
||||||
.set(tracer)
|
.set(tracer)
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ impl PipelineStage for RequestExecutionStage {
|
|||||||
|
|
||||||
// Create OTEL span for gRPC request execution
|
// Create OTEL span for gRPC request execution
|
||||||
let span = info_span!(
|
let span = info_span!(
|
||||||
target: "sgl_model_gateway::otel-trace",
|
target: "smg::otel-trace",
|
||||||
"grpc_generate",
|
"grpc_generate",
|
||||||
request_id = %request_id,
|
request_id = %request_id,
|
||||||
model = %model,
|
model = %model,
|
||||||
|
|||||||
@@ -688,7 +688,7 @@ pub async fn startup(config: ServerConfig) -> Result<(), Box<dyn std::error::Err
|
|||||||
json_format: false,
|
json_format: false,
|
||||||
log_dir: config.log_dir.clone(),
|
log_dir: config.log_dir.clone(),
|
||||||
colorize: true,
|
colorize: true,
|
||||||
log_file_name: "sgl-model-gateway".to_string(),
|
log_file_name: "smg".to_string(),
|
||||||
log_targets: None,
|
log_targets: None,
|
||||||
},
|
},
|
||||||
config.router_config.trace_config.clone(),
|
config.router_config.trace_config.clone(),
|
||||||
|
|||||||
@@ -185,7 +185,7 @@ impl WasmThreadPool {
|
|||||||
let num_workers = config.thread_pool_size.clamp(1, max_workers);
|
let num_workers = config.thread_pool_size.clamp(1, max_workers);
|
||||||
|
|
||||||
debug!(
|
debug!(
|
||||||
target: "sgl_model_gateway::wasm::runtime",
|
target: "smg::wasm::runtime",
|
||||||
"Initializing WASM runtime with {} workers",
|
"Initializing WASM runtime with {} workers",
|
||||||
num_workers
|
num_workers
|
||||||
);
|
);
|
||||||
@@ -200,7 +200,7 @@ impl WasmThreadPool {
|
|||||||
Ok(rt) => rt,
|
Ok(rt) => rt,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
error!(
|
error!(
|
||||||
target: "sgl_model_gateway::wasm::runtime",
|
target: "smg::wasm::runtime",
|
||||||
worker_id = worker_id,
|
worker_id = worker_id,
|
||||||
"Failed to create tokio runtime: {}",
|
"Failed to create tokio runtime: {}",
|
||||||
e
|
e
|
||||||
@@ -242,7 +242,7 @@ impl WasmThreadPool {
|
|||||||
config: WasmRuntimeConfig,
|
config: WasmRuntimeConfig,
|
||||||
) {
|
) {
|
||||||
debug!(
|
debug!(
|
||||||
target: "sgl_model_gateway::wasm::runtime",
|
target: "smg::wasm::runtime",
|
||||||
worker_id = worker_id,
|
worker_id = worker_id,
|
||||||
thread_id = ?std::thread::current().id(),
|
thread_id = ?std::thread::current().id(),
|
||||||
"Worker started"
|
"Worker started"
|
||||||
@@ -270,7 +270,7 @@ impl WasmThreadPool {
|
|||||||
Ok(engine) => engine,
|
Ok(engine) => engine,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
error!(
|
error!(
|
||||||
target: "sgl_model_gateway::wasm::runtime",
|
target: "smg::wasm::runtime",
|
||||||
worker_id = worker_id,
|
worker_id = worker_id,
|
||||||
"Failed to create engine: {}",
|
"Failed to create engine: {}",
|
||||||
e
|
e
|
||||||
@@ -297,7 +297,7 @@ impl WasmThreadPool {
|
|||||||
});
|
});
|
||||||
|
|
||||||
debug!(
|
debug!(
|
||||||
target: "sgl_model_gateway::wasm::runtime",
|
target: "smg::wasm::runtime",
|
||||||
worker_id = worker_id,
|
worker_id = worker_id,
|
||||||
epoch_interval_ms = EPOCH_INTERVAL_MS,
|
epoch_interval_ms = EPOCH_INTERVAL_MS,
|
||||||
"Epoch incrementer started for timeout enforcement"
|
"Epoch incrementer started for timeout enforcement"
|
||||||
@@ -308,7 +308,7 @@ impl WasmThreadPool {
|
|||||||
Ok(task) => task,
|
Ok(task) => task,
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
debug!(
|
debug!(
|
||||||
target: "sgl_model_gateway::wasm::runtime",
|
target: "smg::wasm::runtime",
|
||||||
worker_id = worker_id,
|
worker_id = worker_id,
|
||||||
"Worker shutting down"
|
"Worker shutting down"
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user