context class for onRequest callbacks

Author: tanghel

packages/monitoring/src/interceptors/entities/index.ts

@@ -0,0 +1,2 @@
+export * from './logging.interceptor.context';
+export * from './request.cpu.time.interceptor.context';

packages/monitoring/src/interceptors/entities/logging.interceptor.context.ts

@@ -0,0 +1,13 @@
+import { ExecutionContext } from "@nestjs/common";
+
+export class LoggingInterceptorContext {
+  apiFunction: string = '';
+  durationMs: number = 0;
+  origin: string = '';
+  statusCode: number = 0;
+  context!: ExecutionContext;
+
+  constructor(init?: Partial<LoggingInterceptorContext>) {
+    Object.assign(this, init);
+  }
+}

packages/monitoring/src/interceptors/entities/request.cpu.time.interceptor.context.ts

@@ -0,0 +1,11 @@
+import { ExecutionContext } from '@nestjs/common';
+
+export class RequestCpuTimeInterceptorContext {
+  apiFunction: string = '';
+  durationMs: number = 0;
+  context!: ExecutionContext;
+
+  constructor(init?: Partial<RequestCpuTimeInterceptorContext>) {
+    Object.assign(this, init);
+  }
+}

packages/monitoring/src/interceptors/index.ts

@@ -1,3 +1,4 @@
+export * from './entities';
 export * from './log.requests.interceptor';
 export * from './logging.interceptor';
 export * from './request.cpu.time.interceptor';

packages/monitoring/src/interceptors/logging.interceptor.ts

@@ -3,12 +3,13 @@ import { Observable, throwError } from "rxjs";
 import { catchError, tap } from "rxjs/operators";
 import { MetricsService } from "../metrics";
 import { PerformanceProfiler } from "../profilers/performance.profiler";
+import { LoggingInterceptorContext } from "./entities/logging.interceptor.context";
 
 @Injectable()
 export class LoggingInterceptor implements NestInterceptor {
   constructor(
     private readonly metricsService: MetricsService,
-    private readonly onRequest?: (apiFunction: string, durationMs: number, context: ExecutionContext) => void,
+    private readonly onRequest?: (context: LoggingInterceptorContext) => void,
   ) { }
 
   intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
@@ -41,7 +42,13 @@ export class LoggingInterceptor implements NestInterceptor {
           this.metricsService.setApiCall(apiFunction, origin, res.statusCode, profiler.duration);
 
           if (this.onRequest) {
-            this.onRequest(apiFunction, profiler.duration, context);
+            this.onRequest(new LoggingInterceptorContext({
+              apiFunction,
+              durationMs: profiler.duration,
+              origin,
+              statusCode: res.statusCode,
+              context,
+            }));
           }
         }),
         catchError(err => {
@@ -51,7 +58,13 @@ export class LoggingInterceptor implements NestInterceptor {
           this.metricsService.setApiCall(apiFunction, origin, statusCode, profiler.duration);
 
           if (this.onRequest) {
-            this.onRequest(apiFunction, profiler.duration, context);
+            this.onRequest(new LoggingInterceptorContext({
+              apiFunction,
+              durationMs: profiler.duration,
+              origin,
+              statusCode,
+              context,
+            }));
           }
 
           return throwError(() => err);

packages/monitoring/src/interceptors/request.cpu.time.interceptor.ts

@@ -3,12 +3,13 @@ import { Observable, throwError } from "rxjs";
 import { catchError, tap } from 'rxjs/operators';
 import { MetricsService } from '../metrics';
 import { CpuProfiler } from "../profilers/cpu.profiler";
+import { RequestCpuTimeInterceptorContext } from "./entities";
 
 @Injectable()
 export class RequestCpuTimeInterceptor implements NestInterceptor {
   constructor(
     private readonly metricsService: MetricsService,
-    private readonly onRequest?: (apiFunction: string, durationMs: number, context: ExecutionContext) => void,
+    private readonly onRequest?: (context: RequestCpuTimeInterceptorContext) => void,
   ) { }
 
   intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
@@ -31,7 +32,11 @@ export class RequestCpuTimeInterceptor implements NestInterceptor {
           this.metricsService.setApiCpuTime(apiFunction, duration);
 
           if (this.onRequest) {
-            this.onRequest(apiFunction, duration, context);
+            this.onRequest(new RequestCpuTimeInterceptorContext({
+              apiFunction,
+              durationMs: duration,
+              context,
+            }));
           }
 
           if (!request.res.headersSent) {
@@ -43,7 +48,11 @@ export class RequestCpuTimeInterceptor implements NestInterceptor {
           this.metricsService.setApiCpuTime(apiFunction, duration);
 
           if (this.onRequest) {
-            this.onRequest(apiFunction, duration, context);
+            this.onRequest(new RequestCpuTimeInterceptorContext({
+              apiFunction,
+              durationMs: duration,
+              context,
+            }));
           }
 
           if (!request.res.headersSent) {