Merge pull request #447 from OpenFn/http-logging

Add better HTTP logging

Author: josephjclark

.changeset/hungry-onions-rhyme.md

@@ -0,0 +1,5 @@
+---
+"apollo": patch
+---
+
+Add HTTP logs to the server

.changeset/strict-maps-judge.md

@@ -0,0 +1,5 @@
+---
+"apollo": patch
+---
+
+echo: fix an issue which prevented the service from running

platform/src/bridge.ts

@@ -13,7 +13,7 @@ import { rm } from "node:fs/promises";
 export const run = async (
   scriptName: string,
   port: number, // needed for self-calling services in pythonland
-  args: JSON,
+  args: any = {},
   onLog?: (str: string) => void,
   onEvent?: (type: string, payload: any /* string or json tbh */) => void
 ) => {
@@ -25,10 +25,10 @@ export const run = async (
     const inputPath = tmpfile.replace("{}", "input");
     const outputPath = tmpfile.replace("{}", "output");
 
-    console.log("Initing input file at", inputPath);
+    // console.log("Initing input file at", inputPath);
     await Bun.write(inputPath, JSON.stringify(args));
 
-    console.log("Initing output file at", outputPath);
+    // console.log("Initing output file at", outputPath);
     await Bun.write(outputPath, "");
 
     const proc = spawn(

platform/src/middleware/services.ts

@@ -33,7 +33,7 @@ export default async (app: Elysia, port: number) => {
 
       // simple post
       app.post(name, async (ctx) => {
-        console.log(`POST to /services/${name}`);
+        console.log(`Calling /services/${name}`);
         const payload = ctx.body;
         const result = await callService(m, port, payload as any);
 
@@ -51,7 +51,7 @@ export default async (app: Elysia, port: number) => {
 
       // HTTP streaming
       app.post(`${name}/stream`, async (ctx) => {
-        console.log(`HTTP stream connnected to ${name}`);
+        console.log(`HTTP stream connected to ${name}`);
         const payload = ctx.body;
 
         const stream = new ReadableStream({

platform/src/server.ts

@@ -4,12 +4,16 @@ import setupDir from "./middleware/dir";
 import setupHealthcheck from "./middleware/healthcheck";
 import setupServices from "./middleware/services";
 import { html } from "@elysiajs/html";
+import logRequest from "./util/log-request";
 
 export default async (port: number | string = 3000) => {
   const app = new Elysia();
 
   app.use(html());
 
+  app.derive(() => ({ start: Date.now() }));
+  app.onAfterHandle(logRequest);
+
   await setupHealthcheck(app);
   await setupDir(app);
   await setupServices(app, +port);

platform/src/util/log-request.ts

@@ -0,0 +1,16 @@
+export default ({
+  request,
+  set,
+  start,
+}: {
+  request: Request;
+  set: { status?: number | string };
+  start: number;
+}) => {
+  const duration = Date.now() - start;
+  console.log(
+    `http: ${request.method} ${new URL(request.url).pathname} → ${
+      set.status ?? 200
+    } in ${duration}ms`
+  );
+};

services/echo/echo.py

@@ -1,11 +1,7 @@
 from .log import log
-from util import EventLogger
-
-evt = EventLogger()
 
 # Simple python service to echo requests back to the caller
 # Used in test
 def main(x):
     log(x)
-    evt.send_status("{ msg: "+ str(x) +" }")
     return x