Add Prometheus metrics + Grafana panels for Overpass proxy

Adds four metrics surfaced via the existing /metrics endpoint:
- overpass_cache_events_total{result=hit|miss|coalesced}
- overpass_cache_size (gauge)
- overpass_upstream_duration_seconds (histogram)
- overpass_upstream_requests_total{status} — covers 2xx/4xx/5xx and
  an explicit "error" label for network-level failures

Grafana dashboards/planner.json gets a new row:
- Upstream health (5m 2xx success ratio, red <90%, green >99%)
- Cache hit ratio
- Cache size
- Upstream p95 latency
Plus timeseries panels for cache event breakdown, upstream status
over time, and p50/p95/p99 upstream latency.

The success-rate formula uses clamp_min(..., 1) on the denominator so
it doesn't NaN when traffic is zero.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Ullrich Schäfer 2026-04-18 02:11:54 +02:00
parent febdf6a9d3
commit 62e208d850
No known key found for this signature in database
GPG key ID: A32FF691A0F752D9
3 changed files with 208 additions and 0 deletions

View file

@ -41,4 +41,35 @@ export const brouterRequestDuration = getOrCreate("brouter_request_duration_seco
}),
);
export const overpassCacheEvents = getOrCreate("overpass_cache_events_total", () =>
new client.Counter({
name: "overpass_cache_events_total",
help: "Overpass proxy cache events",
labelNames: ["result"] as const, // hit | miss | coalesced
}),
);
export const overpassCacheSize = getOrCreate("overpass_cache_size", () =>
new client.Gauge({
name: "overpass_cache_size",
help: "Current number of entries in the Overpass proxy cache",
}),
);
export const overpassUpstreamDuration = getOrCreate("overpass_upstream_duration_seconds", () =>
new client.Histogram({
name: "overpass_upstream_duration_seconds",
help: "Duration of upstream Overpass API requests in seconds",
buckets: [0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10],
}),
);
export const overpassUpstreamRequests = getOrCreate("overpass_upstream_requests_total", () =>
new client.Counter({
name: "overpass_upstream_requests_total",
help: "Upstream Overpass API requests by status",
labelNames: ["status"] as const,
}),
);
export const registry = client.register;

View file

@ -1,5 +1,11 @@
import type { Route } from "./+types/api.overpass";
import { checkRateLimit } from "~/lib/rate-limit";
import {
overpassCacheEvents,
overpassCacheSize,
overpassUpstreamDuration,
overpassUpstreamRequests,
} from "~/lib/metrics.server";
const UPSTREAM_URL = process.env.OVERPASS_URL ?? "https://overpass.private.coffee/api/interpreter";
const USER_AGENT = "trails.cool Planner (https://trails.cool; legal@trails.cool)";
@ -36,6 +42,7 @@ function putInCache(key: string, body: string, contentType: string) {
cache.delete(oldest);
}
cache.set(key, { body, contentType, expiresAt: Date.now() + CACHE_TTL_MS });
overpassCacheSize.set(cache.size);
}
export async function action({ request }: Route.ActionArgs) {
@ -56,6 +63,7 @@ export async function action({ request }: Route.ActionArgs) {
// Cache hit: skip rate limit and upstream entirely
const cached = getFromCache(cacheKey);
if (cached) {
overpassCacheEvents.inc({ result: "hit" });
return new Response(cached.body, {
status: 200,
headers: { "Content-Type": cached.contentType, "X-Cache": "hit" },
@ -75,7 +83,9 @@ export async function action({ request }: Route.ActionArgs) {
// same session don't each hit upstream for the identical bbox.
let pending = inFlight.get(cacheKey);
if (!pending) {
overpassCacheEvents.inc({ result: "miss" });
pending = (async () => {
const start = Date.now();
try {
const upstream = await fetch(UPSTREAM_URL, {
method: "POST",
@ -85,6 +95,8 @@ export async function action({ request }: Route.ActionArgs) {
},
body,
});
overpassUpstreamDuration.observe((Date.now() - start) / 1000);
overpassUpstreamRequests.inc({ status: String(upstream.status) });
const responseBody = await upstream.text();
const contentType = upstream.headers.get("content-type") ?? "application/json";
const cacheable = upstream.status === 200 && !responseBody.includes("rate_limited");
@ -94,12 +106,15 @@ export async function action({ request }: Route.ActionArgs) {
}
})();
inFlight.set(cacheKey, pending);
} else {
overpassCacheEvents.inc({ result: "coalesced" });
}
let result;
try {
result = await pending;
} catch {
overpassUpstreamRequests.inc({ status: "error" });
return new Response("Upstream Overpass unavailable", { status: 502 });
}