Skip to content

Commit 60cc3e3

Browse files
committed
fix(metrics): rename Prometheus metrics from mlx_server_ to swiftlm_ prefix
1 parent 1f7087b commit 60cc3e3

2 files changed

Lines changed: 38 additions & 38 deletions

File tree

Sources/SwiftLM/Server.swift

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -548,30 +548,30 @@ struct MLXServer: AsyncParsableCommand {
548548
let snapshot = await stats.snapshot()
549549
let uptime = snapshot.uptimeSeconds
550550
var lines: [String] = []
551-
lines.append("# HELP mlx_server_requests_total Total requests processed")
552-
lines.append("# TYPE mlx_server_requests_total counter")
553-
lines.append("mlx_server_requests_total \(snapshot.requestsTotal)")
554-
lines.append("# HELP mlx_server_requests_active Currently active requests")
555-
lines.append("# TYPE mlx_server_requests_active gauge")
556-
lines.append("mlx_server_requests_active \(snapshot.requestsActive)")
557-
lines.append("# HELP mlx_server_tokens_generated_total Total tokens generated")
558-
lines.append("# TYPE mlx_server_tokens_generated_total counter")
559-
lines.append("mlx_server_tokens_generated_total \(snapshot.tokensGenerated)")
560-
lines.append("# HELP mlx_server_tokens_per_second Average token generation rate")
561-
lines.append("# TYPE mlx_server_tokens_per_second gauge")
562-
lines.append("mlx_server_tokens_per_second \(String(format: "%.2f", snapshot.avgTokensPerSec))")
563-
lines.append("# HELP mlx_server_memory_active_bytes Active GPU memory usage")
564-
lines.append("# TYPE mlx_server_memory_active_bytes gauge")
565-
lines.append("mlx_server_memory_active_bytes \(activeMemBytes)")
566-
lines.append("# HELP mlx_server_memory_peak_bytes Peak GPU memory usage")
567-
lines.append("# TYPE mlx_server_memory_peak_bytes gauge")
568-
lines.append("mlx_server_memory_peak_bytes \(peakMemBytes)")
569-
lines.append("# HELP mlx_server_memory_cache_bytes Cached GPU memory")
570-
lines.append("# TYPE mlx_server_memory_cache_bytes gauge")
571-
lines.append("mlx_server_memory_cache_bytes \(cacheMemBytes)")
572-
lines.append("# HELP mlx_server_uptime_seconds Server uptime")
573-
lines.append("# TYPE mlx_server_uptime_seconds gauge")
574-
lines.append("mlx_server_uptime_seconds \(String(format: "%.0f", uptime))")
551+
lines.append("# HELP swiftlm_requests_total Total requests processed")
552+
lines.append("# TYPE swiftlm_requests_total counter")
553+
lines.append("swiftlm_requests_total \(snapshot.requestsTotal)")
554+
lines.append("# HELP swiftlm_requests_active Currently active requests")
555+
lines.append("# TYPE swiftlm_requests_active gauge")
556+
lines.append("swiftlm_requests_active \(snapshot.requestsActive)")
557+
lines.append("# HELP swiftlm_tokens_generated_total Total tokens generated")
558+
lines.append("# TYPE swiftlm_tokens_generated_total counter")
559+
lines.append("swiftlm_tokens_generated_total \(snapshot.tokensGenerated)")
560+
lines.append("# HELP swiftlm_tokens_per_second Average token generation rate")
561+
lines.append("# TYPE swiftlm_tokens_per_second gauge")
562+
lines.append("swiftlm_tokens_per_second \(String(format: "%.2f", snapshot.avgTokensPerSec))")
563+
lines.append("# HELP swiftlm_memory_active_bytes Active GPU memory usage")
564+
lines.append("# TYPE swiftlm_memory_active_bytes gauge")
565+
lines.append("swiftlm_memory_active_bytes \(activeMemBytes)")
566+
lines.append("# HELP swiftlm_memory_peak_bytes Peak GPU memory usage")
567+
lines.append("# TYPE swiftlm_memory_peak_bytes gauge")
568+
lines.append("swiftlm_memory_peak_bytes \(peakMemBytes)")
569+
lines.append("# HELP swiftlm_memory_cache_bytes Cached GPU memory")
570+
lines.append("# TYPE swiftlm_memory_cache_bytes gauge")
571+
lines.append("swiftlm_memory_cache_bytes \(cacheMemBytes)")
572+
lines.append("# HELP swiftlm_uptime_seconds Server uptime")
573+
lines.append("# TYPE swiftlm_uptime_seconds gauge")
574+
lines.append("swiftlm_uptime_seconds \(String(format: "%.0f", uptime))")
575575
lines.append("")
576576
let metrics = lines.joined(separator: "\n")
577577
return Response(

tests/test-server.sh

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -496,28 +496,28 @@ log "Test 19: /metrics Prometheus endpoint"
496496

497497
METRICS_RESP=$(curl -sf "$URL/metrics")
498498

499-
if echo "$METRICS_RESP" | grep -q "mlx_server_requests_total"; then
500-
pass "Metrics: contains mlx_server_requests_total"
499+
if echo "$METRICS_RESP" | grep -q "swiftlm_requests_total"; then
500+
pass "Metrics: contains swiftlm_requests_total"
501501
else
502-
fail "Metrics: missing mlx_server_requests_total"
502+
fail "Metrics: missing swiftlm_requests_total"
503503
fi
504504

505-
if echo "$METRICS_RESP" | grep -q "mlx_server_memory_active_bytes"; then
506-
pass "Metrics: contains mlx_server_memory_active_bytes"
505+
if echo "$METRICS_RESP" | grep -q "swiftlm_memory_active_bytes"; then
506+
pass "Metrics: contains swiftlm_memory_active_bytes"
507507
else
508-
fail "Metrics: missing mlx_server_memory_active_bytes"
508+
fail "Metrics: missing swiftlm_memory_active_bytes"
509509
fi
510510

511-
if echo "$METRICS_RESP" | grep -q "mlx_server_tokens_per_second"; then
512-
pass "Metrics: contains mlx_server_tokens_per_second"
511+
if echo "$METRICS_RESP" | grep -q "swiftlm_tokens_per_second"; then
512+
pass "Metrics: contains swiftlm_tokens_per_second"
513513
else
514-
fail "Metrics: missing mlx_server_tokens_per_second"
514+
fail "Metrics: missing swiftlm_tokens_per_second"
515515
fi
516516

517-
if echo "$METRICS_RESP" | grep -q "mlx_server_uptime_seconds"; then
518-
pass "Metrics: contains mlx_server_uptime_seconds"
517+
if echo "$METRICS_RESP" | grep -q "swiftlm_uptime_seconds"; then
518+
pass "Metrics: contains swiftlm_uptime_seconds"
519519
else
520-
fail "Metrics: missing mlx_server_uptime_seconds"
520+
fail "Metrics: missing swiftlm_uptime_seconds"
521521
fi
522522

523523
# Verify Prometheus format (TYPE and HELP comments)
@@ -895,15 +895,15 @@ log "Test 29: Metrics counter accumulation"
895895

896896
# Get baseline token count before test requests
897897
METRICS_BEFORE=$(curl -sf "$URL/metrics")
898-
TOKENS_BEFORE=$(echo "$METRICS_BEFORE" | grep "mlx_server_tokens_generated_total" | grep -v "^#" | awk '{print $2}' || echo 0)
898+
TOKENS_BEFORE=$(echo "$METRICS_BEFORE" | grep "swiftlm_tokens_generated_total" | grep -v "^#" | awk '{print $2}' || echo 0)
899899

900900
# Make a request to generate tokens
901901
curl -sf -X POST "$URL/v1/chat/completions" \
902902
-H "Content-Type: application/json" \
903903
-d "{\"model\":\"$MODEL\",\"max_tokens\":20,\"messages\":[{\"role\":\"user\",\"content\":\"Count to five.\"}]}" > /dev/null
904904

905905
METRICS_AFTER=$(curl -sf "$URL/metrics")
906-
TOKENS_AFTER=$(echo "$METRICS_AFTER" | grep "mlx_server_tokens_generated_total" | grep -v "^#" | awk '{print $2}' || echo 0)
906+
TOKENS_AFTER=$(echo "$METRICS_AFTER" | grep "swiftlm_tokens_generated_total" | grep -v "^#" | awk '{print $2}' || echo 0)
907907

908908
if [ "${TOKENS_AFTER:-0}" -gt "${TOKENS_BEFORE:-0}" ] 2>/dev/null; then
909909
pass "Metrics counter: tokens_generated increased ($TOKENS_BEFORE$TOKENS_AFTER)"

0 commit comments

Comments
 (0)