azify-logger 1.0.28 → 1.0.29

package/middleware-fastify.js

@@ -0,0 +1,348 @@
+const { startRequestContext } = require('./store')
+const { createHttpLoggerTransport } = require('./streams/httpQueue')
+const os = require('os')
+
+function fastUUID() {
+  const timestamp = Date.now().toString(36)
+  const randomPart = Math.random().toString(36).substring(2, 15)
+  const randomPart2 = Math.random().toString(36).substring(2, 15)
+  return `${timestamp}-${randomPart}-${randomPart2}`.substring(0, 36)
+}
+
+function sanitizeTraceHex(value) {
+  if (!value || typeof value !== 'string') return null
+  const hex = value.replace(/[^0-9a-fA-F]/g, '').toLowerCase()
+  if (!hex) return null
+  return hex.padEnd(32, '0').slice(0, 32)
+}
+
+function safeSerializeBody(payload) {
+  if (payload == null) return ''
+  if (typeof payload === 'string') return payload
+  if (Buffer.isBuffer(payload)) return payload.toString('utf8')
+  try {
+    return JSON.stringify(payload)
+  } catch (err) {
+    try {
+      return String(payload)
+    } catch {
+      return ''
+    }
+  }
+}
+
+const HEADER_WHITELIST = new Set([
+  'content-type',
+  'content-length',
+  'accept',
+  'accept-encoding',
+  'user-agent',
+  'host',
+  'x-request-id',
+  'x-trace-id',
+  'x-span-id',
+  'x-parent-span-id'
+])
+
+function pickHeaders(source) {
+  if (!source || typeof source !== 'object') {
+    return {}
+  }
+  const result = {}
+  for (const key in source) {
+    const lower = key.toLowerCase()
+    if (!HEADER_WHITELIST.has(lower)) continue
+    
+    if (!Object.prototype.hasOwnProperty.call(source, key)) continue
+    
+    const value = source[key]
+    if (Array.isArray(value)) {
+      result[key] = value.map(String)
+    } else if (value != null) {
+      result[key] = String(value)
+    }
+  }
+  return result
+}
+
+function createFastifyLoggingPlugin(options = {}) {
+  const config = {
+    serviceName: options.serviceName || process.env.APP_NAME,
+    loggerUrl: options.loggerUrl || process.env.AZIFY_LOGGER_URL || 'http://localhost:3001/log',
+    environment: options.environment || process.env.NODE_ENV,
+    captureResponseBody: options.captureResponseBody !== false && process.env.AZIFY_LOGGER_CAPTURE_RESPONSE_BODY !== 'false',
+    captureRequestBody: options.captureRequestBody !== false && process.env.AZIFY_LOGGER_CAPTURE_REQUEST_BODY !== 'false',
+    logRequest: options.logRequest !== false && process.env.AZIFY_LOGGER_LOG_REQUEST !== 'false',
+    captureHeaders: options.captureHeaders !== undefined ? options.captureHeaders : process.env.AZIFY_LOGGER_CAPTURE_HEADERS === 'true'
+  }
+
+  const transport = createHttpLoggerTransport(config.loggerUrl, {})
+  const hostname = os.hostname()
+  const serviceObj = config.serviceName ? { name: config.serviceName, version: '1.0.0' } : null
+
+  function sendLog(level, message, meta = {}) {
+    if (!transport || typeof transport.enqueue !== 'function') return
+    
+    transport.enqueue({
+      level,
+      message,
+      meta
+    }, { 'content-type': 'application/json' })
+  }
+
+  return async function azifyFastifyPlugin(fastify, opts) {
+    fastify.addHook('onRequest', async (request, reply) => {
+      const startTime = Date.now()
+      const method = request.method
+      const url = request.url
+      const path = request.routerPath || url
+      
+      let responseChunk = null
+      let responseChunkCaptured = false
+      let logSent = false
+      
+      let requestId, traceId, spanId, parentSpanId, clientIp, query, cachedHeaders
+      let idsCreated = false
+      let headersCached = false
+      let reqCtx = null
+      
+      const logWithContext = (level, message, meta) => {
+        if (!reqCtx) {
+          const traceHex = sanitizeTraceHex(request.headers['x-trace-id'])
+          reqCtx = startRequestContext({
+            requestId: requestId || request.requestId || fastUUID(),
+            traceHex,
+            parentSpanId: request.headers['x-parent-span-id'] || null
+          })
+        }
+        meta.traceId = meta.traceId || reqCtx.traceId
+        meta.spanId = meta.spanId || reqCtx.spanId
+        meta.parentSpanId = meta.parentSpanId || reqCtx.parentSpanId
+        sendLog(level, message, meta)
+      }
+      
+      function ensureIds() {
+        if (idsCreated) return
+        idsCreated = true
+        
+        query = request.query || null
+        
+        if (!reqCtx) {
+          const traceHex = sanitizeTraceHex(request.headers['x-trace-id'])
+          reqCtx = startRequestContext({
+            requestId: request.requestId || fastUUID(),
+            traceHex,
+            parentSpanId: request.headers['x-parent-span-id'] || null
+          })
+        }
+        
+        requestId = reqCtx.requestId || request.requestId || fastUUID()
+        traceId = reqCtx.traceId
+        spanId = reqCtx.spanId
+        parentSpanId = reqCtx.parentSpanId || request.headers['x-parent-span-id'] || null
+        
+        clientIp = request.ip || request.socket?.remoteAddress || 'unknown'
+        request.requestId = requestId
+      }
+      
+      function ensureHeaders() {
+        if (headersCached) return
+        headersCached = true
+        if (config.captureHeaders) {
+          cachedHeaders = pickHeaders(request.headers || {})
+        } else {
+          cachedHeaders = {}
+        }
+      }
+      
+      function emitResponseLog(meta, chunk) {
+        if (!config.captureResponseBody || chunk == null) {
+          logWithContext('info', `[RESPONSE] ${method} ${url}`, meta)
+          return
+        }
+
+        if (!meta.response) meta.response = {}
+        meta.response.body = safeSerializeBody(chunk)
+        logWithContext('info', `[RESPONSE] ${method} ${url}`, meta)
+      }
+
+      request.azifyLogger = {
+        startTime,
+        method,
+        url,
+        path,
+        responseChunk: null,
+        responseChunkCaptured: false,
+        logSent: false,
+        requestId: null,
+        traceId: null,
+        spanId: null,
+        parentSpanId: null,
+        clientIp: null,
+        query: null,
+        cachedHeaders: null,
+        idsCreated: false,
+        headersCached: false,
+        reqCtx: null
+      }
+
+      if (config.logRequest) {
+        process.nextTick(() => {
+          ensureIds()
+          ensureHeaders()
+          
+          const requestObj = {
+            id: requestId,
+            method,
+            url,
+            path,
+            ip: clientIp
+          }
+          if (query) requestObj.query = query
+          if (config.captureHeaders && cachedHeaders) requestObj.headers = cachedHeaders
+          if (config.captureRequestBody && request.body !== undefined && request.body != null) {
+            requestObj.body = safeSerializeBody(request.body)
+          }
+          
+          const meta = {
+            traceId: reqCtx.traceId,
+            spanId: reqCtx.spanId,
+            parentSpanId: reqCtx.parentSpanId || null,
+            requestId,
+            request: requestObj,
+            timestamp: Date.now(),
+            hostname
+          }
+          if (serviceObj) meta.service = serviceObj
+          if (config.environment) meta.environment = config.environment
+          
+          logWithContext('info', `[REQUEST] ${method} ${url}`, meta)
+        })
+      }
+    })
+
+    fastify.addHook('onSend', async (request, reply, payload) => {
+      const logger = request.azifyLogger
+      if (!logger || logger.logSent) return payload
+      
+      logger.logSent = true
+      
+      if (config.captureResponseBody && payload != null && !logger.responseChunkCaptured) {
+        logger.responseChunk = payload
+        logger.responseChunkCaptured = true
+      }
+      
+      const startTime = logger.startTime
+      const method = logger.method
+      const url = logger.url
+      const path = logger.path
+      
+      let requestId, traceId, spanId, parentSpanId, clientIp, query, cachedHeaders
+      let idsCreated = false
+      let headersCached = false
+      let reqCtx = null
+      
+      const logWithContext = (level, message, meta) => {
+        if (!reqCtx) {
+          const traceHex = sanitizeTraceHex(request.headers['x-trace-id'])
+          reqCtx = startRequestContext({
+            requestId: requestId || request.requestId || fastUUID(),
+            traceHex,
+            parentSpanId: request.headers['x-parent-span-id'] || null
+          })
+        }
+        meta.traceId = meta.traceId || reqCtx.traceId
+        meta.spanId = meta.spanId || reqCtx.spanId
+        meta.parentSpanId = meta.parentSpanId || reqCtx.parentSpanId
+        sendLog(level, message, meta)
+      }
+      
+      function ensureIds() {
+        if (idsCreated) return
+        idsCreated = true
+        
+        query = request.query || null
+        
+        if (!reqCtx) {
+          const traceHex = sanitizeTraceHex(request.headers['x-trace-id'])
+          reqCtx = startRequestContext({
+            requestId: request.requestId || fastUUID(),
+            traceHex,
+            parentSpanId: request.headers['x-parent-span-id'] || null
+          })
+        }
+        
+        requestId = reqCtx.requestId || request.requestId || fastUUID()
+        traceId = reqCtx.traceId
+        spanId = reqCtx.spanId
+        parentSpanId = reqCtx.parentSpanId || request.headers['x-parent-span-id'] || null
+        
+        clientIp = request.ip || request.socket?.remoteAddress || 'unknown'
+      }
+      
+      function ensureHeaders() {
+        if (headersCached) return
+        headersCached = true
+        if (config.captureHeaders) {
+          cachedHeaders = pickHeaders(request.headers || {})
+        } else {
+          cachedHeaders = {}
+        }
+      }
+      
+      function emitResponseLog(meta, chunk) {
+        if (!config.captureResponseBody || chunk == null) {
+          logWithContext('info', `[RESPONSE] ${method} ${url}`, meta)
+          return
+        }
+
+        if (!meta.response) meta.response = {}
+        meta.response.body = safeSerializeBody(chunk)
+        logWithContext('info', `[RESPONSE] ${method} ${url}`, meta)
+      }
+      
+      process.nextTick(() => {
+        ensureIds()
+        
+        const statusCode = reply.statusCode || 200
+        const duration = Date.now() - startTime
+        const response = { statusCode, durationMs: duration }
+        
+        if (config.captureHeaders) {
+          ensureHeaders()
+        }
+        
+        const requestObj = {
+          id: requestId,
+          method,
+          url,
+          path,
+          ip: clientIp
+        }
+        if (query) requestObj.query = query
+        if (config.captureHeaders && cachedHeaders) requestObj.headers = cachedHeaders
+        
+        const meta = {
+          traceId: reqCtx.traceId,
+          spanId: reqCtx.spanId,
+          parentSpanId: reqCtx.parentSpanId || null,
+          requestId,
+          request: requestObj,
+          response,
+          timestamp: Date.now(),
+          hostname
+        }
+        if (serviceObj) meta.service = serviceObj
+        if (config.environment) meta.environment = config.environment
+        
+        const chunkToProcess = (logger.responseChunk !== null && logger.responseChunkCaptured) ? logger.responseChunk : null
+        emitResponseLog(meta, chunkToProcess)
+      })
+      
+      return payload
+    })
+  }
+}
+
+module.exports = createFastifyLoggingPlugin
+

package/middleware-restify.js

@@ -1,8 +1,21 @@
-const { runWithRequestContext, startRequestContext, getRequestContext } = require('./store')
+const { startRequestContext } = require('./store')
 const { createHttpLoggerTransport } = require('./streams/httpQueue')
-const { randomUUID } = require('crypto')
 const os = require('os')
 
+function fastUUID() {
+  const timestamp = Date.now().toString(36)
+  const randomPart = Math.random().toString(36).substring(2, 15)
+  const randomPart2 = Math.random().toString(36).substring(2, 15)
+  return `${timestamp}-${randomPart}-${randomPart2}`.substring(0, 36)
+}
+
+function sanitizeTraceHex(value) {
+  if (!value || typeof value !== 'string') return null
+  const hex = value.replace(/[^0-9a-fA-F]/g, '').toLowerCase()
+  if (!hex) return null
+  return hex.padEnd(32, '0').slice(0, 32)
+}
+
 const HEADER_WHITELIST = new Set([
   'content-type',
   'content-length',
@@ -21,10 +34,17 @@ function pickHeaders (source) {
     return {}
   }
   const result = {}
-  for (const [key, value] of Object.entries(source)) {
+  for (const key in source) {
     const lower = key.toLowerCase()
-    if (HEADER_WHITELIST.has(lower)) {
-      result[key] = Array.isArray(value) ? value.map(String) : (value != null ? String(value) : value)
+    if (!HEADER_WHITELIST.has(lower)) continue
+    
+    if (!Object.prototype.hasOwnProperty.call(source, key)) continue
+    
+    const value = source[key]
+    if (Array.isArray(value)) {
+      result[key] = value.map(String)
+    } else if (value != null) {
+      result[key] = String(value)
     }
   }
   return result
@@ -37,42 +57,40 @@ function createRestifyLoggingMiddleware (options = {}) {
     environment: options.environment || process.env.NODE_ENV
   }
 
-  const transport = createHttpLoggerTransport(config.loggerUrl)
+  const transport = createHttpLoggerTransport(config.loggerUrl, {})
+  const hostname = os.hostname()
+  const serviceObj = config.serviceName ? { name: config.serviceName, version: '1.0.0' } : null
 
   function sendLog (level, message, meta = {}) {
-    try {
-      transport.enqueue({
-        level,
-        message,
-        meta: {
-          ...meta,
-          service: {
-            name: config.serviceName,
-            version: '1.0.0'
-          },
-          environment: config.environment,
-          timestamp: new Date().toISOString(),
-          hostname: os.hostname()
-        }
-      }, { 'content-type': 'application/json' })
-    } catch (err) { }
+    if (!transport || typeof transport.enqueue !== 'function') return
+    
+    if (serviceObj) meta.service = serviceObj
+    if (config.environment) meta.environment = config.environment
+    meta.timestamp = Date.now()
+    meta.hostname = hostname
+    
+    transport.enqueue({
+      level,
+      message,
+      meta
+    }, { 'content-type': 'application/json' })
   }
 
   return function azifyLoggingMiddleware (req, res, next) {
     const startTime = Date.now()
-    const requestId = req.requestId || randomUUID()
+    const requestId = req.requestId || fastUUID()
 
     if (res._azifySetup) {
       return next()
     }
     res._azifySetup = true
 
-    const currentCtx = getRequestContext()
-    const traceId = currentCtx && currentCtx.traceId ? currentCtx.traceId : (req.headers['x-trace-id'] || randomUUID())
-    const parentSpanId = currentCtx && currentCtx.spanId ? currentCtx.spanId : (req.headers['x-parent-span-id'] || null)
-    const spanId = randomUUID().replace(/-/g, '').slice(0, 16)
-
-    const reqCtx = startRequestContext({ requestId, traceId, spanId, parentSpanId })
+    const traceHex = sanitizeTraceHex(req.headers['x-trace-id'])
+    const reqCtx = startRequestContext({
+      requestId,
+      traceHex,
+      parentSpanId: req.headers['x-parent-span-id'] || null
+    })
 
     let normalizedPath = req.url
     if (normalizedPath.includes('?')) {
@@ -115,29 +133,37 @@ function createRestifyLoggingMiddleware (options = {}) {
       }
     }
 
+    let logSent = false
+
     function emitLog (level, message, extraMeta = {}) {
-      const duration = Date.now() - startTime
-      const statusCode = responseStatus || res.statusCode || 200
-      const responseHeaders = typeof res.getHeaders === 'function' ? res.getHeaders() : {}
-
-      const meta = {
-        traceId: reqCtx.traceId,
-        spanId: reqCtx.spanId,
-        parentSpanId: reqCtx.parentSpanId,
-        requestId,
-        request: requestSnapshot,
-        response: {
-          statusCode,
-          headers: pickHeaders(responseHeaders),
-          durationMs: duration
-        },
-        ...extraMeta
-      }
+      if (logSent) return
+      logSent = true
+      
+      process.nextTick(() => {
+        const duration = Date.now() - startTime
+        const statusCode = responseStatus || res.statusCode || 200
+        const responseHeaders = typeof res.getHeaders === 'function' ? res.getHeaders() : {}
+
+        const meta = {
+          traceId: reqCtx.traceId,
+          spanId: reqCtx.spanId,
+          parentSpanId: reqCtx.parentSpanId || null,
+          requestId,
+          request: requestSnapshot,
+          response: {
+            statusCode,
+            headers: pickHeaders(responseHeaders),
+            durationMs: duration
+          },
+          ...extraMeta
+        }
 
-      sendLog(level, message, meta)
+        sendLog(level, message, meta)
+      })
     }
 
     function finalize (level = 'info', errorMeta) {
+      if (logSent) return
       const message = `${req.method} ${req.url}`
       const meta = errorMeta ? { error: errorMeta } : {}
       emitLog(level, message, meta)
@@ -159,18 +185,7 @@ function createRestifyLoggingMiddleware (options = {}) {
       })
     })
 
-    runWithRequestContext(reqCtx, () => {
-      try {
-        next()
-      } catch (err) {
-        finalize('error', {
-          message: err && err.message ? err.message : String(err),
-          name: err && err.name ? err.name : 'Error',
-          stack: err && err.stack ? err.stack : undefined
-        })
-        throw err
-      }
-    })
+    next()
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azify-logger",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "description": "Azify Logger Client - Centralized logging for OpenSearch",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,7 +9,7 @@
     "test": "echo \"No tests specified\" && exit 0",
     "start": "node server.js",
     "dev": "node server.js",
-    "dev:full": "docker-compose up -d && sleep 10 && npm start",
+    "dev:full": "docker compose up -d && sleep 10 && npm start",
     "pm2:start": "pm2 start ecosystem.config.js",
     "pm2:stop": "pm2 stop ecosystem.config.js",
     "pm2:restart": "pm2 restart ecosystem.config.js",
@@ -28,27 +28,26 @@
   "author": "Azify",
   "license": "MIT",
   "dependencies": {
+    "@opentelemetry/api": "1.0.4",
+    "@opentelemetry/auto-instrumentations-node": "0.27.0",
+    "@opentelemetry/core": "1.0.1",
+    "@opentelemetry/exporter-trace-otlp-http": "0.27.0",
+    "@opentelemetry/instrumentation-express": "0.27.0",
+    "@opentelemetry/instrumentation-http": "0.27.0",
+    "@opentelemetry/instrumentation-restify": "0.27.0",
+    "@opentelemetry/resources": "1.0.1",
+    "@opentelemetry/sdk-node": "0.27.0",
+    "@opentelemetry/semantic-conventions": "1.0.1",
     "axios": "^1.6.0",
-    "ioredis": "^5.4.1",
     "cors": "^2.8.5",
     "express": "^4.18.2",
     "express-session": "^1.17.3",
+    "ioredis": "^5.8.2",
+    "js-yaml": "^4.1.0",
     "passport": "^0.6.0",
     "passport-azure-ad": "^4.3.5",
-    "js-yaml": "^4.1.0",
     "require-in-the-middle": "^7.4.0",
-    "uuid": "^9.0.1",
-    "@opentelemetry/instrumentation-http": "0.27.0",
-    "@opentelemetry/instrumentation-express": "0.27.0",
-    "@opentelemetry/instrumentation-restify": "0.27.0",
-
-    "@opentelemetry/api": "1.0.4",
-    "@opentelemetry/core": "1.0.1",
-    "@opentelemetry/resources": "1.0.1",
-    "@opentelemetry/semantic-conventions": "1.0.1",
-    "@opentelemetry/sdk-node": "0.27.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.27.0",
-    "@opentelemetry/auto-instrumentations-node": "0.27.0"
+    "uuid": "^9.0.1"
   },
   "overrides": {
     "@opentelemetry/api": "1.0.4",
@@ -59,7 +58,6 @@
     "@opentelemetry/exporter-trace-otlp-http": "0.27.0",
     "@opentelemetry/auto-instrumentations-node": "0.27.0"
   },
-  "optionalDependencies": {},
   "engines": {
     "node": ">=12 <=22"
   },
@@ -77,6 +75,7 @@
     "middleware-restify.js",
     "middleware-express.js",
     "middleware-express.d.ts",
+    "middleware-fastify.js",
     "server.js",
     "sampling.js",
     "queue/",