Improve traffic and error capturing

README.md

@@ -47,7 +47,28 @@ no further configuration is required.
 
 Otherwise create a dataset and an API token in [Axiom settings](https://app.axiom.co/settings/profile), then export them as environment variables `NEXT_PUBLIC_AXIOM_DATASET` and `NEXT_PUBLIC_AXIOM_TOKEN`.
 
-## Usage
+
+## Capture traffic requests
+
+Create or edit the `middleware.ts` in the root directory of your app:
+
+```typescript
+import { Logger } from 'next-axiom'
+import { NextResponse } from 'next/server'
+import type { NextFetchEvent, NextRequest } from 'next/server'
+
+export async function middleware(request: NextRequest, event: NextFetchEvent) {
+    const logger = new Logger({ source: 'middleware' });
+    logger.middleware(request)
+
+    event.waitUntil(logger.flush())
+    return NextResponse.next()
+}
+
+
+export const config = {
+}
+```
 
 ### Web Vitals
 
@@ -157,6 +178,55 @@ const logger = new Logger({
     console.log(event.message);
   },
 });
+
+
+### Capturing Errors
+
+To capture routing errors we can use the [Error Handling](https://nextjs.org/docs/app/building-your-application/routing/error-handling) mechanism of Next. 
+
+Create or edit the `error.tsx` file under your `/app` directory. Inside your component function use the logger to ingest the error to Axiom. 
+
+Example:
+
+```typescript
+"use client";
+
+import NavTable from "@/components/NavTable";
+import { LogLevel } from "@/next-axiom/logger";
+import { useLogger } from "next-axiom";
+import { usePathname } from "next/navigation";
+
+export default function ErrorPage({
+  error,
+}: {
+  error: Error & { digest?: string };
+}) {
+  const pathname = usePathname()
+  const log = useLogger({ source: "error.tsx" });
+  let status =  error.message == 'Invalid URL' ? 404 : 500;
+
+  log.logHttpRequest(
+    LogLevel.error,
+    error.message,
+    {
+      host: window.location.href,
+      path: pathname,
+      statusCode: status,
+    },
+    {
+      error: error.name,
+      cause: error.cause,
+      stack: error.stack,
+      digest: error.digest,
+    },
+  );
+
+  return (
+    <div>
+      Ops! An Error has occurred:{" "}
+    </div>
+  );
+}
 ```
 
 ## Upgrade to the App Router

examples/logger/error.tsx

@@ -0,0 +1,38 @@
+"use client";
+
+import NavTable from "@/components/NavTable";
+import { LogLevel } from "@/next-axiom/logger";
+import { useLogger } from "next-axiom";
+import { usePathname } from "next/navigation";
+
+export default function ErrorPage({
+  error,
+}: {
+  error: Error & { digest?: string };
+}) {
+  const pathname = usePathname()
+  const log = useLogger({ source: "error.tsx" });
+  let status =  error.message == 'Invalid URL' ? 404 : 500;
+
+  log.logHttpRequest(
+    LogLevel.error,
+    error.message,
+    {
+      host: window.location.href,
+      path: pathname,
+      statusCode: status,
+    },
+    {
+      error: error.name,
+      cause: error.cause,
+      stack: error.stack,
+      digest: error.digest,
+    },
+  );
+
+  return (
+    <div>
+      Ops! An Error has occurred:{" "}
+    </div>
+  );
+}

examples/logger/middleware.ts

@@ -0,0 +1,14 @@
+import { Logger } from 'next-axiom'
+import { NextResponse } from 'next/server'
+import type { NextFetchEvent, NextRequest } from 'next/server'
+
+export async function middleware(request: NextRequest, event: NextFetchEvent) {
+    const logger = new Logger({ source: 'middleware' });
+    logger.middleware(request)
+
+    event.waitUntil(logger.flush())
+    return NextResponse.next()
+}
+
+export const config = {
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "next-axiom",
   "description": "Send WebVitals from your Next.js project to Axiom.",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "author": "Axiom, Inc.",
   "license": "MIT",
   "contributors": [

src/config.ts

@@ -8,7 +8,10 @@ declare global {
 }
 
 export const Version = require('../package.json').version;
-export const isVercel = process.env.NEXT_PUBLIC_AXIOM_INGEST_ENDPOINT || process.env.AXIOM_INGEST_ENDPOINT;
+// detect if Vercel integration & logdrain is enabled
+export const isVercelIntegration = process.env.NEXT_PUBLIC_AXIOM_INGEST_ENDPOINT || process.env.AXIOM_INGEST_ENDPOINT;
+// detect if app is running on the Vercel platform
+export const isVercel = process.env.NEXT_PUBLIC_VERCEL || process.env.VERCEL;
 export const isNetlify = process.env.NETLIFY == 'true';
 export const isWebWorker =
   typeof self !== 'undefined' &&
@@ -20,7 +23,7 @@ export const isEdgeRuntime = globalThis.EdgeRuntime ? true : false;
 // Detect the platform provider, and return the appropriate config
 // fallback to generic config if no provider is detected
 let config = new GenericConfig();
-if (isVercel) {
+if (isVercelIntegration) {
   config = new VercelConfig();
 } else if (isNetlify) {
   config = new NetlifyConfig();

src/logger.ts

@@ -1,4 +1,5 @@
-import { config, isBrowser, isVercel, Version } from './config';
+import { NextRequest } from 'next/server';
+import { config, isBrowser, isVercelIntegration, Version } from './config';
 import { NetlifyInfo } from './platform/netlify';
 import { isNoPrettyPrint, throttle } from './shared';
 
@@ -12,9 +13,14 @@ export interface LogEvent {
   fields: any;
   _time: string;
   request?: RequestReport;
+  git?: any;
+  source: string;
   platform?: PlatformInfo;
   vercel?: PlatformInfo;
   netlify?: NetlifyInfo;
+  '@app': {
+    'next-axiom-version': string;
+  };
 }
 
 export enum LogLevel {
@@ -27,6 +33,7 @@ export enum LogLevel {
 
 export interface RequestReport {
   startTime: number;
+  endTime: number;
   statusCode?: number;
   ip?: string | null;
   region?: string | null;
@@ -35,13 +42,20 @@ export interface RequestReport {
   method: string;
   scheme: string;
   userAgent?: string | null;
+  durationMs?: number;
 }
 
 export interface PlatformInfo {
   environment?: string;
   region?: string;
   route?: string;
   source?: string;
+  deploymentId?: string;
+  deploymentUrl?: string;
+  commit?: string;
+  project?: string;
+  repo?: string;
+  ref?: string;
 }
 
 export type LoggerConfig = {
@@ -60,7 +74,7 @@ export class Logger {
   public logLevel: LogLevel = LogLevel.debug;
   public config: LoggerConfig = {
     autoFlush: true,
-    source: 'frontend',
+    source: 'frontend-log',
     prettyPrint: prettyPrint,
   };
 
@@ -98,15 +112,16 @@ export class Logger {
     return new Logger({ ...this.config, req: { ...this.config.req, ...req } });
   };
 
-  _log = (level: LogLevel, message: string, args: { [key: string]: any } = {}) => {
-    if (level < this.logLevel) {
-      return;
-    }
+  private _transformEvent = (level: LogLevel, message: string, args: { [key: string]: any } = {}) => {
     const logEvent: LogEvent = {
       level: LogLevel[level].toString(),
       message,
       _time: new Date(Date.now()).toISOString(),
+      source: this.config.source!,
       fields: this.config.args || {},
+      '@app': {
+        'next-axiom-version': Version,
+      },
     };
 
     // check if passed args is an object, if its not an object, add it to fields.args
@@ -130,6 +145,41 @@ export class Logger {
       }
     }
 
+    return logEvent;
+  };
+
+  logHttpRequest(level: LogLevel, message: string, request: any, args: any) {
+    const logEvent = this._transformEvent(level, message, args);
+    logEvent.request = request;
+    this.logEvents.push(logEvent);
+    if (this.config.autoFlush) {
+      this.throttledSendLogs();
+    }
+  }
+
+  middleware(request: NextRequest) {
+    const req = {
+      ip: request.ip,
+      region: request.geo?.region,
+      method: request.method,
+      host: request.nextUrl.hostname,
+      path: request.nextUrl.pathname,
+      scheme: request.nextUrl.protocol.split(':')[0],
+      referer: request.headers.get('Referer'),
+      userAgent: request.headers.get('user-agent'),
+    };
+
+    const message = `[${request.method}] [middleware: "middleware"] ${request.nextUrl.pathname}`;
+
+    return this.logHttpRequest(LogLevel.info, message, req, {});
+  }
+
+  private _log = (level: LogLevel, message: string, args: { [key: string]: any } = {}) => {
+    if (level < this.logLevel) {
+      return;
+    }
+    const logEvent = this._transformEvent(level, message, args);
+
     this.logEvents.push(logEvent);
     if (this.config.autoFlush) {
       this.throttledSendLogs();
@@ -161,7 +211,7 @@ export class Logger {
     // if vercel integration is enabled, we can utilize the log drain
     // to send logs to Axiom without HTTP.
     // This saves resources and time on lambda and edge functions
-    if (isVercel && (this.config.source === 'edge' || this.config.source === 'lambda')) {
+    if (isVercelIntegration && (this.config.source === 'edge-log' || this.config.source === 'lambda-log')) {
       this.logEvents.forEach((ev) => console.log(JSON.stringify(ev)));
       this.logEvents = [];
       return;
@@ -190,7 +240,7 @@ export class Logger {
       if (typeof fetch === 'undefined') {
         const fetch = await require('whatwg-fetch');
         return fetch(url, reqOptions).catch(console.error);
-      } else if (isBrowser && isVercel && navigator.sendBeacon) {
+      } else if (isBrowser && isVercelIntegration && navigator.sendBeacon) {
         // sendBeacon fails if message size is greater than 64kb, so
         // we fall back to fetch.
         // Navigator has to be bound to ensure it does not error in some browsers

src/platform/base.ts

@@ -1,5 +1,4 @@
 import { NextWebVitalsMetric } from 'next/app';
-import { RequestReport } from '../logger';
 import { EndpointType } from '../shared';
 
 // This is the base class for all platform providers. It contains all the different
@@ -16,7 +15,6 @@ export default interface Provider {
   getIngestURL(t: EndpointType): string;
   wrapWebVitalsObject(metrics: NextWebVitalsMetric[]): any;
   injectPlatformMetadata(logEvent: any, source: string): void;
-  generateRequestMeta(req: any): RequestReport;
   getLogsEndpoint(): string
   getWebVitalsEndpoint(): string
 }