attach request info along with printing edge report

src/logger.ts

@@ -12,11 +12,27 @@ interface LogEvent {
   request?: any;
 }
 
+export interface RequestReport {
+  startTime: number;
+  statusCode?: number;
+  ip?: string;
+  region?: string;
+  path: string;
+  host: string;
+  method: string;
+  scheme: string;
+  userAgent?: string | null;
+}
+
 export class Logger {
   public logEvents: any[] = [];
   throttledSendLogs = throttle(this.sendLogs, 1000);
 
-  constructor(private args: any = {}, private req: NextRequest | null = null, private waitForFlush: Boolean = false) {}
+  constructor(
+    private args: any = {},
+    private req: RequestReport | null = null,
+    private waitForFlush: Boolean = false
+  ) {}
 
   debug(message: string, args: any = {}) {
     this._log('debug', message, { ...this.args, ...args });
@@ -35,7 +51,7 @@ export class Logger {
     return new Logger({ ...this.args, ...args }, this.req, this.waitForFlush);
   }
 
-  withRequest(req: NextRequest) {
+  withRequest(req: RequestReport) {
     return new Logger({ ...this.args }, req, this.waitForFlush);
   }
 
@@ -46,15 +62,7 @@ export class Logger {
     }
 
     if (this.req != null) {
-      logEvent['request'] = {
-        ip: this.req.ip,
-        region: this.req.geo?.region,
-        host: this.req.nextUrl.host,
-        method: this.req.method,
-        path: this.req.nextUrl.pathname,
-        scheme: this.req.nextUrl.protocol.replace(':', ''),
-        userAgent: this.req.headers.get('user-agent'),
-      };
+      logEvent['request'] = this.req;
     }
 
     this.logEvents.push(logEvent);

src/withAxiom.ts

@@ -3,25 +3,13 @@
 import { NextConfig, NextApiHandler, NextApiResponse, NextApiRequest } from 'next';
 import { NextFetchEvent, NextMiddleware, NextRequest } from 'next/server';
 import { NextMiddlewareResult } from 'next/dist/server/web/types';
-import { Logger } from './logger';
+import { Logger, RequestReport } from './logger';
 import { proxyPath, EndpointType, getIngestURL } from './shared';
 
 declare global {
   var EdgeRuntime: string;
 }
 
-interface RequestReport {
-  startTime: number;
-  statusCode?: number;
-  ip?: string;
-  region?: string;
-  path: string;
-  host: string;
-  method: string;
-  scheme: string;
-  userAgent?: string | null;
-}
-
 function withAxiomNextConfig(nextConfig: NextConfig): NextConfig {
   return {
     ...nextConfig,
@@ -148,7 +136,7 @@ function withAxiomNextEdgeFunction(handler: NextMiddleware): NextMiddleware {
       userAgent: req.headers.get('user-agent'),
     };
 
-    const logger = new Logger({}, req, true);
+    const logger = new Logger({}, report, true);
     const axiomRequest = req as AxiomRequest;
     axiomRequest.log = logger;