Use ctx.waitUntil to report metrics

Author: pyropy

.gitignore

@@ -12,3 +12,4 @@ node_modules/
 .wrangler
 data/
 config/
+wranger.toml

index.js

@@ -4,19 +4,12 @@ const INFLUX_HOST = process.env.INFLUX_HOST || 'http://localhost:8086';
 const INFLUX_TOKEN = process.env.INFLUX_TOKEN || '';
 const INFLUX_DATABASE = process.env.INFLUX_DATABASE || '';
 
-async function handleRequest(request, env, ctx) {
-  return await fetch(request);
-}
-
 async function formatMetricPoint(request) {
   const url = new URL(request.url);
   const today = new Date();
-
   const origin = request.headers.get("origin") ?? "";
   const cache = request.headers.get("cf-cache-status") ?? "unknown";
   const service = new URL(origin).hostname.replaceAll(".", "-");
-
-
   const point = new Point('request')
     .tag('url', url.toString())
     .tag('hostname', url.hostname)
@@ -29,19 +22,17 @@ async function formatMetricPoint(request) {
   return point;
 }
 
-async function handleMetrics(events, env, ctx) {
+async function reportMetric(request) {
   const client = new InfluxDBClient({ host: INFLUX_HOST, token: INFLUX_TOKEN });
-  for (const event of events) {
-    const point = formatMetricPoint(event.request);
-
-    console.log(point)
-    await client.write(INFLUX_DATABASE, point);
-  }
-
-  await writeApi.close()
+  const point = formatMetricPoint(request);
+  await client.write(INFLUX_DATABASE, point);
+  await client.close()
 }
 
 export default {
-  fetch: handleRequest,
-  tail: handleMetrics,
+  async fetch(request, env, ctx) {
+    const resp = await fetch(request);
+    ctx.waitUntil(reportMetric(request));
+    return resp;
+  }
 }

wrangler.toml renamed to wrangler.toml.example

@@ -1,10 +1,7 @@
-#:schema node_modules/wrangler/config-schema.json
 name = "cf-metrics"
-tail_consumers = [{service = "cf-metrics-tail"}]
 main = "index.js"
 compatibility_date = "2024-12-05"
 compatibility_flags = ["nodejs_compat"]
-send_metrics = false
 
 [vars]
 INFLUX_URL = "http://localhost:8086"