refacto logger to add context headers

package.json

@@ -23,6 +23,7 @@
   },
   "packageManager": "[email protected]",
   "dependencies": {
-    "prom-client": "^15.1.3"
+    "prom-client": "^15.1.3",
+    "uuid": "^10.0.0"
   }
 }

packages/graphql-mesh/custom-plugins/monitor-fetch.ts

@@ -19,10 +19,12 @@ export default ({ options }) => {
 			const start = Date.now();
 			let rawSource = context[info.sourceName]
 			let description = info.parentType._fields[info.path.key].description
-			
+
 			return (fetch: any) => {
 				const duration = Date.now() - start;
 				let fetchInfo = {}
+				let httpStatus=null
+				let url=null
 				if (options.fullFetchInfo) {
 					fetchInfo = {
 						fieldName: info.fieldName,
@@ -42,20 +44,20 @@ export default ({ options }) => {
 						endpoint: rawSource.rawSource.handler.config.endpoint,
 					}
 				}
-				const fetchResponseInfo = {}
+				//const fetchResponseInfo = {}
 				if (fetch.response) {
 
-					fetchResponseInfo['status'] = fetch.response.status
-					fetchResponseInfo['url'] = fetch.response.url
+					httpStatus=fetch.response.status
+					url=fetch.response.url
 					const options = fetch.response.options
 					if (options) {
-						fetchResponseInfo['options'] = {
+						fetchInfo['options'] = {
 							requestId: options.headers['x-request-id'],
 							server: options.headers['server']
 						}
 					}
 				}
-				Logger.onFetch(context.request, fetchInfo, fetchResponseInfo, duration)
+				Logger.onFetch(context.request, url, httpStatus,duration,fetchInfo)
 			};
 		},
 

packages/graphql-mesh/custom-plugins/monitor-yoga.ts

@@ -1,7 +1,7 @@
 import { Plugin } from 'graphql-yoga'
 import { Logger } from '../utils/logger'
 import { GraphQLError } from 'graphql'
-
+import { v4 as uuidv4 } from 'uuid';
 /**
  * monitor plugin in order to get event contextual log and add some security rules
  * useful to :
@@ -31,6 +31,11 @@ export function useYagaMonitoring({ options }): Plugin {
 			const timestamp = new Date().getTime();
 			request.headers.append("requestTimestamp", String(timestamp))
 
+			// add x-request-id in header if not present
+			if (!request.headers.get('x-request-id')){
+				request.headers.append("x-request-id", uuidv4())
+			}
+
 		},
 		onRequestParse(args) {
 			const beforeTimestamp = new Date().getTime();