CI / CI (push) Successful in 41m20s
Closes #64 Replaces the per-pod concurrency semaphore as the effective cap with admission gated on the vLLM engine's own scheduler gauges. ## Why `internal/proxy/proxy.go:119` built a semaphore of 4 slots *inside each gateway process*, and `api-gateway` runs 3 replicas, so the advertised cap was 12 while the engine's `--max-num-seqs` is 4. Nothing coordinated replicas, and the mismatch was invisible because the queue never rejected anything (`queue_full_requests_total 0`). Measured on the engine while investigating a 10-minute TTFT: - `vllm:cache_config_info{num_gpu_blocks="9527",block_size="16"}` = **152,432 tokens** of KV capacity for the whole engine. PP=2 splits layers, so both ranks hold KV for the same tokens — not 2x that. - Uncached prefill runs at **262 tok/s** contended, 525 tok/s over 7d (`vllm:request_prefill_time_seconds_sum/count`). - One request showed `llm_ttft_seconds_sum 590.981 / count 5` at the gateway and a `(480, 960]` s entry in `vllm:request_prefill_time_seconds_bucket`, with engine-side generation throughput at 0.0-0.1 tok/s throughout: a 65k-token prompt costs ~250 s of prefill and starves every other request while it runs. - `vllm:num_preemptions_total = 0`; KV peaked at `0.5399`. Reading the engine's own gauges is global by construction, needs no lock and no new datastore, and it also accounts for callers that never pass the gateway — namespace `poimen` is admitted directly on 80/8080 by `llm-serving-ingress`, and `memory/crates/mem-cli/src/kv_warmer.rs` is such a caller. A distributed lock would have been blind to that traffic. ## Changes - **new `internal/proxy/engine_state.go`** — 2s scrape of `http://<addr>/metrics` on its own client (the proxy transports carry socket options tuned for inference), hand-rolled exposition parse, `Healthy=false` after 3 consecutive failed polls with `engine_state_stale_total` counted once at the transition, and a startup self-check that raises `observer_degraded` and logs at error level instead of degrading to fail-open silently. - **admission gate** (`internal/proxy/scheduler.go`) — parks while `kv_cache_usage_perc >= 0.90` or `running + waiting >= ADMISSION_MAX_INFLIGHT`, bounded by `ADMISSION_MAX_PARK_SECONDS`, then `503 + Retry-After: 5`. Unknown or unhealthy state fails **open** on purpose: a metrics outage must not become an inference outage. - **parked streaming heartbeat** (`internal/proxy/proxy.go`) — `stream: true` requests get 200 + `text/event-stream` and a `: keep-alive` comment every 15s while parked, so a client idle timeout does not kill a request that is legitimately waiting. Non-streaming requests park silently. - **`internal/proxy/router.go`** — extract only the top-level `model` field with a `json.Decoder` token walk instead of unmarshalling the whole body into `map[string]interface{}` (that built the entire `messages`+`tools` tree per request, ~300 KB for a 65k-token prompt). `MaxBodySize` now comes from `MAX_BODY_BYTES`; the model path previously inherited the 100 MB default at `proxy.go:93` against a 512Mi container limit. - **`cmd/gateway/main.go`** — `GOMAXPROCS` from the cgroup CPU quota (cgroup v2 `cpu.max`, v1 fallback). The container is limited to `500m` while Go defaulted to the host core count and was being CFS-throttled. - **`k8s/deployment.yaml`** — `ADMISSION_MAX_PARK_SECONDS=120`, `ADMISSION_OBSERVE_MODELS=reasoning`, `VLLM_MAX_QUEUE_DEPTH=8`, `MAX_BODY_BYTES=1048576`; corrected the `llm-client` comment (the NetworkPolicy selects by namespace now, not by that label). - **deleted `k8s/configmap.yaml`** — absent from `k8s/kustomization.yaml`, and the live ConfigMap of that name carries an unrelated key (`gw-config-fixed.yaml`) plus a stale routing table. - **`internal/observability/`** — `admission_parked_total`, `admission_rejected_total{reason}`, `engine_state_stale_total`, and gauges `vllm_requests_running` / `vllm_kv_usage_perc` (the gateway's own reading, deliberately mirroring the vLLM series so a disagreement is visible) and `observer_degraded`. Names follow the existing convention, which carries no prefix. Out of scope here, in `riotpiao-poimen/homelab#51`: the engine flags (`--max-num-partial-prefills`, `--max-long-partial-prefills`, `--long-prefill-token-threshold`, `--max-num-batched-tokens`, `--max-num-seqs`, `--gpu-memory-utilization`) and the four dashboard panels in `generate-dashboards.py`. ## Verification - `go build ./...` clean, `go vet ./...` clean. - `go test ./...` — 368 tests, 0 failures (baseline on `main` is 368/0). - `structural-check.sh` on the changed files — 0 errors, 1 pre-existing warning (`:latest` image tag). - `go.mod` / `go.sum` byte-identical: no new dependency. Not yet verified: the real-engine load test (2x65k + 15x8k against `reasoning`). That run also produces the number for `ADMISSION_MAX_PARK_SECONDS`, which today is the provisional 120; retuning it is a follow-up since it is env-only and needs no rebuild. ## Accepted risks - **No tests were added** for the observer or the gate (deliberate: production is the test bed). The mitigation is the startup self-check, which is production self-diagnosis rather than a test, plus the `observer_degraded` alert. A parse failure that outlives the first poll logs and surfaces as a metric; it does not silently disable gating without a signal. - **The cap is soft, not hard.** Between polls each replica may admit more than one request, so there is no clean bound. Exposure is low (~11,500 requests over 7d ≈ 1.4/min) and the engine remains the hard limit — a race parks requests in vLLM's queue rather than over-committing KV. - **`ADMISSION_MAX_INFLIGHT` is manually coupled to `--max-num-seqs`** and can drift silently. It defaults to `VLLM_MAX_NUM_SEQS`, and startup logs the effective value. - The first scrape waits one interval, so the first ~2s of admission is ungated (fail-open). Scraping at `Start()` instead would make the gateway contact every observed backend before any request needs one, which is wasted work and a surprising side effect. ## Rollback Revert this commit and redeploy. The admission path is fail-open, so the code can also be neutralised without reverting by unsetting `ADMISSION_OBSERVE_MODELS`. Separately, the orphaned cluster object can be removed by hand: `kubectl delete cm -n api api-gateway-config` (not a code change, deliberately left to a human). --------- Reviewed-on: #65 Co-authored-by: poimen <[email protected]>
243 lines
7.5 KiB
Go
243 lines
7.5 KiB
Go
package observability
|
|
|
|
import (
|
|
"fmt"
|
|
"sort"
|
|
"strings"
|
|
)
|
|
|
|
// PrometheusExporter exports metrics in Prometheus text format
|
|
type PrometheusExporter struct {
|
|
metrics *Metrics
|
|
}
|
|
|
|
// NewPrometheusExporter creates a new Prometheus exporter
|
|
func NewPrometheusExporter(m *Metrics) *PrometheusExporter {
|
|
return &PrometheusExporter{metrics: m}
|
|
}
|
|
|
|
// Export returns metrics in Prometheus text format
|
|
func (p *PrometheusExporter) Export() string {
|
|
var lines []string
|
|
|
|
lines = append(lines, "# HELP llm_ttft_seconds Time to first token for LLM inference (seconds)")
|
|
lines = append(lines, "# TYPE llm_ttft_seconds histogram")
|
|
p.exportTTFT(&lines)
|
|
|
|
lines = append(lines, "# HELP llm_itl_seconds Inter-token latency for LLM inference (seconds)")
|
|
lines = append(lines, "# TYPE llm_itl_seconds histogram")
|
|
p.exportITL(&lines)
|
|
|
|
lines = append(lines, "# HELP llm_tokens_total Total tokens generated")
|
|
lines = append(lines, "# TYPE llm_tokens_total counter")
|
|
p.exportTokens(&lines)
|
|
|
|
lines = append(lines, "# HELP request_duration_seconds Request latency")
|
|
lines = append(lines, "# TYPE request_duration_seconds histogram")
|
|
p.exportRequestDuration(&lines)
|
|
|
|
lines = append(lines, "# HELP queue_full_requests_total Requests rejected due to backend queue saturation")
|
|
lines = append(lines, "# TYPE queue_full_requests_total counter")
|
|
lines = append(lines, fmt.Sprintf("queue_full_requests_total %d", p.metrics.GetQueueFull()))
|
|
|
|
lines = append(lines, "# HELP warmup_requests_delayed_total LLM warmup requests delayed for vLLM slot management")
|
|
lines = append(lines, "# TYPE warmup_requests_delayed_total counter")
|
|
lines = append(lines, fmt.Sprintf("warmup_requests_delayed_total %d", p.metrics.GetWarmupDelayed()))
|
|
|
|
lines = append(lines, "# HELP vllm_prefix_cache_hit_tokens_total vLLM KV prefix cache hit tokens")
|
|
lines = append(lines, "# TYPE vllm_prefix_cache_hit_tokens_total counter")
|
|
lines = append(lines, fmt.Sprintf("vllm_prefix_cache_hit_tokens_total %d", p.metrics.GetPrefixCacheHitTokens()))
|
|
|
|
lines = append(lines, "# HELP admission_parked_total Requests parked waiting for engine admission")
|
|
lines = append(lines, "# TYPE admission_parked_total counter")
|
|
lines = append(lines, fmt.Sprintf("admission_parked_total %d", p.metrics.GetAdmissionParked()))
|
|
|
|
lines = append(lines, "# HELP admission_rejected_total Requests rejected by engine admission control")
|
|
lines = append(lines, "# TYPE admission_rejected_total counter")
|
|
rejected := p.metrics.GetAdmissionRejected()
|
|
reasons := make([]string, 0, len(rejected))
|
|
for reason := range rejected {
|
|
reasons = append(reasons, reason)
|
|
}
|
|
sort.Strings(reasons)
|
|
for _, reason := range reasons {
|
|
lines = append(lines, fmt.Sprintf(`admission_rejected_total{reason="%s"} %d`, reason, rejected[reason]))
|
|
}
|
|
|
|
lines = append(lines, "# HELP engine_state_stale_total Times the engine metrics feed went stale")
|
|
lines = append(lines, "# TYPE engine_state_stale_total counter")
|
|
lines = append(lines, fmt.Sprintf("engine_state_stale_total %d", p.metrics.GetEngineStateStale()))
|
|
|
|
lines = append(lines, "# HELP vllm_requests_running vLLM requests running as read by the gateway")
|
|
lines = append(lines, "# TYPE vllm_requests_running gauge")
|
|
lines = append(lines, fmt.Sprintf("vllm_requests_running %d", p.metrics.GetVLLMRequestsRunning()))
|
|
|
|
lines = append(lines, "# HELP vllm_kv_usage_perc vLLM KV cache usage fraction as read by the gateway")
|
|
lines = append(lines, "# TYPE vllm_kv_usage_perc gauge")
|
|
lines = append(lines, fmt.Sprintf("vllm_kv_usage_perc %g", p.metrics.GetVLLMKVUsagePerc()))
|
|
|
|
lines = append(lines, "# HELP observer_degraded Engine metrics observer startup self-check failed (1) or healthy (0)")
|
|
lines = append(lines, "# TYPE observer_degraded gauge")
|
|
lines = append(lines, fmt.Sprintf("observer_degraded %d", p.metrics.GetObserverDegraded()))
|
|
|
|
return strings.Join(lines, "\n") + "\n"
|
|
}
|
|
|
|
func (p *PrometheusExporter) exportTTFT(lines *[]string) {
|
|
p.metrics.mu.RLock()
|
|
defer p.metrics.mu.RUnlock()
|
|
|
|
// Calculate statistics for each model
|
|
for key, samples := range p.metrics.ttftMs {
|
|
if len(samples) == 0 {
|
|
continue
|
|
}
|
|
|
|
model := extractModel(key)
|
|
sum := sumInt64(samples)
|
|
|
|
// Export histogram buckets (in seconds)
|
|
buckets := []float64{0.001, 0.01, 0.05, 0.1, 0.5, 1.0, 5.0}
|
|
for _, bucket := range buckets {
|
|
count := countLessOrEqual(samples, int64(bucket*1000))
|
|
*lines = append(*lines, fmt.Sprintf(
|
|
`llm_ttft_seconds_bucket{model="%s",le="%.3f"} %d`,
|
|
model, bucket, count,
|
|
))
|
|
}
|
|
|
|
*lines = append(*lines, fmt.Sprintf(
|
|
`llm_ttft_seconds_bucket{model="%s",le="+Inf"} %d`,
|
|
model, len(samples),
|
|
))
|
|
*lines = append(*lines, fmt.Sprintf(
|
|
`llm_ttft_seconds_sum{model="%s"} %.3f`,
|
|
model, float64(sum)/1000,
|
|
))
|
|
*lines = append(*lines, fmt.Sprintf(
|
|
`llm_ttft_seconds_count{model="%s"} %d`,
|
|
model, len(samples),
|
|
))
|
|
}
|
|
}
|
|
|
|
func (p *PrometheusExporter) exportITL(lines *[]string) {
|
|
p.metrics.mu.RLock()
|
|
defer p.metrics.mu.RUnlock()
|
|
|
|
for key, samples := range p.metrics.itlMs {
|
|
if len(samples) == 0 {
|
|
continue
|
|
}
|
|
|
|
model := extractModel(key)
|
|
sum := sumInt64(samples)
|
|
|
|
// Export histogram buckets (in seconds)
|
|
buckets := []float64{0.001, 0.01, 0.05, 0.1, 0.5, 1.0, 5.0}
|
|
for _, bucket := range buckets {
|
|
count := countLessOrEqual(samples, int64(bucket*1000))
|
|
*lines = append(*lines, fmt.Sprintf(
|
|
`llm_itl_seconds_bucket{model="%s",le="%.3f"} %d`,
|
|
model, bucket, count,
|
|
))
|
|
}
|
|
|
|
*lines = append(*lines, fmt.Sprintf(
|
|
`llm_itl_seconds_bucket{model="%s",le="+Inf"} %d`,
|
|
model, len(samples),
|
|
))
|
|
*lines = append(*lines, fmt.Sprintf(
|
|
`llm_itl_seconds_sum{model="%s"} %.3f`,
|
|
model, float64(sum)/1000,
|
|
))
|
|
*lines = append(*lines, fmt.Sprintf(
|
|
`llm_itl_seconds_count{model="%s"} %d`,
|
|
model, len(samples),
|
|
))
|
|
}
|
|
}
|
|
|
|
func (p *PrometheusExporter) exportTokens(lines *[]string) {
|
|
p.metrics.mu.RLock()
|
|
defer p.metrics.mu.RUnlock()
|
|
|
|
// Sort keys for consistent output
|
|
var keys []string
|
|
for k := range p.metrics.tokenCount {
|
|
keys = append(keys, k)
|
|
}
|
|
sort.Strings(keys)
|
|
|
|
for _, key := range keys {
|
|
model := extractModel(key)
|
|
count := p.metrics.tokenCount[key]
|
|
*lines = append(*lines, fmt.Sprintf(
|
|
`llm_tokens_total{model="%s"} %d`,
|
|
model, count,
|
|
))
|
|
}
|
|
}
|
|
|
|
func (p *PrometheusExporter) exportRequestDuration(lines *[]string) {
|
|
p.metrics.mu.RLock()
|
|
defer p.metrics.mu.RUnlock()
|
|
|
|
// Sort keys for consistent output
|
|
var keys []string
|
|
for k := range p.metrics.requestDuration {
|
|
keys = append(keys, k)
|
|
}
|
|
sort.Strings(keys)
|
|
|
|
for _, key := range keys {
|
|
route, upstream := parseKey(key)
|
|
totalMs := p.metrics.requestDuration[key]
|
|
count := int64(1) // We'd need to track count separately in real impl
|
|
|
|
if buckets, ok := p.metrics.requestDurationBuckets[key]; ok {
|
|
for bucket := range buckets {
|
|
*lines = append(*lines, fmt.Sprintf(
|
|
`request_duration_seconds_bucket{route="%s",upstream="%s",le="%.1f"} %d`,
|
|
route, upstream, bucket, buckets[bucket],
|
|
))
|
|
}
|
|
}
|
|
|
|
*lines = append(*lines, fmt.Sprintf(
|
|
`request_duration_seconds_sum{route="%s",upstream="%s"} %.3f`,
|
|
route, upstream, float64(totalMs)/1000,
|
|
))
|
|
*lines = append(*lines, fmt.Sprintf(
|
|
`request_duration_seconds_count{route="%s",upstream="%s"} %d`,
|
|
route, upstream, count,
|
|
))
|
|
}
|
|
}
|
|
|
|
func extractModel(key string) string {
|
|
parts := strings.Split(key, ":")
|
|
if len(parts) >= 3 {
|
|
return parts[2]
|
|
}
|
|
return key
|
|
}
|
|
|
|
func parseKey(key string) (string, string) {
|
|
parts := strings.Split(key, ":")
|
|
if len(parts) >= 2 {
|
|
return parts[0], parts[1]
|
|
}
|
|
return key, ""
|
|
}
|
|
|
|
func countLessOrEqual(samples []int64, threshold int64) int {
|
|
count := 0
|
|
for _, s := range samples {
|
|
if s <= threshold {
|
|
count++
|
|
}
|
|
}
|
|
return count
|
|
}
|